From f4e683fc6bd6ac76f9979f49d737588b6ddf16b0 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 14 11月 2020 22:13:13 +0800
Subject: [PATCH] windows smbios
---
src/library/os/windows/dmi_info.cpp | 94 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 85 insertions(+), 9 deletions(-)
diff --git a/src/library/os/windows/dmi_info.cpp b/src/library/os/windows/dmi_info.cpp
index 618be23..a88e76d 100644
--- a/src/library/os/windows/dmi_info.cpp
+++ b/src/library/os/windows/dmi_info.cpp
@@ -5,21 +5,97 @@
* Author: devel
*/
-#include <windows.h>
-#include "isvm/BIOSReader.h"
-#include "isvm/Native.h"
+#include "smbios.hpp"
#include "../../base/string_utils.h"
#include "../dmi_info.hpp"
namespace license {
namespace os {
+
+using namespace smbios;
+
+//#pragma pack()
+struct RawSMBIOSData {
+ BYTE Used20CallingMethod;
+ BYTE SMBIOSMajorVersion;
+ BYTE SMBIOSMinorVersion;
+ BYTE DmiRevision;
+ DWORD Length;
+ //BYTE SMBIOSTableData[1];
+};
+
+bool readSMBIOS(std::vector<uint8_t> &buffer) {
+ const DWORD tableSignature = ('R' << 24) | ('S' << 16) | ('M' << 8) | 'B';
+ bool can_read = false;
+ uint32_t size = GetSystemFirmwareTable(tableSignature, 0, NULL, 0);
+ if (size > 0) {
+ buffer.resize(size);
+ if (GetSystemFirmwareTable(tableSignature, 0, buffer.data(), size)
+ > 0) {
+ can_read = true;
+ }
+ }
+ return can_read;
+}
+
DmiInfo::DmiInfo() {
- if (InitEntryPoints()) {
- BIOSReader reader;
- SystemInformation info = reader.readSystemInfo();
- m_sys_vendor = toupper_copy(info.Manufacturer);
- m_bios_vendor = toupper_copy(info.ProductName);
- m_bios_description = toupper_copy(info.SysVersion) + toupper_copy(info.family);
+ std::vector<uint8_t> raw_smbios_data;
+ if (readSMBIOS(raw_smbios_data)) {
+ smbios::parser smbios_parser;
+ RawSMBIOSData *rawData = reinterpret_cast<RawSMBIOSData *>(raw_smbios_data.data());
+ size_t length = static_cast<size_t>(rawData->Length);
+ uint8_t* buff= raw_smbios_data.data() + sizeof(RawSMBIOSData);
+ smbios_parser.feed(buff, length);
+
+ for (auto &header : smbios_parser.headers) {
+ string_array_t strings;
+ parser::extract_strings(header, strings);
+
+ switch (header->type) {
+ case types::baseboard_info: {
+ auto *const x = reinterpret_cast<baseboard_info *>(header);
+
+ if (x->length == 0) break;
+ if (x->manufacturer_name > 0 && x->manufacturer_name < x->length) {
+ m_sys_vendor = strings[x->manufacturer_name];
+ }
+ } break;
+
+ case types::bios_info: {
+ auto *const x = reinterpret_cast<bios_info *>(header);
+ if (x->length == 0) break;
+ if (x->vendor > 0 && x->vendor < x->length) {
+ m_bios_vendor = strings[x->vendor];
+ }
+ } break;
+
+ case types::processor_info: {
+ auto *const x = reinterpret_cast<proc_info *>(header);
+
+ if (x->length == 0) break;
+ if (x->manufacturer > 0 && x->manufacturer < x->length) {
+ m_cpu_manufacturer = strings[x->manufacturer];
+ }
+ m_cpu_cores = static_cast<unsigned int>(x->cores);
+ } break;
+
+ case types::system_info: {
+ auto *const x = reinterpret_cast<system_info *>(header);
+
+ if (x->length == 0) break;
+ if (x->manufacturer > 0 && x->manufacturer<x->length && x-> product_name > 0 &&
+ x->product_name < x->length) {
+ m_bios_description =
+ std::string(strings[x->manufacturer]) + std::string(strings[x->product_name]);
+ }
+ } break;
+ default:;
+ }
+ }
+ //smbios_parser.clear();
+ }
+ else {
+
}
}
}
--
Gitblit v1.9.1