Fix Windows and C++ support

Author: brunexgeek

smbios.c

@@ -20,10 +20,6 @@
 
 #define VALID_VERSION(x) (((x) >= SMBIOS_2_0 && (x) <= SMBIOS_2_8) || (x) == SMBIOS_3_0)
 
-#ifdef __cplusplus
-namespace smbios {
-#endif
-
 static SMBIOS_CONSTEXPR size_t SMBIOS_HEADER_SIZE = 32;
 static SMBIOS_CONSTEXPR size_t SMBIOS_ENTRY_HEADER_SIZE = 4;
 
@@ -768,6 +764,3 @@ int smbios_get_version(struct ParserContext *context, int *selected, int *origin
     return SMBERR_OK;
 }
 
-#ifdef __cplusplus
-} // namespace smbios
-#endif

smbios_decode.c

@@ -24,24 +24,20 @@
 
 #include <Windows.h>
 
-static bool getDMI( std::vector<uint8_t> &buffer )
+static bool get_dmi_data( uint8_t **buffer, size_t *size )
 {
     const BYTE byteSignature[] = { 'B', 'M', 'S', 'R' };
     const DWORD signature = *((DWORD*)byteSignature);
 
     // get the size of SMBIOS table
-    DWORD size = GetSystemFirmwareTable(signature, 0, NULL, 0);
-    if (size == 0) return false;
-    buffer.resize(size, 0);
-    // retrieve the SMBIOS table
-
-    if (size != GetSystemFirmwareTable(Signature, 0, buffer.data(), size))
-    {
-        buffer.clear();
+    *size = GetSystemFirmwareTable(signature, 0, NULL, 0);
+    if (*size == 0)
         return false;
-    }
-
-    return true;
+    *buffer = (uint8_t*) malloc(*size);
+    if (*buffer == NULL)
+        return false;
+    // retrieve the SMBIOS table
+    return (*size == GetSystemFirmwareTable(signature, 0, *buffer, *size))
 }
 
 #else