[PATCH v4 3/5] ntdll: Return board info from NtQuerySystemInformation on Linux
Alex Henrie <[email protected]> Wed, 13 Jun 2018 21:41:17 -0600
| Newsgroups | gmane.comp.emulators.wine.patches |
|---|---|
| Message-ID | <[email protected]> |
U2lnbmVkLW9mZi1ieTogQWxleCBIZW5yaWUgPGFsZXhoZW5yaWUyNEBnbWFpbC5jb20+Ci0tLQog ZGxscy9udGRsbC9udC5jIHwgNTEgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDUxIGluc2VydGlvbnMoKykKCmRpZmYgLS1n aXQgYS9kbGxzL250ZGxsL250LmMgYi9kbGxzL250ZGxsL250LmMKaW5kZXggMTYyYzc0NjdjOC4u M2M5NTk5MjgxOCAxMDA2NDQKLS0tIGEvZGxscy9udGRsbC9udC5jCisrKyBiL2RsbHMvbnRkbGwv bnQuYwpAQCAtMTEzLDYgKzExMywxNiBAQCBzdHJ1Y3Qgc21iaW9zX3N5c3RlbSB7CiAgICAgQllU RSBzZXJpYWw7CiB9OwogCitzdHJ1Y3Qgc21iaW9zX2JvYXJkIHsKKyAgICBCWVRFIHR5cGU7Cisg ICAgQllURSBsZW5ndGg7CisgICAgV09SRCBoYW5kbGU7CisgICAgQllURSB2ZW5kb3I7CisgICAg QllURSBwcm9kdWN0OworICAgIEJZVEUgdmVyc2lvbjsKKyAgICBCWVRFIHNlcmlhbDsKK307CisK ICNpbmNsdWRlICJwb3BwYWNrLmgiCiAKIC8qIEZpcm13YXJlIHRhYmxlIHByb3ZpZGVycyAqLwpA QCAtMjQ2OCwxMSArMjQ3OCwxNCBAQCBOVFNUQVRVUyBXSU5BUEkgTnRRdWVyeVN5c3RlbUluZm9y bWF0aW9uKAogICAgICAgICAgICAgICAgICAgICAgICAgc2l6ZV90IGJpb3NfdmVuZG9yX3NpemUs IGJpb3NfdmVyc2lvbl9zaXplLCBiaW9zX2RhdGVfc2l6ZTsKICAgICAgICAgICAgICAgICAgICAg ICAgIGNoYXIgKnN5c3RlbV92ZW5kb3IsICpzeXN0ZW1fcHJvZHVjdCwgKnN5c3RlbV92ZXJzaW9u LCAqc3lzdGVtX3NlcmlhbDsKICAgICAgICAgICAgICAgICAgICAgICAgIHNpemVfdCBzeXN0ZW1f dmVuZG9yX3NpemUsIHN5c3RlbV9wcm9kdWN0X3NpemUsIHN5c3RlbV92ZXJzaW9uX3NpemUsIHN5 c3RlbV9zZXJpYWxfc2l6ZTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGNoYXIgKmJvYXJkX3Zl bmRvciwgKmJvYXJkX3Byb2R1Y3QsICpib2FyZF92ZXJzaW9uLCAqYm9hcmRfc2VyaWFsOworICAg ICAgICAgICAgICAgICAgICAgICAgc2l6ZV90IGJvYXJkX3ZlbmRvcl9zaXplLCBib2FyZF9wcm9k dWN0X3NpemUsIGJvYXJkX3ZlcnNpb25fc2l6ZSwgYm9hcmRfc2VyaWFsX3NpemU7CiAgICAgICAg ICAgICAgICAgICAgICAgICBjaGFyICpidWZmZXIgPSAoY2hhciopc2Z0aS0+VGFibGVCdWZmZXI7 CiAgICAgICAgICAgICAgICAgICAgICAgICBCWVRFIHN0cmluZ19jb3VudDsKICAgICAgICAgICAg ICAgICAgICAgICAgIHN0cnVjdCBzbWJpb3NfcHJvbG9ndWUgKnByb2xvZ3VlOwogICAgICAgICAg ICAgICAgICAgICAgICAgc3RydWN0IHNtYmlvc19iaW9zICpiaW9zOwogICAgICAgICAgICAgICAg ICAgICAgICAgc3RydWN0IHNtYmlvc19zeXN0ZW0gKnN5c3RlbTsKKyAgICAgICAgICAgICAgICAg ICAgICAgIHN0cnVjdCBzbWJpb3NfYm9hcmQgKmJvYXJkOwogCiAgICAgICAgICAgICAgICAgICAg ICAgICBiaW9zX3ZlbmRvciA9IGdldF9zbWJpb3Nfc3RyaW5nKCIvc3lzL2NsYXNzL2RtaS9pZC9i aW9zX3ZlbmRvciIsICZiaW9zX3ZlbmRvcl9zaXplKTsKICAgICAgICAgICAgICAgICAgICAgICAg IGJpb3NfdmVyc2lvbiA9IGdldF9zbWJpb3Nfc3RyaW5nKCIvc3lzL2NsYXNzL2RtaS9pZC9iaW9z X3ZlcnNpb24iLCAmYmlvc192ZXJzaW9uX3NpemUpOwpAQCAtMjQ4MSw2ICsyNDk0LDEwIEBAIE5U U1RBVFVTIFdJTkFQSSBOdFF1ZXJ5U3lzdGVtSW5mb3JtYXRpb24oCiAgICAgICAgICAgICAgICAg ICAgICAgICBzeXN0ZW1fcHJvZHVjdCA9IGdldF9zbWJpb3Nfc3RyaW5nKCIvc3lzL2NsYXNzL2Rt aS9pZC9wcm9kdWN0IiwgJnN5c3RlbV9wcm9kdWN0X3NpemUpOwogICAgICAgICAgICAgICAgICAg ICAgICAgc3lzdGVtX3ZlcnNpb24gPSBnZXRfc21iaW9zX3N0cmluZygiL3N5cy9jbGFzcy9kbWkv aWQvcHJvZHVjdF92ZXJzaW9uIiwgJnN5c3RlbV92ZXJzaW9uX3NpemUpOwogICAgICAgICAgICAg ICAgICAgICAgICAgc3lzdGVtX3NlcmlhbCA9IGdldF9zbWJpb3Nfc3RyaW5nKCIvc3lzL2NsYXNz L2RtaS9pZC9wcm9kdWN0X3NlcmlhbCIsICZzeXN0ZW1fc2VyaWFsX3NpemUpOworICAgICAgICAg ICAgICAgICAgICAgICAgYm9hcmRfdmVuZG9yID0gZ2V0X3NtYmlvc19zdHJpbmcoIi9zeXMvY2xh c3MvZG1pL2lkL2JvYXJkX3ZlbmRvciIsICZib2FyZF92ZW5kb3Jfc2l6ZSk7CisgICAgICAgICAg ICAgICAgICAgICAgICBib2FyZF9wcm9kdWN0ID0gZ2V0X3NtYmlvc19zdHJpbmcoIi9zeXMvY2xh c3MvZG1pL2lkL2JvYXJkX25hbWUiLCAmYm9hcmRfcHJvZHVjdF9zaXplKTsKKyAgICAgICAgICAg ICAgICAgICAgICAgIGJvYXJkX3ZlcnNpb24gPSBnZXRfc21iaW9zX3N0cmluZygiL3N5cy9jbGFz cy9kbWkvaWQvYm9hcmRfdmVyc2lvbiIsICZib2FyZF92ZXJzaW9uX3NpemUpOworICAgICAgICAg ICAgICAgICAgICAgICAgYm9hcmRfc2VyaWFsID0gZ2V0X3NtYmlvc19zdHJpbmcoIi9zeXMvY2xh c3MvZG1pL2lkL2JvYXJkX3NlcmlhbCIsICZib2FyZF9zZXJpYWxfc2l6ZSk7CiAKICAgICAgICAg ICAgICAgICAgICAgICAgIGxlbiA9IEZJRUxEX09GRlNFVChTWVNURU1fRklSTVdBUkVfVEFCTEVf SU5GT1JNQVRJT04sIFRhYmxlQnVmZmVyKTsKIApAQCAtMjQ5Myw2ICsyNTEwLDEwIEBAIE5UU1RB VFVTIFdJTkFQSSBOdFF1ZXJ5U3lzdGVtSW5mb3JtYXRpb24oCiAgICAgICAgICAgICAgICAgICAg ICAgICBsZW4gKz0gbWF4KHN5c3RlbV92ZW5kb3Jfc2l6ZSArIHN5c3RlbV9wcm9kdWN0X3NpemUg KyBzeXN0ZW1fdmVyc2lvbl9zaXplICsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgc3lzdGVtX3NlcmlhbF9zaXplICsgMSwgMik7CiAKKyAgICAgICAgICAgICAgICAgICAgICAg IGxlbiArPSBzaXplb2Yoc3RydWN0IHNtYmlvc19ib2FyZCk7CisgICAgICAgICAgICAgICAgICAg ICAgICBsZW4gKz0gbWF4KGJvYXJkX3ZlbmRvcl9zaXplICsgYm9hcmRfcHJvZHVjdF9zaXplICsg Ym9hcmRfdmVyc2lvbl9zaXplICsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Ym9hcmRfc2VyaWFsX3NpemUgKyAxLCAyKTsKKwogICAgICAgICAgICAgICAgICAgICAgICAgaWYg KExlbmd0aCA8IGxlbikKICAgICAgICAgICAgICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICByZXQgPSBTVEFUVVNfSU5GT19MRU5HVEhfTUlTTUFUQ0g7CkBAIC0yNTU0 LDYgKzI1NzUsMzIgQEAgTlRTVEFUVVMgV0lOQVBJIE50UXVlcnlTeXN0ZW1JbmZvcm1hdGlvbigK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb3B5X3NtYmlvc19zdHJpbmcoJmJ1ZmZlciwg c3lzdGVtX3ZlcnNpb24sIHN5c3RlbV92ZXJzaW9uX3NpemUpOwogICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNvcHlfc21iaW9zX3N0cmluZygmYnVmZmVyLCBzeXN0ZW1fc2VyaWFsLCBzeXN0 ZW1fc2VyaWFsX3NpemUpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1lbXNldChidWZm ZXIsIDAsIDEpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJ1ZmZlcisrOworICAgICAg ICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICAgICAgZWxzZQorICAgICAg ICAgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1lbXNldChi dWZmZXIsIDAsIDIpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJ1ZmZlciArPSAyOwor ICAgICAgICAgICAgICAgICAgICAgICAgfQorCisgICAgICAgICAgICAgICAgICAgICAgICBzdHJp bmdfY291bnQgPSAwOworICAgICAgICAgICAgICAgICAgICAgICAgYm9hcmQgPSAoc3RydWN0IHNt Ymlvc19ib2FyZCopYnVmZmVyOworICAgICAgICAgICAgICAgICAgICAgICAgYm9hcmQtPnR5cGUg PSAyOworICAgICAgICAgICAgICAgICAgICAgICAgYm9hcmQtPmxlbmd0aCA9IHNpemVvZihzdHJ1 Y3Qgc21iaW9zX2JvYXJkKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGJvYXJkLT5oYW5kbGUg PSAwOworICAgICAgICAgICAgICAgICAgICAgICAgYm9hcmQtPnZlbmRvciA9IGJvYXJkX3ZlbmRv ciA/ICsrc3RyaW5nX2NvdW50IDogMDsKKyAgICAgICAgICAgICAgICAgICAgICAgIGJvYXJkLT5w cm9kdWN0ID0gYm9hcmRfcHJvZHVjdCA/ICsrc3RyaW5nX2NvdW50IDogMDsKKyAgICAgICAgICAg ICAgICAgICAgICAgIGJvYXJkLT52ZXJzaW9uID0gYm9hcmRfdmVyc2lvbiA/ICsrc3RyaW5nX2Nv dW50IDogMDsKKyAgICAgICAgICAgICAgICAgICAgICAgIGJvYXJkLT5zZXJpYWwgPSBib2FyZF9z ZXJpYWwgPyArK3N0cmluZ19jb3VudCA6IDA7CisgICAgICAgICAgICAgICAgICAgICAgICBidWZm ZXIgKz0gc2l6ZW9mKHN0cnVjdCBzbWJpb3NfYm9hcmQpOworCisgICAgICAgICAgICAgICAgICAg ICAgICBpZiAoc3RyaW5nX2NvdW50KQorICAgICAgICAgICAgICAgICAgICAgICAgeworICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGNvcHlfc21iaW9zX3N0cmluZygmYnVmZmVyLCBib2FyZF92 ZW5kb3IsIGJvYXJkX3ZlbmRvcl9zaXplKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b3B5X3NtYmlvc19zdHJpbmcoJmJ1ZmZlciwgYm9hcmRfcHJvZHVjdCwgYm9hcmRfcHJvZHVjdF9z aXplKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb3B5X3NtYmlvc19zdHJpbmcoJmJ1 ZmZlciwgYm9hcmRfdmVyc2lvbiwgYm9hcmRfdmVyc2lvbl9zaXplKTsKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICBjb3B5X3NtYmlvc19zdHJpbmcoJmJ1ZmZlciwgYm9hcmRfc2VyaWFsLCBi b2FyZF9zZXJpYWxfc2l6ZSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWVtc2V0KGJ1 ZmZlciwgMCwgMSk7CiAgICAgICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAg ICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAgICAgICB7CkBAIC0yNTY3LDYgKzI2MTQs MTAgQEAgTlRTVEFUVVMgV0lOQVBJIE50UXVlcnlTeXN0ZW1JbmZvcm1hdGlvbigKICAgICAgICAg ICAgICAgICAgICAgICAgIGZyZWUoc3lzdGVtX3Byb2R1Y3QpOwogICAgICAgICAgICAgICAgICAg ICAgICAgZnJlZShzeXN0ZW1fdmVyc2lvbik7CiAgICAgICAgICAgICAgICAgICAgICAgICBmcmVl KHN5c3RlbV9zZXJpYWwpOworICAgICAgICAgICAgICAgICAgICAgICAgZnJlZShib2FyZF92ZW5k b3IpOworICAgICAgICAgICAgICAgICAgICAgICAgZnJlZShib2FyZF9wcm9kdWN0KTsKKyAgICAg ICAgICAgICAgICAgICAgICAgIGZyZWUoYm9hcmRfdmVyc2lvbik7CisgICAgICAgICAgICAgICAg ICAgICAgICBmcmVlKGJvYXJkX3NlcmlhbCk7CiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgICAgICAgICAgZ290byBmaW5pc2g7CiAjZW5kaWYKLS0gCjIuMTcuMQoKCgo=