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

Include only one user-mode DMI library. Addendum to baf2c0c.

diff --git a/base/applications/dxdiag/CMakeLists.txt b/base/applications/dxdiag/CMakeLists.txt
index a299f85..e8886ab 100644 (file)
--- 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 4e16e04..5c9f003 100644 (file)
--- 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 f65d735..865d5e7 100644 (file)
--- 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 5aeb627..5c7e38e 100644 (file)
--- 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 69f1690..dac9085 100644 (file)
--- 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 407553e..de49912 100644 (file)
--- 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"