[PATCH] mscoree: Try skipping c: when searching for support msi.
Vincent Povirk <[email protected]> Sat, 13 Apr 2019 11:27:33 -0500
| Newsgroups | gmane.comp.emulators.wine.patches,gmane.comp.emulators.wine.devel |
|---|---|
| Message-ID | <[email protected]> |
U2lnbmVkLW9mZi1ieTogVmluY2VudCBQb3ZpcmsgPHZpbmNlbnRAY29kZXdlYXZlcnMuY29tPgot LS0KVGhpcyBmaXhlcyB1cGdyYWRlcyBmcm9tIGEgbG9jYWwgcnVudGltZSBpbnN0YWxsIHRvIGEg c2hhcmVkCmluc3RhbGwuCgpXZSBzaG91bGQgZ2l2ZSB0aGUgbG9jYWwgaW5zdGFsbCBzcGVjaWFs IHRyZWF0bWVudCBiZWNhdXNlCmluc3RhbGxpbmcgdGhlIHN1cHBvcnQgbXNpIHdpbGwgcmVtb3Zl IGFueSBydW50aW1lIG1zaSB0aGF0CmRvZXNuJ3QgbWF0Y2guIElmIHRoZSBvdGhlciBwYXJ0cyBv ZiB0aGUgc2VhcmNoIHBhdGggaGF2ZSBhbgpvdXRkYXRlZCB2ZXJzaW9uLCBpbnN0YWxsaW5nIHRo ZSBzdXBwb3J0IG1zaSB3b24ndCBmaXggdGhhdCwKYW5kIHRoZXkgc2hvdWxkbid0IGJlY2F1c2Ug dGhlIHBhdGggY29udGFpbnMgdGhlIHZlcnNpb24uCgogZGxscy9tc2NvcmVlL21ldGFob3N0LmMg ICAgICAgIHwgICA2ICstCiBkbGxzL21zY29yZWUvbXNjb3JlZV9tYWluLmMgICAgfCAxMDIgKysr KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiBkbGxzL21zY29yZWUvbXNjb3JlZV9wcml2 YXRlLmggfCAgIDIgKy0KIDMgZmlsZXMgY2hhbmdlZCwgNjggaW5zZXJ0aW9ucygrKSwgNDIgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZGxscy9tc2NvcmVlL21ldGFob3N0LmMgYi9kbGxzL21z Y29yZWUvbWV0YWhvc3QuYwppbmRleCAxYjJhYmQyNmU0Li5iMjY4YWNjNDQ5IDEwMDY0NAotLS0g YS9kbGxzL21zY29yZWUvbWV0YWhvc3QuYworKysgYi9kbGxzL21zY29yZWUvbWV0YWhvc3QuYwpA QCAtMzM5LDcgKzMzOSw3IEBAIHN0YXRpYyBIUkVTVUxUIENMUlJ1bnRpbWVJbmZvX0dldFJ1bnRp bWVIb3N0KENMUlJ1bnRpbWVJbmZvICpUaGlzLCBSdW50aW1lSG9zdCAqCiAgICAgICAgIHJldHVy biBocjsKICAgICB9CiAKLSAgICBpZiAoIWdldF9tb25vX3BhdGgobW9ub19wYXRoKSkKKyAgICBp ZiAoIWdldF9tb25vX3BhdGgobW9ub19wYXRoLCBGQUxTRSkpCiAgICAgewogICAgICAgICBFUlIo IldpbmUgTW9ubyBpcyBub3QgaW5zdGFsbGVkXG4iKTsKICAgICAgICAgcmV0dXJuIENMUl9FX1NI SU1fUlVOVElNRTsKQEAgLTc3OCw5ICs3NzgsOSBAQCBzdGF0aWMgQk9PTCBnZXRfbW9ub19wYXRo X2RhdGFkaXIoTFBXU1RSIHBhdGgpCiAgICAgcmV0dXJuIHJldDsKIH0KIAotQk9PTCBnZXRfbW9u b19wYXRoKExQV1NUUiBwYXRoKQorQk9PTCBnZXRfbW9ub19wYXRoKExQV1NUUiBwYXRoLCBCT09M IHNraXBfbG9jYWwpCiB7Ci0gICAgcmV0dXJuIGdldF9tb25vX3BhdGhfbG9jYWwocGF0aCkgfHwK KyAgICByZXR1cm4gKCFza2lwX2xvY2FsICYmIGdldF9tb25vX3BhdGhfbG9jYWwocGF0aCkpIHx8 CiAgICAgICAgIGdldF9tb25vX3BhdGhfcmVnaXN0cnkocGF0aCkgfHwKICAgICAgICAgZ2V0X21v bm9fcGF0aF9kYXRhZGlyKHBhdGgpIHx8CiAgICAgICAgIGdldF9tb25vX3BhdGhfdW5peChJTlNU QUxMX0RBVEFESVIgIi93aW5lL21vbm8vd2luZS1tb25vLSIgV0lORV9NT05PX1ZFUlNJT04sIHBh dGgpIHx8CmRpZmYgLS1naXQgYS9kbGxzL21zY29yZWUvbXNjb3JlZV9tYWluLmMgYi9kbGxzL21z Y29yZWUvbXNjb3JlZV9tYWluLmMKaW5kZXggNjM5M2FmOGM2Yy4uNDA1NzdkZTcxNCAxMDA2NDQK LS0tIGEvZGxscy9tc2NvcmVlL21zY29yZWVfbWFpbi5jCisrKyBiL2RsbHMvbXNjb3JlZS9tc2Nv cmVlX21haW4uYwpAQCAtNzE3LDIzICs3MTcsNjUgQEAgc3RhdGljIEJPT0wgaW52b2tlX2FwcHdp eih2b2lkKQogICAgIHJldHVybiByZXQ7CiB9CiAKLXN0YXRpYyBCT09MIGluc3RhbGxfd2luZV9t b25vKHZvaWQpCitzdGF0aWMgQk9PTCBnZXRfc3VwcG9ydF9tc2koTFBDV1NUUiBtb25vX3BhdGgs IExQV1NUUiBtc2lfcGF0aCkKIHsKICAgICBzdGF0aWMgY29uc3QgV0NIQVIgc3VwcG9ydF9tc2lf cmVsYXRpdmVbXSA9IHsnXFwnLCdzJywndScsJ3AnLCdwJywnbycsJ3InLCd0JywnXFwnLCd3Jywn aScsJ24nLCdlJywnbScsJ28nLCduJywnbycsJy0nLCdzJywndScsJ3AnLCdwJywnbycsJ3InLCd0 JywnLicsJ20nLCdzJywnaScsMH07CisgICAgVUlOVCAoV0lOQVBJICpwTXNpT3BlblBhY2thZ2VX KShMUENXU1RSLFVMT05HKik7CisgICAgVUlOVCAoV0lOQVBJICpwTXNpR2V0UHJvZHVjdFByb3Bl cnR5QSkoVUxPTkcsTFBDU1RSLExQU1RSLExQRFdPUkQpOworICAgIFVJTlQgKFdJTkFQSSAqcE1z aUNsb3NlSGFuZGxlKShVTE9ORyk7CisgICAgSE1PRFVMRSBobXNpID0gTlVMTDsKKyAgICBjaGFy IHZlcnNpb25zdHJpbmdidWZbMTVdOworICAgIFVJTlQgcmVzOworICAgIERXT1JEIGJ1ZmZlcl9z aXplOworICAgIFVMT05HIG1zaXByb2R1Y3Q7CisgICAgQk9PTCByZXQ9RkFMU0U7CisKKyAgICBo bXNpID0gR2V0TW9kdWxlSGFuZGxlQSgibXNpIik7CisKKyAgICBzdHJjcHlXKG1zaV9wYXRoLCBt b25vX3BhdGgpOworICAgIHN0cmNhdFcobXNpX3BhdGgsIHN1cHBvcnRfbXNpX3JlbGF0aXZlKTsK KworICAgIHBNc2lPcGVuUGFja2FnZVcgPSAodm9pZCopR2V0UHJvY0FkZHJlc3MoaG1zaSwgIk1z aU9wZW5QYWNrYWdlVyIpOworCisgICAgcmVzID0gcE1zaU9wZW5QYWNrYWdlVyhtc2lfcGF0aCwg Jm1zaXByb2R1Y3QpOworCisgICAgaWYgKHJlcyA9PSBFUlJPUl9TVUNDRVNTKQorICAgIHsKKyAg ICAgICAgYnVmZmVyX3NpemUgPSBzaXplb2YodmVyc2lvbnN0cmluZ2J1Zik7CisKKyAgICAgICAg cE1zaUdldFByb2R1Y3RQcm9wZXJ0eUEgPSAodm9pZCopR2V0UHJvY0FkZHJlc3MoaG1zaSwgIk1z aUdldFByb2R1Y3RQcm9wZXJ0eUEiKTsKKworICAgICAgICByZXMgPSBwTXNpR2V0UHJvZHVjdFBy b3BlcnR5QShtc2lwcm9kdWN0LCAiUHJvZHVjdFZlcnNpb24iLCB2ZXJzaW9uc3RyaW5nYnVmLCAm YnVmZmVyX3NpemUpOworCisgICAgICAgIHBNc2lDbG9zZUhhbmRsZSA9ICh2b2lkKilHZXRQcm9j QWRkcmVzcyhobXNpLCAiTXNpQ2xvc2VIYW5kbGUiKTsKKworICAgICAgICBwTXNpQ2xvc2VIYW5k bGUobXNpcHJvZHVjdCk7CisgICAgfQorCisgICAgaWYgKHJlcyA9PSBFUlJPUl9TVUNDRVNTKSB7 CisgICAgICAgIFRSQUNFKCJmb3VuZCBzdXBwb3J0IG1zaSB2ZXJzaW9uICVzIGF0ICVzXG4iLCB2 ZXJzaW9uc3RyaW5nYnVmLCBkZWJ1Z3N0cl93KG1zaV9wYXRoKSk7CisKKyAgICAgICAgaWYgKGNv bXBhcmVfdmVyc2lvbnMoV0lORV9NT05PX1ZFUlNJT04sIHZlcnNpb25zdHJpbmdidWYpIDw9IDAp CisgICAgICAgIHsKKyAgICAgICAgICAgIHJldCA9IFRSVUU7CisgICAgICAgIH0KKyAgICB9CisK KyAgICByZXR1cm4gcmV0OworfQorCitzdGF0aWMgQk9PTCBpbnN0YWxsX3dpbmVfbW9ubyh2b2lk KQorewogICAgIEJPT0wgaXNfd293NjQgPSBGQUxTRTsKICAgICBITU9EVUxFIGhtc2kgPSBOVUxM OwogICAgIEhSRVNVTFQgaW5pdHJlc3VsdCA9IEVfRkFJTDsKICAgICBVSU5UIChXSU5BUEkgKnBN c2lFbnVtUmVsYXRlZFByb2R1Y3RzQSkoTFBDU1RSLERXT1JELERXT1JELExQU1RSKTsKICAgICBV SU5UIChXSU5BUEkgKnBNc2lHZXRQcm9kdWN0SW5mb0EpKExQQ1NUUixMUENTVFIsTFBTVFIsRFdP UkQqKTsKLSAgICBVSU5UIChXSU5BUEkgKnBNc2lPcGVuUGFja2FnZVcpKExQQ1dTVFIsVUxPTkcq KTsKLSAgICBVSU5UIChXSU5BUEkgKnBNc2lHZXRQcm9kdWN0UHJvcGVydHlBKShVTE9ORyxMUENT VFIsTFBTVFIsTFBEV09SRCk7Ci0gICAgVUlOVCAoV0lOQVBJICpwTXNpQ2xvc2VIYW5kbGUpKFVM T05HKTsKICAgICBVSU5UIChXSU5BUEkgKnBNc2lJbnN0YWxsUHJvZHVjdFcpKExQQ1dTVFIsTFBD V1NUUik7CiAgICAgY2hhciB2ZXJzaW9uc3RyaW5nYnVmWzE1XTsKICAgICBjaGFyIHByb2R1Y3Rj b2RlYnVmWzM5XTsKICAgICBVSU5UIHJlczsKICAgICBEV09SRCBidWZmZXJfc2l6ZTsKLSAgICBV TE9ORyBtc2lwcm9kdWN0OwogICAgIEJPT0wgcmV0OwogICAgIFdDSEFSIG1vbm9fcGF0aFtNQVhf UEFUSF07CiAgICAgV0NIQVIgc3VwcG9ydF9tc2lfcGF0aFtNQVhfUEFUSF07CkBAIC03NTAsNyAr NzkyLDcgQEAgc3RhdGljIEJPT0wgaW5zdGFsbF93aW5lX21vbm8odm9pZCkKIAogICAgIFRSQUNF KCJzZWFyY2hpbmcgZm9yIG1vbm8gcnVudGltZVxuIik7CiAKLSAgICBpZiAoIWdldF9tb25vX3Bh dGgobW9ub19wYXRoKSkKKyAgICBpZiAoIWdldF9tb25vX3BhdGgobW9ub19wYXRoLCBGQUxTRSkp CiAgICAgewogICAgICAgICBUUkFDRSgibW9ubyBydW50aW1lIG5vdCBmb3VuZFxuIik7CiAgICAg ICAgIHJldHVybiBpbnZva2VfYXBwd2l6KCk7CkBAIC03OTUsNDcgKzgzNywzMSBAQCBzdGF0aWMg Qk9PTCBpbnN0YWxsX3dpbmVfbW9ubyh2b2lkKQogICAgICAgICB9CiAgICAgfQogCi0gICAgc3Ry Y3B5VyhzdXBwb3J0X21zaV9wYXRoLCBtb25vX3BhdGgpOwotICAgIHN0cmNhdFcoc3VwcG9ydF9t c2lfcGF0aCwgc3VwcG9ydF9tc2lfcmVsYXRpdmUpOwotCiAgICAgaW5pdHJlc3VsdCA9IENvSW5p dGlhbGl6ZShOVUxMKTsKIAotICAgIHBNc2lPcGVuUGFja2FnZVcgPSAodm9pZCopR2V0UHJvY0Fk ZHJlc3MoaG1zaSwgIk1zaU9wZW5QYWNrYWdlVyIpOwotCi0gICAgcmVzID0gcE1zaU9wZW5QYWNr YWdlVyhzdXBwb3J0X21zaV9wYXRoLCAmbXNpcHJvZHVjdCk7Ci0KLSAgICBpZiAocmVzID09IEVS Uk9SX1NVQ0NFU1MpCisgICAgcmV0ID0gZ2V0X3N1cHBvcnRfbXNpKG1vbm9fcGF0aCwgc3VwcG9y dF9tc2lfcGF0aCk7CisgICAgaWYgKCFyZXQpCiAgICAgewotICAgICAgICBidWZmZXJfc2l6ZSA9 IHNpemVvZih2ZXJzaW9uc3RyaW5nYnVmKTsKLQotICAgICAgICBwTXNpR2V0UHJvZHVjdFByb3Bl cnR5QSA9ICh2b2lkKilHZXRQcm9jQWRkcmVzcyhobXNpLCAiTXNpR2V0UHJvZHVjdFByb3BlcnR5 QSIpOwotCi0gICAgICAgIHJlcyA9IHBNc2lHZXRQcm9kdWN0UHJvcGVydHlBKG1zaXByb2R1Y3Qs ICJQcm9kdWN0VmVyc2lvbiIsIHZlcnNpb25zdHJpbmdidWYsICZidWZmZXJfc2l6ZSk7Ci0KLSAg ICAgICAgcE1zaUNsb3NlSGFuZGxlID0gKHZvaWQqKUdldFByb2NBZGRyZXNzKGhtc2ksICJNc2lD bG9zZUhhbmRsZSIpOwotCi0gICAgICAgIHBNc2lDbG9zZUhhbmRsZShtc2lwcm9kdWN0KTsKKyAg ICAgICAgLyogVHJ5IGxvb2tpbmcgb3V0c2lkZSBjOlx3aW5kb3dzXG1vbm8gKi8KKyAgICAgICAg cmV0ID0gKGdldF9tb25vX3BhdGgobW9ub19wYXRoLCBUUlVFKSAmJgorICAgICAgICAgICAgZ2V0 X3N1cHBvcnRfbXNpKG1vbm9fcGF0aCwgc3VwcG9ydF9tc2lfcGF0aCkpOwogICAgIH0KIAotICAg IGlmIChyZXMgPT0gRVJST1JfU1VDQ0VTUykgewotICAgICAgICBUUkFDRSgiZm91bmQgc3VwcG9y dCBtc2kgdmVyc2lvbiAlcyBhdCAlc1xuIiwgdmVyc2lvbnN0cmluZ2J1ZiwgZGVidWdzdHJfdyhz dXBwb3J0X21zaV9wYXRoKSk7Ci0KLSAgICAgICAgaWYgKGNvbXBhcmVfdmVyc2lvbnMoV0lORV9N T05PX1ZFUlNJT04sIHZlcnNpb25zdHJpbmdidWYpIDw9IDApCi0gICAgICAgIHsKLSAgICAgICAg ICAgIFRSQUNFKCJpbnN0YWxsaW5nIHN1cHBvcnQgbXNpXG4iKTsKKyAgICBpZiAocmV0KQorICAg IHsKKyAgICAgICAgVFJBQ0UoImluc3RhbGxpbmcgc3VwcG9ydCBtc2lcbiIpOwogCi0gICAgICAg ICAgICBwTXNpSW5zdGFsbFByb2R1Y3RXID0gKHZvaWQqKUdldFByb2NBZGRyZXNzKGhtc2ksICJN c2lJbnN0YWxsUHJvZHVjdFciKTsKKyAgICAgICAgcE1zaUluc3RhbGxQcm9kdWN0VyA9ICh2b2lk KilHZXRQcm9jQWRkcmVzcyhobXNpLCAiTXNpSW5zdGFsbFByb2R1Y3RXIik7CiAKLSAgICAgICAg ICAgIHJlcyA9IHBNc2lJbnN0YWxsUHJvZHVjdFcoc3VwcG9ydF9tc2lfcGF0aCwgTlVMTCk7Cisg ICAgICAgIHJlcyA9IHBNc2lJbnN0YWxsUHJvZHVjdFcoc3VwcG9ydF9tc2lfcGF0aCwgTlVMTCk7 CiAKLSAgICAgICAgICAgIGlmIChyZXMgPT0gRVJST1JfU1VDQ0VTUykKLSAgICAgICAgICAgIHsK LSAgICAgICAgICAgICAgICByZXQgPSBUUlVFOwotICAgICAgICAgICAgICAgIGdvdG8gZW5kOwot ICAgICAgICAgICAgfQotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIEVSUigiTXNp SW5zdGFsbFByb2R1Y3QgZmFpbGVkLCBlcnI9JWlcbiIsIHJlcyk7CisgICAgICAgIGlmIChyZXMg PT0gRVJST1JfU1VDQ0VTUykKKyAgICAgICAgeworICAgICAgICAgICAgcmV0ID0gVFJVRTsKKyAg ICAgICAgICAgIGdvdG8gZW5kOwogICAgICAgICB9CisgICAgICAgIGVsc2UKKyAgICAgICAgICAg IEVSUigiTXNpSW5zdGFsbFByb2R1Y3QgZmFpbGVkLCBlcnI9JWlcbiIsIHJlcyk7CiAgICAgfQog CiAgICAgcmV0ID0gaW52b2tlX2FwcHdpeigpOwpkaWZmIC0tZ2l0IGEvZGxscy9tc2NvcmVlL21z Y29yZWVfcHJpdmF0ZS5oIGIvZGxscy9tc2NvcmVlL21zY29yZWVfcHJpdmF0ZS5oCmluZGV4IDQz MjA5ZmQxODcuLjNhMzYzMWU3MDggMTAwNjQ0Ci0tLSBhL2RsbHMvbXNjb3JlZS9tc2NvcmVlX3By aXZhdGUuaAorKysgYi9kbGxzL21zY29yZWUvbXNjb3JlZV9wcml2YXRlLmgKQEAgLTEwOCw3ICsx MDgsNyBAQCBleHRlcm4gSFJFU1VMVCBnZXRfcnVudGltZV9pbmZvKExQQ1dTVFIgZXhlZmlsZSwg TFBDV1NUUiB2ZXJzaW9uLCBMUENXU1RSIGNvbmZpZwogICAgIElTdHJlYW0gKmNvbmZpZ19zdHJl YW0sIERXT1JEIHN0YXJ0dXBfZmxhZ3MsIERXT1JEIHJ1bnRpbWVpbmZvX2ZsYWdzLCBCT09MIGxl Z2FjeSwKICAgICBJQ0xSUnVudGltZUluZm8gKipyZXN1bHQpIERFQ0xTUEVDX0hJRERFTjsKIAot ZXh0ZXJuIEJPT0wgZ2V0X21vbm9fcGF0aChMUFdTVFIgcGF0aCkgREVDTFNQRUNfSElEREVOOwor ZXh0ZXJuIEJPT0wgZ2V0X21vbm9fcGF0aChMUFdTVFIgcGF0aCwgQk9PTCBza2lwX2xvY2FsKSBE RUNMU1BFQ19ISURERU47CiAKIGV4dGVybiBIUkVTVUxUIElDTFJSdW50aW1lSW5mb19HZXRSdW50 aW1lSG9zdChJQ0xSUnVudGltZUluZm8gKmlmYWNlLCBSdW50aW1lSG9zdCAqKnJlc3VsdCkgREVD TFNQRUNfSElEREVOOwogCi0tIAoyLjE3LjEKCgoK