Changeset 106582 in vbox

Timestamp:

Oct 22, 2024 10:00:15 PM (4 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

165420

Message:

Add/Nt/Graphics: Windows 10 WDK 26100 build fixes (we're getting into harmless trouble with psapi.h because we're mixing this with the W7/WLH DDK). jiraref:VBP-1171

Location:

trunk

Files:

• include/iprt/win/psapi.h (copied) (copied from trunk/include/iprt/win/winsock2.h ) (2 diffs)
• src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp (modified) (1 diff)
• src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispDbg.cpp (modified) (1 diff)
• src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/dx/VBoxDX.cpp (modified) (1 diff)
• src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/dx/VBoxDXDDI.cpp (modified) (1 diff)

trunk/include/iprt/win/psapi.h

@@ -1 +1 @@
 /** @file
- * Safe way to include winsock2.h.
+ * Safe way to include psapi.h.
  */
 
@@ -34 +34 @@
  */
 
-#ifndef IPRT_INCLUDED_win_winsock2_h
-#define IPRT_INCLUDED_win_winsock2_h
+#ifndef IPRT_INCLUDED_win_psapi_h
+#define IPRT_INCLUDED_win_psapi_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
 #endif
 
-/* winsock2.h includes windows.h, but without winsock.h, so we need to do it
-   up front using our wrapper header to avoid repeating tricks here. */
-#define _WINSOCKAPI_ /* do not include winsock.h via windows.h */
-#include <iprt/win/windows.h>
+/* 
+ * There is actually no problems with psapi.h, but we create a problem mixing
+ * the Windows 7 WDK and a much more recent SDK, taking the psapi.h from the
+ * latter and sdkddkver.h from the former.  The result is that the much newer
+ * psapi.h file expects NTDDI_WIN10_CU to be defined, so we have to assit it
+ * here to avoid this type of errors: 
+ *  
+ * psapi.h(499): warning C4668: 'NTDDI_WIN10_CU' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
+ */
+#include <sdkddkver.h>
 
-#ifdef _MSC_VER
-/*
- * Unfortunately, the Windows.h file in SDK 7.1 is not clean wrt warning C4668:
- *      wincrypt.h(1848) : warning C4668: 'NTDDI_WINLH' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
- */
-# pragma warning(push)
-# pragma warning(disable:4668)
-# ifndef __cplusplus
-#  pragma warning(disable:4255) /* warning C4255: 'FARPROC' : no function prototype given: converting '()' to '(void)' */
-# endif
-# if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
-#  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
-# endif
-# if _MSC_VER >= 1900 /*RT_MSC_VER_VC140*/
-#  ifdef __cplusplus
-#   pragma warning(disable:5039) /* winbase.h(13179): warning C5039: 'TpSetCallbackCleanupGroup': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception. */
-#  endif
-# endif
+#ifndef NTDDI_WIN10_CU
+# define NTDDI_WIN10_CU     0x0a00000d
 #endif
 
-#include <winsock2.h>
+#include <psapi.h>
 
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
+#endif /* !IPRT_INCLUDED_win_psapi_h */
 
-#endif /* !IPRT_INCLUDED_win_winsock2_h */
-

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp

@@ -39 +39 @@
 #include "VBoxDispDbg.h"
 
-#include <Psapi.h>
+#include <iprt/win/psapi.h>
 
 #define VBOXDISP_IS_MODULE_FUNC(_pvModule, _cbModule, _pfn) ( \

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispDbg.cpp

@@ -29 +29 @@
 
 #ifdef VBOXWDDMDISP_DEBUG_VEHANDLER
-# include <Psapi.h>
+# include <iprt/win/psapi.h>
 #endif
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/dx/VBoxDX.cpp

@@ -521 +521 @@
         case DXGI_FORMAT_SAMPLER_FEEDBACK_MIN_MIP_OPAQUE:
         case DXGI_FORMAT_SAMPLER_FEEDBACK_MIP_REGION_USED_OPAQUE:
+#ifdef NTDDI_WIN11_GE
+        case DXGI_FORMAT_A4B4G4R4_UNORM: /* Added in SDK w11/26100 or thereabouts. */
+#endif
         case DXGI_FORMAT_FORCE_UINT: /* warning */
             break;

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/dx/VBoxDXDDI.cpp

@@ -37 +37 @@
 
 #include <d3d10umddi.h>
-#include <Psapi.h>
+#include <iprt/win/psapi.h>
 
 #include "VBoxDX.h"