piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12073 from AdmiralCurtiss/wiimote-win32error

Browse Source 
WiimoteReal/IOWin: Use correct error type in the default case.
This commit is contained in:
JosJuice
2023-07-29 18:54:10 +02:00
committed by GitHub
parent 163c97e242 fb9274c359
commit 30c4ac34b0
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Common/CommonFuncs.cpp
View File

@ -52,10 +52,16 @@ std::string LastStrerrorString()
// Wrapper function to get GetLastError() string. // Wrapper function to get GetLastError() string.
// This function might change the error code. // This function might change the error code.
std::string GetLastErrorString() std::string GetLastErrorString()
{
return GetWin32ErrorString(GetLastError());
}
// Like GetLastErrorString() but if you have already queried the error code.
std::string GetWin32ErrorString(DWORD error_code)
{ {
char error_message[BUFFER_SIZE]; char error_message[BUFFER_SIZE];
FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, GetLastError(), FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, error_code,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), error_message, BUFFER_SIZE, nullptr); MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), error_message, BUFFER_SIZE, nullptr);
return std::string(error_message); return std::string(error_message);
} }

3
Source/Core/Common/CommonFuncs.h
View File

@ -53,6 +53,9 @@ std::string LastStrerrorString();
// This function might change the error code. // This function might change the error code.
std::string GetLastErrorString(); std::string GetLastErrorString();
// Like GetLastErrorString() but if you have already queried the error code.
std::string GetWin32ErrorString(unsigned long error_code);
// Obtains a full path to the specified module. // Obtains a full path to the specified module.
std::optional<std::wstring> GetModuleName(void* hInstance); std::optional<std::wstring> GetModuleName(void* hInstance);
#endif #endif

13
Source/Core/Core/HW/WiimoteReal/IOWin.cpp
View File

@ -298,17 +298,8 @@ int IOWritePerWriteFile(HANDLE& dev_handle, OVERLAPPED& hid_overlap_write,
// Pending is no error! // Pending is no error!
break; break;
default: default:
if (FAILED(error)) WARN_LOG_FMT(WIIMOTE, "IOWrite[WWM_WRITE_FILE]: Error on WriteFile: {}",
{ Common::GetWin32ErrorString(error));
WARN_LOG_FMT(WIIMOTE, "IOWrite[WWM_WRITE_FILE]: Error on WriteFile: {}",
Common::HRWrap(error));
}
else
{
WARN_LOG_FMT(WIIMOTE,
"IOWrite[WWM_WRITE_FILE]: Unexpected error code from WriteFile: 0x{:08x}",
error);
}
CancelIo(dev_handle); CancelIo(dev_handle);
return 0; return 0;
} }