Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 06:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[0.4.10][DMILIB][UDMIHELP][DXDIAG][SYSTEMINFO] Backport "Include only one user-mode DMI library (#1054)"

Browse source 
partially 0.4.11-dev-797-g c1195f5300 [DXDIAG][SYSTEMINFO] Include only one user-mode DMI library (#1054)
partially 0.4.11-dev-796-g baf2c0cc2d [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:
Joachim Henze 2023-07-23 22:50:27 +02:00
parent 37ea1c73a4
commit c7fbbb338c
6 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
base/applications/dxdiag/CMakeLists.txt
View file

@ -1,7 +1,6 @@
include_directories( include_directories(
${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp ${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp)
${REACTOS_SOURCE_DIR}/sdk/lib/dmilib)
list(APPEND SOURCE list(APPEND SOURCE
system.c system.c

1
base/applications/dxdiag/precomp.h
View file

@ -23,7 +23,6 @@
#include <devguid.h> #include <devguid.h>
#include <strsafe.h> #include <strsafe.h>
#include <udmihelp.h> #include <udmihelp.h>
#include <dmilib.h>
#include "resource.h" #include "resource.h"

3
modules/rosapps/applications/sysutils/systeminfo/CMakeLists.txt
View file

@ -1,7 +1,6 @@
include_directories( include_directories(
${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp ${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp)
${REACTOS_SOURCE_DIR}/sdk/lib/dmilib)
add_executable(systeminfo systeminfo.c systeminfo.rc) add_executable(systeminfo systeminfo.c systeminfo.rc)
set_module_type(systeminfo win32cui) set_module_type(systeminfo win32cui)

1
modules/rosapps/applications/sysutils/systeminfo/systeminfo.c
View file

@ -28,7 +28,6 @@
#include <iphlpapi.h> #include <iphlpapi.h>
#include <winsock2.h> #include <winsock2.h>
#include <udmihelp.h> #include <udmihelp.h>
#include <dmilib.h>
#include "resource.h" #include "resource.h"

1
sdk/lib/dmilib/dmilib.h
View file

@ -1,7 +1,6 @@
/* /*
* PROJECT: ReactOS DMI/SMBIOS Library * PROJECT: ReactOS DMI/SMBIOS Library
* LICENSE: GPL - See COPYING in the top level directory * LICENSE: GPL - See COPYING in the top level directory
* FILE: dmilib.h
* PURPOSE: SMBIOS table parsing functions * PURPOSE: SMBIOS table parsing functions
* PROGRAMMERS: Timo Kreuzer (timo.kreuzer@reactos.org) * PROGRAMMERS: Timo Kreuzer (timo.kreuzer@reactos.org)
*/ */

10
sdk/lib/udmihelp/udmihelp.h
View file

@ -7,6 +7,12 @@
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include <../dmilib/dmilib.h>
PVOID PVOID
LoadSMBiosData( LoadSMBiosData(
_Inout_updates_(ID_STRINGS_MAX) PCHAR * Strings); _Inout_updates_(ID_STRINGS_MAX) PCHAR * Strings);
@ -25,3 +31,7 @@ GetSMBiosStringW(
VOID VOID
FreeSMBiosData( FreeSMBiosData(
_In_ PVOID Buffer); _In_ PVOID Buffer);
#ifdef __cplusplus
} // extern "C"
#endif