From 4ac8d853a6b5715fe95900f679305e4d5d4c0312 Mon Sep 17 00:00:00 2001 From: momo5502 Date: Fri, 18 Apr 2025 08:15:17 +0200 Subject: [PATCH] Always use static socket factory for emscripten --- src/windows-emulator-test/emulation_test_utils.hpp | 2 +- .../network}/static_socket_factory.cpp | 0 .../network}/static_socket_factory.hpp | 2 +- src/windows-emulator/windows_emulator.cpp | 6 ++++++ 4 files changed, 8 insertions(+), 2 deletions(-) rename src/{windows-emulator-test => windows-emulator/network}/static_socket_factory.cpp (100%) rename src/{windows-emulator-test => windows-emulator/network}/static_socket_factory.hpp (73%) diff --git a/src/windows-emulator-test/emulation_test_utils.hpp b/src/windows-emulator-test/emulation_test_utils.hpp index a399702c..d972de71 100644 --- a/src/windows-emulator-test/emulation_test_utils.hpp +++ b/src/windows-emulator-test/emulation_test_utils.hpp @@ -4,7 +4,7 @@ #include #include -#include "static_socket_factory.hpp" +#include #define ASSERT_NOT_TERMINATED(win_emu) \ do \ diff --git a/src/windows-emulator-test/static_socket_factory.cpp b/src/windows-emulator/network/static_socket_factory.cpp similarity index 100% rename from src/windows-emulator-test/static_socket_factory.cpp rename to src/windows-emulator/network/static_socket_factory.cpp diff --git a/src/windows-emulator-test/static_socket_factory.hpp b/src/windows-emulator/network/static_socket_factory.hpp similarity index 73% rename from src/windows-emulator-test/static_socket_factory.hpp rename to src/windows-emulator/network/static_socket_factory.hpp index 6f162869..5b27faef 100644 --- a/src/windows-emulator-test/static_socket_factory.hpp +++ b/src/windows-emulator/network/static_socket_factory.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include "socket_factory.hpp" namespace network { diff --git a/src/windows-emulator/windows_emulator.cpp b/src/windows-emulator/windows_emulator.cpp index 4cb8b45f..99aef9cf 100644 --- a/src/windows-emulator/windows_emulator.cpp +++ b/src/windows-emulator/windows_emulator.cpp @@ -16,6 +16,8 @@ #include "exception_dispatch.hpp" #include "apiset/apiset.hpp" +#include "network/static_socket_factory.hpp" + constexpr auto MAX_INSTRUCTIONS_PER_TIME_SLICE = 100000; namespace @@ -257,7 +259,11 @@ namespace return std::move(interfaces.socket_factory); } +#ifdef OS_EMSCRIPTEN + return network::create_static_socket_factory(); +#else return std::make_unique(); +#endif } }