ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3124 from dolphin-emu/shuffle2-patch-1 

Fix WiiSockMan::DecodeError
This commit is contained in:
shuffle2 2015-10-03 14:59:20 -07:00
parent 5464e698fc f33fae574f
commit b4be34bc68
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/Core/IPC_HLE/WII_Socket.cpp
View File

@ -24,13 +24,14 @@
char* WiiSockMan::DecodeError(s32 ErrorCode) char* WiiSockMan::DecodeError(s32 ErrorCode)
{ {
#ifdef _WIN32 #ifdef _WIN32
// NOT THREAD SAFE
static char Message[1024]; 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. FormatMessageA(
// (And of course, free the buffer when we were done with it) FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_MAX_WIDTH_MASK,
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | nullptr, ErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), Message,
FORMAT_MESSAGE_MAX_WIDTH_MASK, nullptr, ErrorCode, sizeof(Message), nullptr);
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)Message, 1024, nullptr);
return Message; return Message;
#else #else
return strerror(ErrorCode); return strerror(ErrorCode);