Changeset 92902 in vbox for trunk/include/iprt

Timestamp:

Dec 14, 2021 10:06:10 PM (3 years ago)

Author:

vboxsync

Message:

iprt/win/windows.h,++: Workaround for buggy winioctl.h in some windows 10 SDKs, must make sure to include our windows.h wrapper with the necessary tricks. bugref:10116

Location:

trunk/include/iprt/win

Files:

• d3d9.h (modified) (1 diff)
• objbase.h (modified) (1 diff)
• windows.h (modified) (1 diff)
• winsock2.h (modified) (1 diff)
• ws2tcpip.h (modified) (1 diff)

trunk/include/iprt/win/d3d9.h

@@ -30 +30 @@
 #endif
 
+/* d3d9.h includes windows.h (via objbase.h -> rpc.h), so do it up front using
+   our wrappers to avoid needing to duplicate warning workarounds for it. */
+#include <iprt/win/windows.h>
+
 #ifdef _MSC_VER
 # pragma warning(push)

trunk/include/iprt/win/objbase.h

@@ -30 +30 @@
 #endif
 
+/* objbase.h includes windows.h via rpc.h, so get ahead of it and include
+   it here via our cleanup wrapper. */
+#include <iprt/win/windows.h>
+
 #ifdef _MSC_VER
 # pragma warning(push)

trunk/include/iprt/win/windows.h

@@ -28 +28 @@
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
+#endif
+
+
+/* winioctl.h in windows 10 SDKs up to 22000(?) has a warning(push/pop) bug in the
+   portion taken from ntddscm.h causing trouble when using _WIN32_WINNT or NTDDI_VERSION
+   older than NTDDI_WIN10_RS5.  In 18362 winioctl.h also tests against _WIN32_WINNT_WIN10_TH2
+   and other sdkddkver.h defines which only exist in NTDDI variants, not in _WIN32_WINNT_XXX,
+   so we fake up those too to keep the precompiler warning free.
+
+   Work around this by blocking out the buggy section on winioctl.h for now if the
+   NTDDI_VERSION target is too small.
+
+   WDK_NTDDI_VERSION is not present in the W7 SDK, not sure when exactly it was added.
+   NTDDI_WIN10_RS5 is W10 1809. NTDDI_WIN10_CO is Windows 11? */
+#include <sdkddkver.h>
+#ifdef _WIN32_WINNT_WIN10
+# ifndef _WIN32_WINNT_WIN10_TH2
+#  define _WIN32_WINNT_WIN10_TH2 _WIN32_WINNT_WIN10
+# endif
+# ifndef _WIN32_WINNT_WIN10_RS1
+#  define _WIN32_WINNT_WIN10_RS1 _WIN32_WINNT_WIN10
+# endif
+# ifndef _WIN32_WINNT_WIN10_RS2
+#  define _WIN32_WINNT_WIN10_RS2 _WIN32_WINNT_WIN10
+# endif
+# ifndef _WIN32_WINNT_WIN10_RS3
+#  define _WIN32_WINNT_WIN10_RS3 _WIN32_WINNT_WIN10
+# endif
+# ifndef _WIN32_WINNT_WIN10_RS4
+#  define _WIN32_WINNT_WIN10_RS4 _WIN32_WINNT_WIN10
+# endif
+# ifndef _WIN32_WINNT_WIN10_RS5
+#  define _WIN32_WINNT_WIN10_RS5 _WIN32_WINNT_WIN10
+# endif
+#endif
+#if defined(NTDDI_WIN10_RS5) && !defined(NTDDI_WIN10_CO) && defined(WDK_NTDDI_VERSION)
+# if NTDDI_VERSION < NTDDI_WIN10_RS5
+#  define _NTDDSCM_H_ buggy, hope nobody needs it.
+# endif
 #endif
 

trunk/include/iprt/win/winsock2.h

@@ -30 +30 @@
 #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>
+
 #ifdef _MSC_VER
 /*

trunk/include/iprt/win/ws2tcpip.h

@@ -30 +30 @@
 #endif
 
+/* ws2tcpip.h includes winsock2.h, so get ahead of it and include our cleanly
+   wrapped version first to avoid duplicating stuff here. */
+#include <iprt/win/winsock2.h>
+
 #ifdef _MSC_VER
 # pragma warning(push)