Merge pull request #9559 from iwubcode/gdb-stub-raii

Common / Core: add raii object that cleans up WSA on destruction in gdb-stub

Source/Core/Common/CMakeLists.txt

@@ -110,6 +110,8 @@ add_library(common
   SettingsHandler.h
   SFMLHelper.cpp
   SFMLHelper.h
+  SocketContext.cpp
+  SocketContext.h
   SPSCQueue.h
   StringUtil.cpp
   StringUtil.h

Source/Core/Common/SocketContext.cpp

@@ -0,0 +1,22 @@
+// Copyright 2021 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/SocketContext.h"
+
+namespace Common
+{
+#ifdef _WIN32
+SocketContext::SocketContext()
+{
+  static_cast<void>(WSAStartup(MAKEWORD(2, 2), &m_data));
+}
+SocketContext::~SocketContext()
+{
+  WSACleanup();
+}
+#else
+SocketContext::SocketContext() = default;
+SocketContext::~SocketContext() = default;
+#endif
+}  // namespace Common

Source/Core/Common/SocketContext.h

@@ -0,0 +1,30 @@
+// Copyright 2021 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#ifdef _WIN32
+#include <WinSock2.h>
+#endif
+
+namespace Common
+{
+class SocketContext
+{
+public:
+  SocketContext();
+  ~SocketContext();
+
+  SocketContext(const SocketContext&) = delete;
+  SocketContext(SocketContext&&) = delete;
+
+  SocketContext& operator=(const SocketContext&) = delete;
+  SocketContext& operator=(SocketContext&&) = delete;
+
+private:
+#ifdef _WIN32
+  WSADATA m_data;
+#endif
+};
+}  // namespace Common