[PATCH v4 1/5] ntdll: Return BIOS info from NtQuerySystemInformation on Linux
Alex Henrie <[email protected]> Wed, 13 Jun 2018 21:41:15 -0600
| Newsgroups | gmane.comp.emulators.wine.patches |
|---|---|
| Message-ID | <[email protected]> |
U2lnbmVkLW9mZi1ieTogQWxleCBIZW5yaWUgPGFsZXhoZW5yaWUyNEBnbWFpbC5jb20+Ci0tLQog ZGxscy9udGRsbC9udC5jIHwgMTY5ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDE2OSBpbnNlcnRpb25zKCspCgpkaWZmIC0t Z2l0IGEvZGxscy9udGRsbC9udC5jIGIvZGxscy9udGRsbC9udC5jCmluZGV4IGRjMGNlMDRmNDIu LjcyYWUzODE4MTMgMTAwNjQ0Ci0tLSBhL2RsbHMvbnRkbGwvbnQuYworKysgYi9kbGxzL250ZGxs L250LmMKQEAgLTY2LDYgKzY2LDUwIEBACiAKIFdJTkVfREVGQVVMVF9ERUJVR19DSEFOTkVMKG50 ZGxsKTsKIAorI2luY2x1ZGUgInBzaHBhY2sxLmgiCisKK3R5cGVkZWYgZW51bSBfU1lTVEVNX0ZJ Uk1XQVJFX1RBQkxFX0FDVElPTgoreworICAgIFN5c3RlbUZpcm13YXJlVGFibGVfRW51bWVyYXRl ID0gMCwKKyAgICBTeXN0ZW1GaXJtd2FyZVRhYmxlX0dldCA9IDEKK30gU1lTVEVNX0ZJUk1XQVJF X1RBQkxFX0FDVElPTjsKKwordHlwZWRlZiBzdHJ1Y3QgX1NZU1RFTV9GSVJNV0FSRV9UQUJMRV9J TkZPUk1BVElPTgoreworICAgIFVMT05HIFByb3ZpZGVyU2lnbmF0dXJlOworICAgIFNZU1RFTV9G SVJNV0FSRV9UQUJMRV9BQ1RJT04gQWN0aW9uOworICAgIFVMT05HIFRhYmxlSUQ7CisgICAgVUxP TkcgVGFibGVCdWZmZXJMZW5ndGg7CisgICAgVUNIQVIgVGFibGVCdWZmZXJbMV07Cit9IFNZU1RF TV9GSVJNV0FSRV9UQUJMRV9JTkZPUk1BVElPTjsKKworc3RydWN0IHNtYmlvc19wcm9sb2d1ZSB7 CisgICAgQllURSBjYWxsaW5nX21ldGhvZDsKKyAgICBCWVRFIG1ham9yX3ZlcnNpb247CisgICAg QllURSBtaW5vcl92ZXJzaW9uOworICAgIEJZVEUgcmV2aXNpb247CisgICAgRFdPUkQgbGVuZ3Ro OworfTsKKworc3RydWN0IHNtYmlvc19iaW9zIHsKKyAgICBCWVRFIHR5cGU7CisgICAgQllURSBs ZW5ndGg7CisgICAgV09SRCBoYW5kbGU7CisgICAgQllURSB2ZW5kb3I7CisgICAgQllURSB2ZXJz aW9uOworICAgIFdPUkQgc3RhcnQ7CisgICAgQllURSBkYXRlOworICAgIEJZVEUgc2l6ZTsKKyAg ICBVSU5UNjQgY2hhcmFjdGVyaXN0aWNzOworfTsKKworI2luY2x1ZGUgInBvcHBhY2suaCIKKwor LyogRmlybXdhcmUgdGFibGUgcHJvdmlkZXJzICovCisjZGVmaW5lIEFDUEkgMHg0MTQzNTA0OQor I2RlZmluZSBGSVJNIDB4NDY0OTUyNEQKKyNkZWZpbmUgUlNNQiAweDUyNTM0RDQyCisKIC8qCiAg KglUb2tlbgogICovCkBAIC0xODUwLDYgKzE4OTQsMzkgQEAgc3RhdGljIE5UU1RBVFVTIGNyZWF0 ZV9sb2dpY2FsX3Byb2NfaW5mbyhTWVNURU1fTE9HSUNBTF9QUk9DRVNTT1JfSU5GT1JNQVRJT04g KioKIH0KICNlbmRpZgogCitzdGF0aWMgaW5saW5lIHZvaWQgY29weV9zbWJpb3Nfc3RyaW5nKGNo YXIgKipidWZmZXIsIGNoYXIgKnN0cmluZywgc2l6ZV90IHN0cmluZ19zaXplKQoreworICAgIGlm ICghc3RyaW5nKSByZXR1cm47CisgICAgc3RyY3B5KCpidWZmZXIsIHN0cmluZyk7CisgICAgKmJ1 ZmZlciArPSBzdHJpbmdfc2l6ZTsKK30KKworI2lmZGVmIGxpbnV4CitzdGF0aWMgY2hhciogZ2V0 X3NtYmlvc19zdHJpbmcoY29uc3QgY2hhciAqcGF0aCwgc2l6ZV90ICpzdHJpbmdfc2l6ZSkKK3sK KyAgICBGSUxFICpmaWxlID0gZm9wZW4ocGF0aCwgInIiKTsKKyAgICBjaGFyICpyZXQgPSBOVUxM OworICAgICpzdHJpbmdfc2l6ZSA9IDA7CisgICAgaWYgKGZpbGUpCisgICAgeworICAgICAgICAq c3RyaW5nX3NpemUgPSBnZXRsaW5lKCZyZXQsIHN0cmluZ19zaXplLCBmaWxlKSArIDE7CisgICAg ICAgIGZjbG9zZShmaWxlKTsKKyAgICAgICAgaWYgKCpzdHJpbmdfc2l6ZSA+PSAyICYmIHJldFsq c3RyaW5nX3NpemUgLSAyXSA9PSAnXG4nKQorICAgICAgICB7CisgICAgICAgICAgICByZXRbKnN0 cmluZ19zaXplIC0gMl0gPSAwOworICAgICAgICAgICAgKCpzdHJpbmdfc2l6ZSktLTsKKyAgICAg ICAgfQorICAgICAgICBpZiAoKnN0cmluZ19zaXplID09IDEpCisgICAgICAgIHsKKyAgICAgICAg ICAgIGZyZWUocmV0KTsKKyAgICAgICAgICAgIHJldCA9IE5VTEw7CisgICAgICAgICAgICAqc3Ry aW5nX3NpemUgPSAwOworICAgICAgICB9CisgICAgfQorICAgIHJldHVybiByZXQ7Cit9CisjZW5k aWYKKwogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKgogICogTnRRdWVyeVN5c3RlbUluZm9ybWF0aW9u IFtOVERMTC5AXQogICogWndRdWVyeVN5c3RlbUluZm9ybWF0aW9uIFtOVERMTC5AXQpAQCAtMjM1 OSw2ICsyNDM2LDk3IEBAIE5UU1RBVFVTIFdJTkFQSSBOdFF1ZXJ5U3lzdGVtSW5mb3JtYXRpb24o CiAgICAgICAgICAgICBlbHNlIHJldCA9IFNUQVRVU19JTkZPX0xFTkdUSF9NSVNNQVRDSDsKICAg ICAgICAgfQogICAgICAgICBicmVhazsKKyAgICBjYXNlIFN5c3RlbUZpcm13YXJlVGFibGVJbmZv cm1hdGlvbjoKKyAgICAgICAgeworICAgICAgICAgICAgU1lTVEVNX0ZJUk1XQVJFX1RBQkxFX0lO Rk9STUFUSU9OICpzZnRpID0gKFNZU1RFTV9GSVJNV0FSRV9UQUJMRV9JTkZPUk1BVElPTiopU3lz dGVtSW5mb3JtYXRpb247CisgICAgICAgICAgICBsZW4gPSBGSUVMRF9PRkZTRVQoU1lTVEVNX0ZJ Uk1XQVJFX1RBQkxFX0lORk9STUFUSU9OLCBUYWJsZUJ1ZmZlcik7CisgICAgICAgICAgICBpZiAo TGVuZ3RoIDwgbGVuKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHJldCA9IFNUQVRV U19JTkZPX0xFTkdUSF9NSVNNQVRDSDsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAg ICAgIH0KKworICAgICAgICAgICAgc3dpdGNoIChzZnRpLT5BY3Rpb24pCisgICAgICAgICAgICB7 CisgICAgICAgICAgICBjYXNlIFN5c3RlbUZpcm13YXJlVGFibGVfR2V0OgorICAgICAgICAgICAg ICAgIHN3aXRjaCAoc2Z0aS0+UHJvdmlkZXJTaWduYXR1cmUpCisgICAgICAgICAgICAgICAgewor ICAgICAgICAgICAgICAgIGNhc2UgUlNNQjoKKyNpZmRlZiBsaW51eAorICAgICAgICAgICAgICAg ICAgICB7CisgICAgICAgICAgICAgICAgICAgICAgICBjaGFyICpiaW9zX3ZlbmRvciwgKmJpb3Nf dmVyc2lvbiwgKmJpb3NfZGF0ZTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHNpemVfdCBiaW9z X3ZlbmRvcl9zaXplLCBiaW9zX3ZlcnNpb25fc2l6ZSwgYmlvc19kYXRlX3NpemU7CisgICAgICAg ICAgICAgICAgICAgICAgICBjaGFyICpidWZmZXIgPSAoY2hhciopc2Z0aS0+VGFibGVCdWZmZXI7 CisgICAgICAgICAgICAgICAgICAgICAgICBCWVRFIHN0cmluZ19jb3VudDsKKyAgICAgICAgICAg ICAgICAgICAgICAgIHN0cnVjdCBzbWJpb3NfcHJvbG9ndWUgKnByb2xvZ3VlOworICAgICAgICAg ICAgICAgICAgICAgICAgc3RydWN0IHNtYmlvc19iaW9zICpiaW9zOworCisgICAgICAgICAgICAg ICAgICAgICAgICBiaW9zX3ZlbmRvciA9IGdldF9zbWJpb3Nfc3RyaW5nKCIvc3lzL2NsYXNzL2Rt aS9pZC9iaW9zX3ZlbmRvciIsICZiaW9zX3ZlbmRvcl9zaXplKTsKKyAgICAgICAgICAgICAgICAg ICAgICAgIGJpb3NfdmVyc2lvbiA9IGdldF9zbWJpb3Nfc3RyaW5nKCIvc3lzL2NsYXNzL2RtaS9p ZC9iaW9zX3ZlcnNpb24iLCAmYmlvc192ZXJzaW9uX3NpemUpOworICAgICAgICAgICAgICAgICAg ICAgICAgYmlvc19kYXRlID0gZ2V0X3NtYmlvc19zdHJpbmcoIi9zeXMvY2xhc3MvZG1pL2lkL2Jp b3NfZGF0ZSIsICZiaW9zX2RhdGVfc2l6ZSk7CisKKyAgICAgICAgICAgICAgICAgICAgICAgIGxl biA9IEZJRUxEX09GRlNFVChTWVNURU1fRklSTVdBUkVfVEFCTEVfSU5GT1JNQVRJT04sIFRhYmxl QnVmZmVyKTsKKworICAgICAgICAgICAgICAgICAgICAgICAgbGVuICs9IHNpemVvZihzdHJ1Y3Qg c21iaW9zX3Byb2xvZ3VlKTsKKworICAgICAgICAgICAgICAgICAgICAgICAgbGVuICs9IHNpemVv ZihzdHJ1Y3Qgc21iaW9zX2Jpb3MpOworICAgICAgICAgICAgICAgICAgICAgICAgbGVuICs9IG1h eChiaW9zX3ZlbmRvcl9zaXplICsgYmlvc192ZXJzaW9uX3NpemUgKyBiaW9zX2RhdGVfc2l6ZSAr IDEsIDIpOworCisgICAgICAgICAgICAgICAgICAgICAgICBpZiAoTGVuZ3RoIDwgbGVuKQorICAg ICAgICAgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldCA9 IFNUQVRVU19JTkZPX0xFTkdUSF9NSVNNQVRDSDsKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICBnb3RvIGZpbmlzaDsKKyAgICAgICAgICAgICAgICAgICAgICAgIH0KKworICAgICAgICAgICAg ICAgICAgICAgICAgc2Z0aS0+VGFibGVCdWZmZXJMZW5ndGggPSBsZW4gLSBGSUVMRF9PRkZTRVQo U1lTVEVNX0ZJUk1XQVJFX1RBQkxFX0lORk9STUFUSU9OLCBUYWJsZUJ1ZmZlcik7CisKKyAgICAg ICAgICAgICAgICAgICAgICAgIHByb2xvZ3VlID0gKHN0cnVjdCBzbWJpb3NfcHJvbG9ndWUqKWJ1 ZmZlcjsKKyAgICAgICAgICAgICAgICAgICAgICAgIHByb2xvZ3VlLT5jYWxsaW5nX21ldGhvZCA9 IDA7CisgICAgICAgICAgICAgICAgICAgICAgICBwcm9sb2d1ZS0+bWFqb3JfdmVyc2lvbiA9IDI7 CisgICAgICAgICAgICAgICAgICAgICAgICBwcm9sb2d1ZS0+bWlub3JfdmVyc2lvbiA9IDA7Cisg ICAgICAgICAgICAgICAgICAgICAgICBwcm9sb2d1ZS0+cmV2aXNpb24gPSAwOworICAgICAgICAg ICAgICAgICAgICAgICAgcHJvbG9ndWUtPmxlbmd0aCA9IHNmdGktPlRhYmxlQnVmZmVyTGVuZ3Ro IC0gc2l6ZW9mKHN0cnVjdCBzbWJpb3NfcHJvbG9ndWUpOworICAgICAgICAgICAgICAgICAgICAg ICAgYnVmZmVyICs9IHNpemVvZihzdHJ1Y3Qgc21iaW9zX3Byb2xvZ3VlKTsKKworICAgICAgICAg ICAgICAgICAgICAgICAgc3RyaW5nX2NvdW50ID0gMDsKKyAgICAgICAgICAgICAgICAgICAgICAg IGJpb3MgPSAoc3RydWN0IHNtYmlvc19iaW9zKilidWZmZXI7CisgICAgICAgICAgICAgICAgICAg ICAgICBiaW9zLT50eXBlID0gMDsKKyAgICAgICAgICAgICAgICAgICAgICAgIGJpb3MtPmxlbmd0 aCA9IHNpemVvZihzdHJ1Y3Qgc21iaW9zX2Jpb3MpOworICAgICAgICAgICAgICAgICAgICAgICAg Ymlvcy0+aGFuZGxlID0gMDsKKyAgICAgICAgICAgICAgICAgICAgICAgIGJpb3MtPnZlbmRvciA9 IGJpb3NfdmVuZG9yID8gKytzdHJpbmdfY291bnQgOiAwOworICAgICAgICAgICAgICAgICAgICAg ICAgYmlvcy0+dmVyc2lvbiA9IGJpb3NfdmVyc2lvbiA/ICsrc3RyaW5nX2NvdW50IDogMDsKKyAg ICAgICAgICAgICAgICAgICAgICAgIGJpb3MtPnN0YXJ0ID0gMDsKKyAgICAgICAgICAgICAgICAg ICAgICAgIGJpb3MtPmRhdGUgPSBiaW9zX2RhdGUgPyArK3N0cmluZ19jb3VudCA6IDA7CisgICAg ICAgICAgICAgICAgICAgICAgICBiaW9zLT5zaXplID0gMDsKKyAgICAgICAgICAgICAgICAgICAg ICAgIGJpb3MtPmNoYXJhY3RlcmlzdGljcyA9IDB4NDsgLyogbm90IHN1cHBvcnRlZCAqLworICAg ICAgICAgICAgICAgICAgICAgICAgYnVmZmVyICs9IHNpemVvZihzdHJ1Y3Qgc21iaW9zX2Jpb3Mp OworCisgICAgICAgICAgICAgICAgICAgICAgICBpZiAoc3RyaW5nX2NvdW50KQorICAgICAgICAg ICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvcHlfc21iaW9z X3N0cmluZygmYnVmZmVyLCBiaW9zX3ZlbmRvciwgYmlvc192ZW5kb3Jfc2l6ZSk7CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29weV9zbWJpb3Nfc3RyaW5nKCZidWZmZXIsIGJpb3NfdmVy c2lvbiwgYmlvc192ZXJzaW9uX3NpemUpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNv cHlfc21iaW9zX3N0cmluZygmYnVmZmVyLCBiaW9zX2RhdGUsIGJpb3NfZGF0ZV9zaXplKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICBtZW1zZXQoYnVmZmVyLCAwLCAxKTsKKyAgICAgICAg ICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAg ICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBtZW1zZXQoYnVm ZmVyLCAwLCAyKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAg ICAgICAgICAgZnJlZShiaW9zX3ZlbmRvcik7CisgICAgICAgICAgICAgICAgICAgICAgICBmcmVl KGJpb3NfdmVyc2lvbik7CisgICAgICAgICAgICAgICAgICAgICAgICBmcmVlKGJpb3NfZGF0ZSk7 CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgZ290byBmaW5pc2g7 CisjZW5kaWYKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgLyogZmFsbCB0aHJv dWdoICovCisgICAgICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgIHJldCA9IFNUQVRV U19OT1RfSU1QTEVNRU5URUQ7CisgICAgICAgICAgICAgICAgRklYTUUoImluZm9fY2xhc3MgU1lT VEVNX0ZJUk1XQVJFX1RBQkxFX0lORk9STUFUSU9OXG4iKTsKKyAgICAgICAgICAgIH0KKyAgICAg ICAgfQorICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogCUZJWE1FKCIoMHglMDh4LCVwLDB4 JTA4eCwlcCkgc3R1YlxuIiwKIAkgICAgICBTeXN0ZW1JbmZvcm1hdGlvbkNsYXNzLFN5c3RlbUlu Zm9ybWF0aW9uLExlbmd0aCxSZXN1bHRMZW5ndGgpOwpAQCAtMjM3MCw2ICsyNTM4LDcgQEAgTlRT VEFUVVMgV0lOQVBJIE50UXVlcnlTeXN0ZW1JbmZvcm1hdGlvbigKICAgICAgICAgcmV0ID0gU1RB VFVTX0lOVkFMSURfSU5GT19DTEFTUzsKICAgICB9CiAKK2ZpbmlzaDoKICAgICBpZiAoUmVzdWx0 TGVuZ3RoKSAqUmVzdWx0TGVuZ3RoID0gbGVuOwogCiAgICAgcmV0dXJuIHJldDsKLS0gCjIuMTcu MQoKCgo=