MSVC compatibility fixes

[libs/core.git] / source / core / application.cpp

diff --git a/source/core/application.cpp b/source/core/application.cpp
index c93475fea972e84985f82acfb08fb030018407bd..daeb1300d16602fcd1ff3c9f3ca82952a2b2a50a 100644 (file)
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -4,8 +4,10 @@ This file is part of libmspcore
 Copyright © 2006 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
+
 #include <signal.h>
 #include <iostream>
+#include <typeinfo>
 #include "../debug/backtrace.h"
 #include "../debug/demangle.h"
 #include "../time/units.h"
@@ -24,7 +26,7 @@ application throws a UsageError, the static usage() function is called.
 This function can only be called once.  The global main() function provided by
 the library normally does it automatically at program startup.
 */
-int Application::run(int argc, char **argv)
+int Application::run(int argc, char **argv, void *data)
 {
        static bool called=false;
        if(called)
@@ -40,6 +42,8 @@ int Application::run(int argc, char **argv)
                return 126;
        }
 
+       data_=data;
+
        try
        {
                try
@@ -58,6 +62,12 @@ int Application::run(int argc, char **argv)
        }
        catch(const exception &e)
        {
+               delete app_;
+
+#ifdef WIN32
+               string msg=Debug::demangle(typeid(e).name())+":\n"+e.what();
+               MessageBoxA(0, msg.c_str(), "Uncaught exception", MB_OK|MB_ICONERROR);
+#else
                cerr<<"An uncaught exception occurred.\n";
                cerr<<"  type:   "<<Debug::demangle(typeid(e).name())<<'\n';
                cerr<<"  what(): "<<e.what()<<'\n';
@@ -68,15 +78,10 @@ int Application::run(int argc, char **argv)
                        cerr<<"  backtrace:\n";
                        const Debug::Backtrace::FrameSeq &frames=exc->get_backtrace().get_frames();
                        for(Debug::Backtrace::FrameSeq::const_iterator i=frames.begin(); i!=frames.end(); ++i)
-                       {
-                               cerr<<"    "<<i->address;
-                               if(!i->symbol.empty())
-                                       cerr<<" in "<<i->symbol;
-                               cerr<<" from "<<i->file<<'\n';
-                       }
+                               cerr<<"    "<<*i<<'\n';
                }
+#endif
 
-               delete app_;
                return 124;
        }
 }
@@ -201,5 +206,6 @@ Application::RegBase::RegBase()
 
 Application *Application::app_=0;
 Application::RegBase *Application::reg_app_=0;
+void *Application::data_=0;
 
 } // namespace Msp