[reactos] 01/01: [SYSDM][DXDIAG][SYSTEMINFO] Include only one user-mode DMI library (#1054)

[Stanislav Motylkov]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1195f5300b3116594bb27...

commit c1195f5300b3116594bb27b23fb16e321775f36b
Author:     Stanislav Motylkov [e-mail]
AuthorDate: Thu Nov 22 00:07:54 2018 +0300
Commit:     Hermès BÉLUSCA - MAÏTO [e-mail]
CommitDate: Wed Nov 21 22:07:54 2018 +0100

[SYSDM][DXDIAG][SYSTEMINFO] Include only one user-mode DMI library (#1054)

Include only one user-mode DMI library. Addendum to baf2c0c.
---
 base/applications/dxdiag/CMakeLists.txt                         | 3 +--
 base/applications/dxdiag/precomp.h                              | 1 -
 dll/cpl/sysdm/CMakeLists.txt                                    | 3 +--
 dll/cpl/sysdm/smbios.c                                          | 1 -
 modules/rosapps/applications/sysutils/systeminfo/CMakeLists.txt | 3 +--
 modules/rosapps/applications/sysutils/systeminfo/systeminfo.c   | 1 -
 6 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/base/applications/dxdiag/CMakeLists.txt b/base/applications/dxdiag/CMakeLists.txt
index a299f85160..e8886abd66 100644
--- a/base/applications/dxdiag/CMakeLists.txt
+++ b/base/applications/dxdiag/CMakeLists.txt
@@ -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
diff --git a/base/applications/dxdiag/precomp.h b/base/applications/dxdiag/precomp.h
index 4e16e04db4..5c9f003f37 100644
--- a/base/applications/dxdiag/precomp.h
+++ b/base/applications/dxdiag/precomp.h
@@ -23,7 +23,6 @@
 #include <devguid.h>
 #include <strsafe.h>
 #include <udmihelp.h>
-#include <dmilib.h>

#include "resource.h"

diff --git a/dll/cpl/sysdm/CMakeLists.txt b/dll/cpl/sysdm/CMakeLists.txt
index f65d7352b5..865d5e7697 100644
--- a/dll/cpl/sysdm/CMakeLists.txt
+++ b/dll/cpl/sysdm/CMakeLists.txt
@@ -2,8 +2,7 @@
 spec2def(sysdm.cpl sysdm.spec)

include_directories(
-    ${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp
-    ${REACTOS_SOURCE_DIR}/sdk/lib/dmilib)
+    ${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp)

list(APPEND SOURCE
     advanced.c
diff --git a/dll/cpl/sysdm/smbios.c b/dll/cpl/sysdm/smbios.c
index 5aeb627edc..5c7e38e467 100644
--- a/dll/cpl/sysdm/smbios.c
+++ b/dll/cpl/sysdm/smbios.c
@@ -11,7 +11,6 @@

#include <strsafe.h>
 #include <udmihelp.h>
-#include <dmilib.h>

typedef struct GENERIC_NAME
 {
diff --git a/modules/rosapps/applications/sysutils/systeminfo/CMakeLists.txt b/modules/rosapps/applications/sysutils/systeminfo/CMakeLists.txt
index 69f1690297..dac908585f 100644
--- a/modules/rosapps/applications/sysutils/systeminfo/CMakeLists.txt
+++ b/modules/rosapps/applications/sysutils/systeminfo/CMakeLists.txt
@@ -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)
diff --git a/modules/rosapps/applications/sysutils/systeminfo/systeminfo.c b/modules/rosapps/applications/sysutils/systeminfo/systeminfo.c
index 407553e887..de49912385 100644
--- a/modules/rosapps/applications/sysutils/systeminfo/systeminfo.c
+++ b/modules/rosapps/applications/sysutils/systeminfo/systeminfo.c
@@ -28,7 +28,6 @@
 #include <iphlpapi.h>
 #include <winsock2.h>
 #include <udmihelp.h>
-#include <dmilib.h>

#include "resource.h"