[NET] Removed Winsock deprecated define

Author: AdrianCassar

src/xenia/kernel/util/net_utils.cc

@@ -20,6 +20,10 @@ DECLARE_bool(logging);
 // TODO(Adrian): This should be moved to XConfig once supported.
 DEFINE_string(mac_address, "", "Console MAC address. (Do not touch!)", "Live");
 
+#ifdef XE_PLATFORM_WIN32
+#include <WS2tcpip.h>
+#endif
+
 namespace xe {
 namespace kernel {
 

src/xenia/kernel/util/net_utils.h

@@ -17,14 +17,7 @@
 #include "xenia/base/platform.h"
 
 #ifdef XE_PLATFORM_WIN32
-// clang-format off
-// NOTE: must be included last as it expects windows.h to already be included.
-#define _WINSOCK_DEPRECATED_NO_WARNINGS  // inet_addr
-#include <WS2tcpip.h>                    // NOLINT(build/include_order)
-#include <winsock2.h>                    // NOLINT(build/include_order)
-
-#include <Iphlpapi.h>
-// clang-format on
+#include <ws2tcpip.h>
 #elif XE_PLATFORM_LINUX
 #include <arpa/inet.h>
 #endif

src/xenia/kernel/util/network_adapter_manager.h

@@ -18,14 +18,7 @@
 #include "xenia/kernel/util/net_utils.h"
 
 #ifdef XE_PLATFORM_WIN32
-// clang-format off
-// NOTE: must be included last as it expects windows.h to already be included.
-#define _WINSOCK_DEPRECATED_NO_WARNINGS  // inet_addr
-#include <WS2tcpip.h>                    // NOLINT(build/include_order)
-#include <winsock2.h>                    // NOLINT(build/include_order)
-
 #include <Iphlpapi.h>
-// clang-format on
 #endif
 
 namespace xe {

src/xenia/kernel/xam/xam_net.cc

@@ -26,11 +26,7 @@
 #include "xenia/xbox.h"
 
 #ifdef XE_PLATFORM_WIN32
-// NOTE: must be included last as it expects windows.h to already be included.
-#define _WINSOCK_DEPRECATED_NO_WARNINGS  // inet_addr
-#include <WS2tcpip.h>                    // NOLINT(build/include_order)
-#include <comutil.h>
-#include <wrl/client.h>
+#include <WS2tcpip.h>
 #elif XE_PLATFORM_LINUX
 #include <arpa/inet.h>
 #include <netinet/in.h>
@@ -1872,11 +1868,16 @@ dword_result_t NetDll_inet_addr_entry(lpstring_t addr_ptr) {
     return -1;
   }
 
+#pragma warning(push)
+#pragma warning(    \
+    disable : 4996, \
+    justification : "Retain original functionality e.g. Input Notation")
   uint32_t addr = inet_addr(addr_ptr);
+#pragma warning(pop)
   // https://docs.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-inet_addr#return-value
   // Based on console research it seems like x360 uses old version of
   // inet_addr In case of empty string it return 0 instead of -1
-  if (addr == -1 && !addr_ptr.value().length()) {
+  if (addr == -1 && addr_ptr.value().empty()) {
     return 0;
   }
 

src/xenia/kernel/xnet.h

@@ -18,7 +18,6 @@
 #include "xenia/kernel/xam/user_property.h"
 
 #ifdef XE_PLATFORM_WIN32
-#define _WINSOCK_DEPRECATED_NO_WARNINGS  // inet_addr
 // clang-format off
 #include "xenia/base/platform_win.h"
 // clang-format on

src/xenia/kernel/xsocket.h

@@ -19,7 +19,6 @@
 
 #ifdef XE_PLATFORM_WIN32
 // clang-format off
-#define _WINSOCK_DEPRECATED_NO_WARNINGS  // inet_addr
 #include "xenia/base/platform_win.h"
 #include <WS2tcpip.h>
 #include <WinSock2.h>