From 5d123144ff2b8d1cec1a6f1a46096b6bde9f425c Mon Sep 17 00:00:00 2001 From: Hexagon12 Date: Sat, 4 Nov 2017 15:03:04 +0200 Subject: [PATCH 1/4] Removed all instances of WSACleanup();. --- src/core/hle/service/soc_u.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/core/hle/service/soc_u.cpp b/src/core/hle/service/soc_u.cpp index acc36bedb..f2f91e7c2 100644 --- a/src/core/hle/service/soc_u.cpp +++ b/src/core/hle/service/soc_u.cpp @@ -794,10 +794,6 @@ static void ShutdownSockets(Interface* self) { // TODO(Subv): Implement CleanupSockets(); -#ifdef _WIN32 - WSACleanup(); -#endif - u32* cmd_buffer = Kernel::GetCommandBuffer(); cmd_buffer[1] = 0; } @@ -908,9 +904,6 @@ SOC_U::SOC_U() { SOC_U::~SOC_U() { CleanupSockets(); -#ifdef _WIN32 - WSACleanup(); -#endif } } // namespace SOC From 4ded13813901993e66e799c0c18eb7eb18fc5592 Mon Sep 17 00:00:00 2001 From: Hexagon12 Date: Sat, 4 Nov 2017 16:30:48 +0200 Subject: [PATCH 2/4] Update soc_u.cpp --- src/core/hle/service/soc_u.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/core/hle/service/soc_u.cpp b/src/core/hle/service/soc_u.cpp index f2f91e7c2..4ef3002d8 100644 --- a/src/core/hle/service/soc_u.cpp +++ b/src/core/hle/service/soc_u.cpp @@ -780,10 +780,6 @@ static void Connect(Interface* self) { static void InitializeSockets(Interface* self) { // TODO(Subv): Implement -#ifdef _WIN32 - WSADATA data; - WSAStartup(MAKEWORD(2, 2), &data); -#endif u32* cmd_buffer = Kernel::GetCommandBuffer(); cmd_buffer[0] = IPC::MakeHeader(1, 1, 0); @@ -900,10 +896,18 @@ const Interface::FunctionInfo FunctionTable[] = { SOC_U::SOC_U() { Register(FunctionTable); + +#ifdef _WIN32 + WSADATA data; + WSAStartup(MAKEWORD(2, 2), &data); +#endif } SOC_U::~SOC_U() { CleanupSockets(); +#ifdef _WIN32 + WSACleanup(); +#endif } } // namespace SOC From 81e36150d3a4b98a826ea0000acab235aa6505eb Mon Sep 17 00:00:00 2001 From: Hexagon12 Date: Sat, 4 Nov 2017 17:32:12 +0200 Subject: [PATCH 3/4] Clang pls --- src/core/hle/service/soc_u.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/hle/service/soc_u.cpp b/src/core/hle/service/soc_u.cpp index 4ef3002d8..10e6ba649 100644 --- a/src/core/hle/service/soc_u.cpp +++ b/src/core/hle/service/soc_u.cpp @@ -779,8 +779,8 @@ static void Connect(Interface* self) { } static void InitializeSockets(Interface* self) { -// TODO(Subv): Implement - + // TODO(Subv): Implement + u32* cmd_buffer = Kernel::GetCommandBuffer(); cmd_buffer[0] = IPC::MakeHeader(1, 1, 0); cmd_buffer[1] = RESULT_SUCCESS.raw; From 695ff7cff3970f8ac5a0bdc395f0f176cd6078d6 Mon Sep 17 00:00:00 2001 From: Hexagon12 Date: Sat, 4 Nov 2017 17:41:20 +0200 Subject: [PATCH 4/4] Clang pls (again) --- src/core/hle/service/soc_u.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/hle/service/soc_u.cpp b/src/core/hle/service/soc_u.cpp index 10e6ba649..21136772a 100644 --- a/src/core/hle/service/soc_u.cpp +++ b/src/core/hle/service/soc_u.cpp @@ -780,7 +780,7 @@ static void Connect(Interface* self) { static void InitializeSockets(Interface* self) { // TODO(Subv): Implement - + u32* cmd_buffer = Kernel::GetCommandBuffer(); cmd_buffer[0] = IPC::MakeHeader(1, 1, 0); cmd_buffer[1] = RESULT_SUCCESS.raw;