Changeset 62683 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Jul 29, 2016 1:16:22 PM (8 years ago)

Author:

vboxsync

Message:

Use the iprt/nt/ntddk.h wrapper for ntddk.h, eliminating duplicate ugly warning workarounds.

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv

Files:

• VBoxNetFltCmn-win.h (modified) (1 diff)
• VBoxNetLwf-win.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltCmn-win.h

@@ -58 +58 @@
 #include <iprt/list.h>
 
-RT_C_DECLS_BEGIN
-/* ntddk.h has a missing #pragma pack(), work around it
- * see #ifdef VBOX_WITH_WORKAROUND_MISSING_PACK below for detail */
-#define VBOX_WITH_WORKAROUND_MISSING_PACK
-#if (_MSC_VER >= 1400) && !defined(VBOX_WITH_PATCHED_DDK)
-#  define _InterlockedExchange           _InterlockedExchange_StupidDDKVsCompilerCrap
-#  define _InterlockedExchangeAdd        _InterlockedExchangeAdd_StupidDDKVsCompilerCrap
-#  define _InterlockedCompareExchange    _InterlockedCompareExchange_StupidDDKVsCompilerCrap
-#  define _InterlockedAddLargeStatistic  _InterlockedAddLargeStatistic_StupidDDKVsCompilerCrap
-#  define _interlockedbittestandset      _interlockedbittestandset_StupidDDKVsCompilerCrap
-#  define _interlockedbittestandreset    _interlockedbittestandreset_StupidDDKVsCompilerCrap
-#  define _interlockedbittestandset64    _interlockedbittestandset64_StupidDDKVsCompilerCrap
-#  define _interlockedbittestandreset64  _interlockedbittestandreset64_StupidDDKVsCompilerCrap
-#  pragma warning(disable : 4163)
-#  ifdef VBOX_WITH_WORKAROUND_MISSING_PACK
-#    pragma warning(disable : 4103)
-#  endif
-#  include <ntddk.h>
-#  pragma warning(default : 4163)
-#  ifdef VBOX_WITH_WORKAROUND_MISSING_PACK
-#    pragma pack()
-#    pragma warning(default : 4103)
-#  endif
-#  undef  _InterlockedExchange
-#  undef  _InterlockedExchangeAdd
-#  undef  _InterlockedCompareExchange
-#  undef  _InterlockedAddLargeStatistic
-#  undef  _interlockedbittestandset
-#  undef  _interlockedbittestandreset
-#  undef  _interlockedbittestandset64
-#  undef  _interlockedbittestandreset64
-#  include <ndis.h>
-#else
-//#  include <ntddk.h>
-/* can include ndis.h right away */
-#  include <ndis.h>
-#endif
-RT_C_DECLS_END
+#include <iprt/nt/ntddk.h>
+#include <iprt/nt/ndis.h>
 
 #define VBOXNETFLT_OS_SPECFIC 1

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp

@@ -47 +47 @@
 #include <VBox/intnetinline.h>
 
-/// @todo Not sure why, but can it help with build errors?
-RT_C_DECLS_BEGIN
-/* ntddk.h has a missing #pragma pack(), work around it
- * see #ifdef VBOX_WITH_WORKAROUND_MISSING_PACK below for detail */
-#define VBOX_WITH_WORKAROUND_MISSING_PACK
-#if (_MSC_VER >= 1400) && !defined(VBOX_WITH_PATCHED_DDK)
-#  define _InterlockedExchange           _InterlockedExchange_StupidDDKVsCompilerCrap
-#  define _InterlockedExchangeAdd        _InterlockedExchangeAdd_StupidDDKVsCompilerCrap
-#  define _InterlockedCompareExchange    _InterlockedCompareExchange_StupidDDKVsCompilerCrap
-#  define _InterlockedAddLargeStatistic  _InterlockedAddLargeStatistic_StupidDDKVsCompilerCrap
-#  define _interlockedbittestandset      _interlockedbittestandset_StupidDDKVsCompilerCrap
-#  define _interlockedbittestandreset    _interlockedbittestandreset_StupidDDKVsCompilerCrap
-#  define _interlockedbittestandset64    _interlockedbittestandset64_StupidDDKVsCompilerCrap
-#  define _interlockedbittestandreset64  _interlockedbittestandreset64_StupidDDKVsCompilerCrap
-#  pragma warning(disable : 4163)
-#  ifdef VBOX_WITH_WORKAROUND_MISSING_PACK
-#    pragma warning(disable : 4103)
-#  endif
-#  include <ntddk.h>
-#  pragma warning(default : 4163)
-#  ifdef VBOX_WITH_WORKAROUND_MISSING_PACK
-#    pragma pack()
-#    pragma warning(default : 4103)
-#  endif
-#  undef  _InterlockedExchange
-#  undef  _InterlockedExchangeAdd
-#  undef  _InterlockedCompareExchange
-#  undef  _InterlockedAddLargeStatistic
-#  undef  _interlockedbittestandset
-#  undef  _interlockedbittestandreset
-#  undef  _interlockedbittestandset64
-#  undef  _interlockedbittestandreset64
-#  include <ndis.h>
-#  include <netioapi.h>
-#else
-#  include <ntddk.h>
-#  include <netioapi.h>
-/* can include ndis.h right away */
-#  include <ndis.h>
-#endif
+#include <iprt/nt/ntddk.h>
+#include <iprt/nt/ndis.h>
+#include <netioapi.h>
 #include <mstcpip.h>
-RT_C_DECLS_END
 
 #define LogError(x) DbgPrint x