From 7d26894bc92959cb24ca884363c51bd55b8f63c3 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周一, 16 11月 2020 10:48:54 +0800
Subject: [PATCH] cleanup & mingw fix
---
/dev/null | 22 ----------------------
src/library/os/windows/smbios.hpp | 2 +-
2 files changed, 1 insertions(+), 23 deletions(-)
diff --git a/src/library/os/windows/isvm/BIOSReader.cpp b/src/library/os/windows/isvm/BIOSReader.cpp
deleted file mode 100644
index 665da27..0000000
--- a/src/library/os/windows/isvm/BIOSReader.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-#include <windows.h>
-#include <cstdint>
-#include <vector>
-#include <stdint.h>
-#include "BIOSReader.h"
-#include "../../../base/logger.h"
-
-struct smbios_structure_header {
- uint8_t type;
- uint8_t length;
- uint16_t handle;
-};
-
-//
-// System information
-//
-struct smbios_type_1 {
- struct smbios_structure_header header;
- uint8_t manufacturer_str;
- uint8_t product_name_str;
- uint8_t version_str;
- uint8_t serial_number_str;
- uint8_t uuid[16];
- uint8_t wake_up_type;
- uint8_t sku_number_str;
- uint8_t family_str;
-};
-
-#define _TYPE_COUNT1 6
-
-#define _CONCATE(x, y) x##y
-#define CONCATE(x, y) _CONCATE(x, y)
-#define TYPE_COUNT(t) CONCATE(_TYPE_COUNT, t)
-
-//
-// Windows
-//
-#include <windows.h>
-#include <tchar.h>
-
-int8_t *parse_smbiod_content(int8_t *addr, int8_t **indexes, int32_t *count) {
- //! ignore 0
- int8_t parsed_count = 0;
- int8_t *raw_addr = addr;
-
- //! first one
- if (indexes) *indexes = raw_addr;
-
- bool reach_terminal = false;
-
- while (true) {
- if (0 == *raw_addr++) {
- if (reach_terminal)
- break;
- else {
- ++parsed_count;
-
- if (count && parsed_count < *count) {
- if (indexes) *(indexes + parsed_count) = raw_addr;
- }
-
- reach_terminal = true;
- }
- } else {
- reach_terminal = false;
- continue;
- }
- }
-
- if (count) *count = parsed_count;
-
- return raw_addr;
-}
-
-void read_smbios_type_1(int8_t *addr, SystemInformation *info) {
- smbios_type_1 *t1 = (smbios_type_1 *)addr;
-
- int32_t offset = ((0x0F) & (t1->header.length >> 4)) * 16 + (t1->header.length & 0x0F);
-
- int8_t *string_addr[TYPE_COUNT(1)] = {0};
-
- int32_t count = TYPE_COUNT(1);
- parse_smbiod_content((int8_t *)t1 + offset, string_addr, &count);
-
- if (0 != t1->manufacturer_str)
- info->Manufacturer = (std::string::traits_type::char_type *)string_addr[t1->manufacturer_str - 1];
-
- if (0 != t1->product_name_str)
- info->ProductName = (std::string::traits_type::char_type *)string_addr[t1->product_name_str - 1];
-
- if (0 != t1->serial_number_str)
- info->SerialNum = (std::string::traits_type::char_type *)string_addr[t1->serial_number_str - 1];
-
- if (0 != t1->version_str)
- info->SysVersion = (std::string::traits_type::char_type *)string_addr[t1->version_str - 1];
-
- if (0 != t1->family_str) info->family = (std::string::traits_type::char_type *)string_addr[t1->family_str - 1];
-}
-
-struct RawSMBIOSData {
- BYTE Used20CallingMethod;
- BYTE SMBIOSMajorVersion;
- BYTE SMBIOSMinorVersion;
- BYTE DmiRevision;
- DWORD Length;
- BYTE SMBIOSTableData[];
-};
-
-
-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;
-}
-
-SystemInformation BIOSReader::readSystemInfo() {
- SystemInformation info = {};
- std::vector<uint8_t> buffer;
-
- if (readSMBIOS(buffer)) {
-
- /*RawSMBIOSData *data = (RawSMBIOSData *)(buffer.data());
-
- smbios_structure_header *header = (smbios_structure_header *)(data->SMBIOSTableData);
-
- while (nullptr != header) {
- if (1 == header->type) {
- read_smbios_type_1((int8_t *)header, &info);
- header = nullptr; //! stop
- } else {
- int32_t offset = ((0x0F) & (header->length >> 4)) * 16 + (header->length & 0x0F);
- header = (smbios_structure_header *)parse_smbiod_content((int8_t *)header + offset, NULL, NULL);
- }
- }*/
- } else {
- LOG_DEBUG("Can't read smbios table");
- }
- return info;
-}
diff --git a/src/library/os/windows/isvm/BIOSReader.h b/src/library/os/windows/isvm/BIOSReader.h
deleted file mode 100644
index 4fcfb05..0000000
--- a/src/library/os/windows/isvm/BIOSReader.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef BIOSREADER_H
-#define BIOSREADER_H
-
-#include <string>
-
-class SystemInformation
-{
-public:
- std::string Manufacturer;
- std::string ProductName;
- std::string SysVersion;
- std::string SerialNum;
- std::string family;
-};
-
-class BIOSReader
-{
-public:
- SystemInformation readSystemInfo();
-};
-
-#endif
diff --git a/src/library/os/windows/smbios.hpp b/src/library/os/windows/smbios.hpp
index 1209758..83c6ea6 100644
--- a/src/library/os/windows/smbios.hpp
+++ b/src/library/os/windows/smbios.hpp
@@ -6,7 +6,7 @@
#define SMBIOS_H
#pragma once
-#include <Windows.h>
+#include <windows.h>
#include <cstdint>
#include <vector>
--
Gitblit v1.9.1