[PATCH v4 2/5] ntdll: Return system info from NtQuerySystemInformation on Linux
Alex Henrie <[email protected]> Wed, 13 Jun 2018 21:41:16 -0600
| Newsgroups | gmane.comp.emulators.wine.patches |
|---|---|
| Message-ID | <[email protected]> |
U2lnbmVkLW9mZi1ieTogQWxleCBIZW5yaWUgPGFsZXhoZW5yaWUyNEBnbWFpbC5jb20+Ci0tLQog ZGxscy9udGRsbC9udC5jIHwgNTEgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDUxIGluc2VydGlvbnMoKykKCmRpZmYgLS1n aXQgYS9kbGxzL250ZGxsL250LmMgYi9kbGxzL250ZGxsL250LmMKaW5kZXggNzJhZTM4MTgxMy4u MTYyYzc0NjdjOCAxMDA2NDQKLS0tIGEvZGxscy9udGRsbC9udC5jCisrKyBiL2RsbHMvbnRkbGwv bnQuYwpAQCAtMTAzLDYgKzEwMywxNiBAQCBzdHJ1Y3Qgc21iaW9zX2Jpb3MgewogICAgIFVJTlQ2 NCBjaGFyYWN0ZXJpc3RpY3M7CiB9OwogCitzdHJ1Y3Qgc21iaW9zX3N5c3RlbSB7CisgICAgQllU RSB0eXBlOworICAgIEJZVEUgbGVuZ3RoOworICAgIFdPUkQgaGFuZGxlOworICAgIEJZVEUgdmVu ZG9yOworICAgIEJZVEUgcHJvZHVjdDsKKyAgICBCWVRFIHZlcnNpb247CisgICAgQllURSBzZXJp YWw7Cit9OworCiAjaW5jbHVkZSAicG9wcGFjay5oIgogCiAvKiBGaXJtd2FyZSB0YWJsZSBwcm92 aWRlcnMgKi8KQEAgLTI0NTYsMTQgKzI0NjYsMjEgQEAgTlRTVEFUVVMgV0lOQVBJIE50UXVlcnlT eXN0ZW1JbmZvcm1hdGlvbigKICAgICAgICAgICAgICAgICAgICAgewogICAgICAgICAgICAgICAg ICAgICAgICAgY2hhciAqYmlvc192ZW5kb3IsICpiaW9zX3ZlcnNpb24sICpiaW9zX2RhdGU7CiAg ICAgICAgICAgICAgICAgICAgICAgICBzaXplX3QgYmlvc192ZW5kb3Jfc2l6ZSwgYmlvc192ZXJz aW9uX3NpemUsIGJpb3NfZGF0ZV9zaXplOworICAgICAgICAgICAgICAgICAgICAgICAgY2hhciAq c3lzdGVtX3ZlbmRvciwgKnN5c3RlbV9wcm9kdWN0LCAqc3lzdGVtX3ZlcnNpb24sICpzeXN0ZW1f c2VyaWFsOworICAgICAgICAgICAgICAgICAgICAgICAgc2l6ZV90IHN5c3RlbV92ZW5kb3Jfc2l6 ZSwgc3lzdGVtX3Byb2R1Y3Rfc2l6ZSwgc3lzdGVtX3ZlcnNpb25fc2l6ZSwgc3lzdGVtX3Nlcmlh bF9zaXplOwogICAgICAgICAgICAgICAgICAgICAgICAgY2hhciAqYnVmZmVyID0gKGNoYXIqKXNm dGktPlRhYmxlQnVmZmVyOwogICAgICAgICAgICAgICAgICAgICAgICAgQllURSBzdHJpbmdfY291 bnQ7CiAgICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3Qgc21iaW9zX3Byb2xvZ3VlICpwcm9s b2d1ZTsKICAgICAgICAgICAgICAgICAgICAgICAgIHN0cnVjdCBzbWJpb3NfYmlvcyAqYmlvczsK KyAgICAgICAgICAgICAgICAgICAgICAgIHN0cnVjdCBzbWJpb3Nfc3lzdGVtICpzeXN0ZW07CiAK ICAgICAgICAgICAgICAgICAgICAgICAgIGJpb3NfdmVuZG9yID0gZ2V0X3NtYmlvc19zdHJpbmco Ii9zeXMvY2xhc3MvZG1pL2lkL2Jpb3NfdmVuZG9yIiwgJmJpb3NfdmVuZG9yX3NpemUpOwogICAg ICAgICAgICAgICAgICAgICAgICAgYmlvc192ZXJzaW9uID0gZ2V0X3NtYmlvc19zdHJpbmcoIi9z eXMvY2xhc3MvZG1pL2lkL2Jpb3NfdmVyc2lvbiIsICZiaW9zX3ZlcnNpb25fc2l6ZSk7CiAgICAg ICAgICAgICAgICAgICAgICAgICBiaW9zX2RhdGUgPSBnZXRfc21iaW9zX3N0cmluZygiL3N5cy9j bGFzcy9kbWkvaWQvYmlvc19kYXRlIiwgJmJpb3NfZGF0ZV9zaXplKTsKKyAgICAgICAgICAgICAg ICAgICAgICAgIHN5c3RlbV92ZW5kb3IgPSBnZXRfc21iaW9zX3N0cmluZygiL3N5cy9jbGFzcy9k bWkvaWQvc3lzX3ZlbmRvciIsICZzeXN0ZW1fdmVuZG9yX3NpemUpOworICAgICAgICAgICAgICAg ICAgICAgICAgc3lzdGVtX3Byb2R1Y3QgPSBnZXRfc21iaW9zX3N0cmluZygiL3N5cy9jbGFzcy9k bWkvaWQvcHJvZHVjdCIsICZzeXN0ZW1fcHJvZHVjdF9zaXplKTsKKyAgICAgICAgICAgICAgICAg ICAgICAgIHN5c3RlbV92ZXJzaW9uID0gZ2V0X3NtYmlvc19zdHJpbmcoIi9zeXMvY2xhc3MvZG1p L2lkL3Byb2R1Y3RfdmVyc2lvbiIsICZzeXN0ZW1fdmVyc2lvbl9zaXplKTsKKyAgICAgICAgICAg ICAgICAgICAgICAgIHN5c3RlbV9zZXJpYWwgPSBnZXRfc21iaW9zX3N0cmluZygiL3N5cy9jbGFz cy9kbWkvaWQvcHJvZHVjdF9zZXJpYWwiLCAmc3lzdGVtX3NlcmlhbF9zaXplKTsKIAogICAgICAg ICAgICAgICAgICAgICAgICAgbGVuID0gRklFTERfT0ZGU0VUKFNZU1RFTV9GSVJNV0FSRV9UQUJM RV9JTkZPUk1BVElPTiwgVGFibGVCdWZmZXIpOwogCkBAIC0yNDcyLDYgKzI0ODksMTAgQEAgTlRT VEFUVVMgV0lOQVBJIE50UXVlcnlTeXN0ZW1JbmZvcm1hdGlvbigKICAgICAgICAgICAgICAgICAg ICAgICAgIGxlbiArPSBzaXplb2Yoc3RydWN0IHNtYmlvc19iaW9zKTsKICAgICAgICAgICAgICAg ICAgICAgICAgIGxlbiArPSBtYXgoYmlvc192ZW5kb3Jfc2l6ZSArIGJpb3NfdmVyc2lvbl9zaXpl ICsgYmlvc19kYXRlX3NpemUgKyAxLCAyKTsKIAorICAgICAgICAgICAgICAgICAgICAgICAgbGVu ICs9IHNpemVvZihzdHJ1Y3Qgc21iaW9zX3N5c3RlbSk7CisgICAgICAgICAgICAgICAgICAgICAg ICBsZW4gKz0gbWF4KHN5c3RlbV92ZW5kb3Jfc2l6ZSArIHN5c3RlbV9wcm9kdWN0X3NpemUgKyBz eXN0ZW1fdmVyc2lvbl9zaXplICsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg c3lzdGVtX3NlcmlhbF9zaXplICsgMSwgMik7CisKICAgICAgICAgICAgICAgICAgICAgICAgIGlm IChMZW5ndGggPCBsZW4pCiAgICAgICAgICAgICAgICAgICAgICAgICB7CiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgcmV0ID0gU1RBVFVTX0lORk9fTEVOR1RIX01JU01BVENIOwpAQCAtMjUw Nyw2ICsyNTI4LDMyIEBAIE5UU1RBVFVTIFdJTkFQSSBOdFF1ZXJ5U3lzdGVtSW5mb3JtYXRpb24o CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29weV9zbWJpb3Nfc3RyaW5nKCZidWZmZXIs IGJpb3NfdmVyc2lvbiwgYmlvc192ZXJzaW9uX3NpemUpOwogICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNvcHlfc21iaW9zX3N0cmluZygmYnVmZmVyLCBiaW9zX2RhdGUsIGJpb3NfZGF0ZV9z aXplKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtZW1zZXQoYnVmZmVyLCAwLCAxKTsK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICBidWZmZXIrKzsKKyAgICAgICAgICAgICAgICAg ICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAg ICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBtZW1zZXQoYnVmZmVyLCAwLCAy KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBidWZmZXIgKz0gMjsKKyAgICAgICAgICAg ICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgICAgICAgICAgc3RyaW5nX2NvdW50ID0g MDsKKyAgICAgICAgICAgICAgICAgICAgICAgIHN5c3RlbSA9IChzdHJ1Y3Qgc21iaW9zX3N5c3Rl bSopYnVmZmVyOworICAgICAgICAgICAgICAgICAgICAgICAgc3lzdGVtLT50eXBlID0gMTsKKyAg ICAgICAgICAgICAgICAgICAgICAgIHN5c3RlbS0+bGVuZ3RoID0gc2l6ZW9mKHN0cnVjdCBzbWJp b3Nfc3lzdGVtKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHN5c3RlbS0+aGFuZGxlID0gMDsK KyAgICAgICAgICAgICAgICAgICAgICAgIHN5c3RlbS0+dmVuZG9yID0gc3lzdGVtX3ZlbmRvciA/ ICsrc3RyaW5nX2NvdW50IDogMDsKKyAgICAgICAgICAgICAgICAgICAgICAgIHN5c3RlbS0+cHJv ZHVjdCA9IHN5c3RlbV9wcm9kdWN0ID8gKytzdHJpbmdfY291bnQgOiAwOworICAgICAgICAgICAg ICAgICAgICAgICAgc3lzdGVtLT52ZXJzaW9uID0gc3lzdGVtX3ZlcnNpb24gPyArK3N0cmluZ19j b3VudCA6IDA7CisgICAgICAgICAgICAgICAgICAgICAgICBzeXN0ZW0tPnNlcmlhbCA9IHN5c3Rl bV9zZXJpYWwgPyArK3N0cmluZ19jb3VudCA6IDA7CisgICAgICAgICAgICAgICAgICAgICAgICBi dWZmZXIgKz0gc2l6ZW9mKHN0cnVjdCBzbWJpb3Nfc3lzdGVtKTsKKworICAgICAgICAgICAgICAg ICAgICAgICAgaWYgKHN0cmluZ19jb3VudCkKKyAgICAgICAgICAgICAgICAgICAgICAgIHsKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjb3B5X3NtYmlvc19zdHJpbmcoJmJ1ZmZlciwgc3lz dGVtX3ZlbmRvciwgc3lzdGVtX3ZlbmRvcl9zaXplKTsKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICBjb3B5X3NtYmlvc19zdHJpbmcoJmJ1ZmZlciwgc3lzdGVtX3Byb2R1Y3QsIHN5c3RlbV9w cm9kdWN0X3NpemUpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvcHlfc21iaW9zX3N0 cmluZygmYnVmZmVyLCBzeXN0ZW1fdmVyc2lvbiwgc3lzdGVtX3ZlcnNpb25fc2l6ZSk7CisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgY29weV9zbWJpb3Nfc3RyaW5nKCZidWZmZXIsIHN5c3Rl bV9zZXJpYWwsIHN5c3RlbV9zZXJpYWxfc2l6ZSk7CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgbWVtc2V0KGJ1ZmZlciwgMCwgMSk7CiAgICAgICAgICAgICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAgICAgICB7CkBAIC0y NTE2LDYgKzI1NjMsMTAgQEAgTlRTVEFUVVMgV0lOQVBJIE50UXVlcnlTeXN0ZW1JbmZvcm1hdGlv bigKICAgICAgICAgICAgICAgICAgICAgICAgIGZyZWUoYmlvc192ZW5kb3IpOwogICAgICAgICAg ICAgICAgICAgICAgICAgZnJlZShiaW9zX3ZlcnNpb24pOwogICAgICAgICAgICAgICAgICAgICAg ICAgZnJlZShiaW9zX2RhdGUpOworICAgICAgICAgICAgICAgICAgICAgICAgZnJlZShzeXN0ZW1f dmVuZG9yKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGZyZWUoc3lzdGVtX3Byb2R1Y3QpOwor ICAgICAgICAgICAgICAgICAgICAgICAgZnJlZShzeXN0ZW1fdmVyc2lvbik7CisgICAgICAgICAg ICAgICAgICAgICAgICBmcmVlKHN5c3RlbV9zZXJpYWwpOwogICAgICAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICAgICAgICAgIGdvdG8gZmluaXNoOwogI2VuZGlmCi0tIAoyLjE3LjEKCgoK