Changeset 60509 in vbox for trunk/src

Timestamp:

Apr 14, 2016 5:29:15 PM (9 years ago)

Author:

vboxsync

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

106619

Message:

Main/Console+Host: winsock2 include fixing

Location:

trunk/src/VBox/Main

Files:

• src-client/ConsoleImpl2.cpp (modified) (2 diffs)
• src-server/HostImpl.cpp (modified) (4 diffs)
• src-server/win/NetIf-win.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -25 +25 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-/* For some reason Windows burns in sdk\...\winsock.h if this isn't included first. */
-#include "VBox/com/ptr.h"
+
+// VBoxNetCfg-win.h needs winsock2.h and thus MUST be included before any other
+// header file includes Windows.h.
+#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT)
+# include <VBox/VBoxNetCfg-win.h>
+#endif
 
 #include "ConsoleImpl.h"
@@ -108 +112 @@
 # endif
 # if defined(RT_OS_WINDOWS)
-#  include <VBox/VBoxNetCfg-win.h>
 #  include <Ntddndis.h>
 #  include <devguid.h>

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2004-2015 Oracle Corporation
+ * Copyright (C) 2004-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -19 +19 @@
 #define __STDC_CONSTANT_MACROS
 
+// VBoxNetCfg-win.h needs winsock2.h and thus MUST be included before any other
+// header file includes Windows.h.
+#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT)
+# include <VBox/VBoxNetCfg-win.h>
+#endif
+
 // for some reason Windows burns in sdk\...\winsock.h if this isn't included first
 #include "VBox/com/ptr.h"
@@ -53 +59 @@
 # include "PerformanceImpl.h"
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
-
-#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT)
-# include <VBox/VBoxNetCfg-win.h>
-#endif /* #if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT) */
 
 #if defined(RT_OS_DARWIN) && ARCH_BITS == 32
@@ -125 +127 @@
 # include <shlobj.h>
 # include <cfgmgr32.h>
-
+# include <tchar.h>
 #endif /* RT_OS_WINDOWS */
 

trunk/src/VBox/Main/src-server/win/NetIf-win.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -33 +33 @@
 #include <ws2tcpip.h>
 #include <windows.h>
+#include <tchar.h>
 
 #ifdef VBOX_WITH_NETFLT