X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fexcept.cpp;h=ddd2cb5167d57f0e3f5df614a8caf3ad3b68dc50;hp=245bc0502c0481b36a218531bb14bff93c2fbc13;hb=7d8e623512c2cf33eef000cf99af97386dfe6d59;hpb=c13c5d2e330e4cee177c1fd8e0b6153c7e2503e4

diff --git a/source/core/except.cpp b/source/core/except.cpp
index 245bc05..ddd2cb5 100644
--- a/source/core/except.cpp
+++ b/source/core/except.cpp
@@ -4,7 +4,12 @@ This file is part of libmspcore
 Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
+
 #include <sstream>
+#include <cstring>
+#ifdef WIN32
+#include <windows.h>
+#endif
 #include "except.h"
 
 using namespace std;
@@ -24,12 +29,21 @@ SystemError::SystemError(const string &w_, int e):
 	err(e)
 { }
 
+KeyError::KeyError(const string &w_, const string &k):
+	Exception(w_+" ("+k+")"),
+	key(k)
+{ }
+
 string SystemError::build_what(const string &w, int e)
 {
 	ostringstream buf;
 	buf<<w<<": ";
 #ifdef WIN32
-	buf<<e;
+	char msg[1024];
+	if(FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, 0, e, 0, msg, sizeof(msg), 0))
+		buf<<msg;
+	else
+		buf<<e;
 #else
 	buf<<strerror(e);
 #endif