mirror of
https://github.com/reactos/reactos.git
synced 2024-06-29 01:12:06 +00:00
[0.4.10][DMILIB][UDMIHELP][DXDIAG][SYSTEMINFO] Backport "Include only one user-mode DMI library (#1054)"
partially 0.4.11-dev-797-gc1195f5300
[DXDIAG][SYSTEMINFO] Include only one user-mode DMI library (#1054) partially 0.4.11-dev-796-gbaf2c0cc2d
[DMILIB][UDMIHELP] Allow functions to be linked with C++ code. The [SYSDM]- and [DRWTSN32]-parts are not needed to be ported back, because those did not have the dependency yet in 0.4.10, but only in 0.4.11 And the commit is also not needed to be ported back further than releases/0.4.10, because both: dmilib and udmihelp have only been introduced during 0.4.10-dev'ing. They do not exist in 0.4.9 yet. Also no such users therefore.
This commit is contained in:
parent
37ea1c73a4
commit
c7fbbb338c
|
@ -1,7 +1,6 @@
|
|||
|
||||
include_directories(
|
||||
${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp
|
||||
${REACTOS_SOURCE_DIR}/sdk/lib/dmilib)
|
||||
${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp)
|
||||
|
||||
list(APPEND SOURCE
|
||||
system.c
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
#include <devguid.h>
|
||||
#include <strsafe.h>
|
||||
#include <udmihelp.h>
|
||||
#include <dmilib.h>
|
||||
|
||||
#include "resource.h"
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
|
||||
include_directories(
|
||||
${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp
|
||||
${REACTOS_SOURCE_DIR}/sdk/lib/dmilib)
|
||||
${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp)
|
||||
|
||||
add_executable(systeminfo systeminfo.c systeminfo.rc)
|
||||
set_module_type(systeminfo win32cui)
|
||||
|
|
|
@ -28,7 +28,6 @@
|
|||
#include <iphlpapi.h>
|
||||
#include <winsock2.h>
|
||||
#include <udmihelp.h>
|
||||
#include <dmilib.h>
|
||||
|
||||
#include "resource.h"
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
/*
|
||||
* PROJECT: ReactOS DMI/SMBIOS Library
|
||||
* LICENSE: GPL - See COPYING in the top level directory
|
||||
* FILE: dmilib.h
|
||||
* PURPOSE: SMBIOS table parsing functions
|
||||
* PROGRAMMERS: Timo Kreuzer (timo.kreuzer@reactos.org)
|
||||
*/
|
||||
|
|
|
@ -7,6 +7,12 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include <../dmilib/dmilib.h>
|
||||
|
||||
PVOID
|
||||
LoadSMBiosData(
|
||||
_Inout_updates_(ID_STRINGS_MAX) PCHAR * Strings);
|
||||
|
@ -25,3 +31,7 @@ GetSMBiosStringW(
|
|||
VOID
|
||||
FreeSMBiosData(
|
||||
_In_ PVOID Buffer);
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue