Changeset 92964 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video

Timestamp:

Dec 16, 2021 9:50:52 AM (3 years ago)

Author:

vboxsync

Message:

GA/wddm: Don't include d3dkmthk directly, always via the clean iprt wrapper. Guard the typedefs taken windows 8 in VBoxDispKmt.h to prevent errors due to duplications when using W8+ WDKs. bugref:10116

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared/VBoxDispKmt.h (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared/VBoxDispKmt.h

@@ -22 +22 @@
 #endif
 
-#include <D3dkmthk.h>
+#include <iprt/win/d3dkmthk.h>
 
 #include "../../../common/wddm/VBoxMPIf.h"
+
+#ifndef DXGKDDI_INTERFACE_VERSION_WIN8
+# define DXGKDDI_INTERFACE_VERSION_WIN8 0x300e
+#endif
+#if DXGKDDI_INTERFACE_VERSION < DXGKDDI_INTERFACE_VERSION_WIN8
 
 /* win8 release preview-specific stuff */
@@ -35 +40 @@
 } D3DKMT_ADAPTERINFO;
 
-#define MAX_ENUM_ADAPTERS 16
+# define MAX_ENUM_ADAPTERS 16
 
 typedef struct _D3DKMT_ENUMADAPTERS
@@ -52 +57 @@
 
 typedef DECLCALLBACKPTR_EX(NTSTATUS, APIENTRY, PFND3DKMT_OPENADAPTERFROMLUID,(IN OUT D3DKMT_OPENADAPTERFROMLUID *));
-/* END OF win8 release preview-specific stuff */
+
+#endif /* DXGKDDI_INTERFACE_VERSION < DXGKDDI_INTERFACE_VERSION_WIN8  */
 
 typedef enum