From f33fae574f11aae12eab8162644d9946f5f04161 Mon Sep 17 00:00:00 2001
From: shuffle2 <godisgovernment@gmail.com>
Date: Sat, 3 Oct 2015 01:56:42 -0700
Subject: [PATCH] Fix WiiSockMan::DecodeError

---
 Source/Core/Core/IPC_HLE/WII_Socket.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Source/Core/Core/IPC_HLE/WII_Socket.cpp b/Source/Core/Core/IPC_HLE/WII_Socket.cpp
index af621089be..aea7bfc001 100644
--- a/Source/Core/Core/IPC_HLE/WII_Socket.cpp
+++ b/Source/Core/Core/IPC_HLE/WII_Socket.cpp
@@ -24,13 +24,14 @@
 char* WiiSockMan::DecodeError(s32 ErrorCode)
 {
 #ifdef _WIN32
+	// NOT THREAD SAFE
 	static char Message[1024];
-	// If this program was multi-threaded, we'd want to use FORMAT_MESSAGE_ALLOCATE_BUFFER
-	// instead of a static buffer here.
-	// (And of course, free the buffer when we were done with it)
-	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS |
-		FORMAT_MESSAGE_MAX_WIDTH_MASK, nullptr, ErrorCode,
-		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)Message, 1024, nullptr);
+
+	FormatMessageA(
+		FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_MAX_WIDTH_MASK,
+		nullptr, ErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), Message,
+		sizeof(Message), nullptr);
+
 	return Message;
 #else
 	return strerror(ErrorCode);