Merge insp20

[user/henk/code/inspircd.git] / src / dynamic.cpp

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 2fb5211fba1d2eb918d944b9851ec75274b1c22b..9984f4dbeabe5c8873bdb91b2ecc6bb1382c1f1b 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -97,9 +97,15 @@ std::string DLLManager::GetVersion()
 #ifdef _WIN32
 void DLLManager::RetrieveLastError()
 {
-       CHAR errmsg[100];
-       FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, 0, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), errmsg, 100, 0);
+       char errmsg[500];
+       DWORD dwErrorCode = GetLastError();
+       if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)errmsg, _countof(errmsg), NULL) == 0)
+               sprintf_s(errmsg, _countof(errmsg), "Error code: %u", dwErrorCode);
        SetLastError(ERROR_SUCCESS);
        err = errmsg;
+
+       std::string::size_type p;
+       while ((p = err.find_last_of("\r\n")) != std::string::npos)
+               err.erase(p, 1);
 }
 #endif