Main: Apply clang-format
This commit is contained in:
@@ -30,16 +30,16 @@
|
||||
|
||||
|
||||
#ifdef _PreComp_
|
||||
# undef _PreComp_
|
||||
#undef _PreComp_
|
||||
#endif
|
||||
|
||||
#ifdef FC_OS_LINUX
|
||||
# include <unistd.h>
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#if HAVE_CONFIG_H
|
||||
# include <config.h>
|
||||
#endif // HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif // HAVE_CONFIG_H
|
||||
|
||||
#include <cstdio>
|
||||
#include <map>
|
||||
@@ -60,16 +60,17 @@
|
||||
|
||||
void PrintInitHelp();
|
||||
|
||||
const char sBanner[] = "\xc2\xa9 Juergen Riegel, Werner Mayer, Yorik van Havre and others 2001-2024\n"\
|
||||
"FreeCAD is free and open-source software licensed under the terms of LGPL2+ license.\n"\
|
||||
"FreeCAD wouldn't be possible without FreeCAD community.\n"\
|
||||
" ##### #### ### #### \n" \
|
||||
" # # # # # # \n" \
|
||||
" # ## #### #### # # # # # \n" \
|
||||
" #### # # # # # # # ##### # # \n" \
|
||||
" # # #### #### # # # # # \n" \
|
||||
" # # # # # # # # # ## ## ##\n" \
|
||||
" # # #### #### ### # # #### ## ## ##\n\n" ;
|
||||
const char sBanner[] =
|
||||
"\xc2\xa9 Juergen Riegel, Werner Mayer, Yorik van Havre and others 2001-2024\n"
|
||||
"FreeCAD is free and open-source software licensed under the terms of LGPL2+ license.\n"
|
||||
"FreeCAD wouldn't be possible without FreeCAD community.\n"
|
||||
" ##### #### ### #### \n"
|
||||
" # # # # # # \n"
|
||||
" # ## #### #### # # # # # \n"
|
||||
" #### # # # # # # # ##### # # \n"
|
||||
" # # #### #### # # # # # \n"
|
||||
" # # # # # # # # # ## ## ##\n"
|
||||
" # # #### #### ### # # #### ## ## ##\n\n";
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
void InitMiniDumpWriter(const std::string&);
|
||||
@@ -79,12 +80,13 @@ class Redirection
|
||||
{
|
||||
public:
|
||||
Redirection(FILE* f)
|
||||
: fi(Base::FileInfo::getTempFileName()), file(f)
|
||||
: fi(Base::FileInfo::getTempFileName())
|
||||
, file(f)
|
||||
{
|
||||
#ifdef WIN32
|
||||
FILE* ptr = _wfreopen(fi.toStdWString().c_str(),L"w",file);
|
||||
FILE* ptr = _wfreopen(fi.toStdWString().c_str(), L"w", file);
|
||||
#else
|
||||
FILE* ptr = freopen(fi.filePath().c_str(),"w",file);
|
||||
FILE* ptr = freopen(fi.filePath().c_str(), "w", file);
|
||||
#endif
|
||||
if (!ptr) {
|
||||
std::cerr << "Failed to reopen file" << std::endl;
|
||||
@@ -101,10 +103,10 @@ private:
|
||||
FILE* file;
|
||||
};
|
||||
|
||||
int main( int argc, char ** argv )
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
#if defined (FC_OS_LINUX) || defined(FC_OS_BSD)
|
||||
setlocale(LC_ALL, ""); // use native environment settings
|
||||
#if defined(FC_OS_LINUX) || defined(FC_OS_BSD)
|
||||
setlocale(LC_ALL, ""); // use native environment settings
|
||||
|
||||
// Make sure to setup the Qt locale system before setting LANG and LC_ALL to C.
|
||||
// which is needed to use the system locale settings.
|
||||
@@ -119,27 +121,30 @@ int main( int argc, char ** argv )
|
||||
#elif defined(__MINGW32__)
|
||||
const char* mingw_prefix = getenv("MINGW_PREFIX");
|
||||
const char* py_home = getenv("PYTHONHOME");
|
||||
if (!py_home && mingw_prefix)
|
||||
if (!py_home && mingw_prefix) {
|
||||
_putenv_s("PYTHONHOME", mingw_prefix);
|
||||
}
|
||||
#else
|
||||
_putenv("PYTHONPATH=");
|
||||
// https://forum.freecad.org/viewtopic.php?f=4&t=18288
|
||||
// https://forum.freecad.org/viewtopic.php?f=3&t=20515
|
||||
const char* fc_py_home = getenv("FC_PYTHONHOME");
|
||||
if (fc_py_home)
|
||||
if (fc_py_home) {
|
||||
_putenv_s("PYTHONHOME", fc_py_home);
|
||||
else
|
||||
}
|
||||
else {
|
||||
_putenv("PYTHONHOME=");
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined (FC_OS_WIN32)
|
||||
#if defined(FC_OS_WIN32)
|
||||
// we need to force Coin not to use Freetype in order to find installed fonts on Windows
|
||||
// see https://forum.freecad.org/viewtopic.php?p=485142#p485016
|
||||
_putenv("COIN_FORCE_FREETYPE_OFF=1");
|
||||
|
||||
int argc_ = argc;
|
||||
QVector<QByteArray> data;
|
||||
QVector<char *> argv_;
|
||||
QVector<char*> argv_;
|
||||
|
||||
// get the command line arguments as unicode string
|
||||
{
|
||||
@@ -149,7 +154,7 @@ int main( int argc, char ** argv )
|
||||
data.push_back(it->toUtf8());
|
||||
argv_.push_back(data.back().data());
|
||||
}
|
||||
argv_.push_back(0); // 0-terminated string
|
||||
argv_.push_back(0); // 0-terminated string
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -165,11 +170,11 @@ int main( int argc, char ** argv )
|
||||
App::Application::Config()["SplashScreen"] = "freecadsplash";
|
||||
App::Application::Config()["AboutImage"] = "freecadabout";
|
||||
App::Application::Config()["StartWorkbench"] = "PartDesignWorkbench";
|
||||
//App::Application::Config()["HiddenDockWindow"] = "Property editor";
|
||||
App::Application::Config()["SplashAlignment" ] = "Bottom|Left";
|
||||
App::Application::Config()["SplashTextColor" ] = "#8aadf4"; // light blue
|
||||
App::Application::Config()["SplashInfoColor" ] = "#8aadf4"; // light blue
|
||||
App::Application::Config()["SplashInfoPosition" ] = "6,75";
|
||||
// App::Application::Config()["HiddenDockWindow"] = "Property editor";
|
||||
App::Application::Config()["SplashAlignment"] = "Bottom|Left";
|
||||
App::Application::Config()["SplashTextColor"] = "#8aadf4"; // light blue
|
||||
App::Application::Config()["SplashInfoColor"] = "#8aadf4"; // light blue
|
||||
App::Application::Config()["SplashInfoPosition"] = "6,75";
|
||||
|
||||
QGuiApplication::setDesktopFileName(QStringLiteral("org.freecad.FreeCAD"));
|
||||
|
||||
@@ -181,7 +186,7 @@ int main( int argc, char ** argv )
|
||||
App::Application::Config()["LoggingConsole"] = "1";
|
||||
|
||||
// Inits the Application
|
||||
#if defined (FC_OS_WIN32)
|
||||
#if defined(FC_OS_WIN32)
|
||||
App::Application::init(argc_, argv_.data());
|
||||
#else
|
||||
App::Application::init(argc, argv);
|
||||
@@ -192,9 +197,11 @@ int main( int argc, char ** argv )
|
||||
dmpfile += "crash.dmp";
|
||||
InitMiniDumpWriter(dmpfile);
|
||||
#endif
|
||||
std::map<std::string, std::string>::iterator it = App::Application::Config().find("NavigationStyle");
|
||||
std::map<std::string, std::string>::iterator it =
|
||||
App::Application::Config().find("NavigationStyle");
|
||||
if (it != App::Application::Config().end()) {
|
||||
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View");
|
||||
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath(
|
||||
"User parameter:BaseApp/Preferences/View");
|
||||
// if not already defined do it now (for the very first start)
|
||||
std::string style = hGrp->GetASCII("NavigationStyle", it->second.c_str());
|
||||
hGrp->SetASCII("NavigationStyle", style.c_str());
|
||||
@@ -203,11 +210,12 @@ int main( int argc, char ** argv )
|
||||
Gui::Application::initApplication();
|
||||
|
||||
// Only if 'RunMode' is set to 'Gui' do the replacement
|
||||
if (App::Application::Config()["RunMode"] == "Gui")
|
||||
if (App::Application::Config()["RunMode"] == "Gui") {
|
||||
Base::Interpreter().replaceStdOutput();
|
||||
}
|
||||
}
|
||||
catch (const Base::UnknownProgramOption& e) {
|
||||
QApplication app(argc,argv);
|
||||
QApplication app(argc, argv);
|
||||
QString appName = QString::fromLatin1(App::Application::Config()["ExeName"].c_str());
|
||||
QString msg = QString::fromLatin1(e.what());
|
||||
QString s = QLatin1String("<pre>") + msg + QLatin1String("</pre>");
|
||||
@@ -215,7 +223,7 @@ int main( int argc, char ** argv )
|
||||
exit(1);
|
||||
}
|
||||
catch (const Base::ProgramInformation& e) {
|
||||
QApplication app(argc,argv);
|
||||
QApplication app(argc, argv);
|
||||
QString appName = QString::fromLatin1(App::Application::Config()["ExeName"].c_str());
|
||||
QString msg = QString::fromUtf8(e.what());
|
||||
QString s = QLatin1String("<pre>") + msg + QLatin1String("</pre>");
|
||||
@@ -230,54 +238,67 @@ int main( int argc, char ** argv )
|
||||
}
|
||||
catch (const Base::Exception& e) {
|
||||
// Popup an own dialog box instead of that one of Windows
|
||||
QApplication app(argc,argv);
|
||||
QApplication app(argc, argv);
|
||||
QString appName = QString::fromLatin1(App::Application::Config()["ExeName"].c_str());
|
||||
QString msg;
|
||||
msg = QObject::tr("While initializing %1 the following exception occurred: '%2'\n\n"
|
||||
"Python is searching for its files in the following directories:\n%3\n\n"
|
||||
"Python version information:\n%4\n")
|
||||
.arg(appName, QString::fromUtf8(e.what()),
|
||||
QString::fromUtf8(Py_EncodeLocale(Py_GetPath(),nullptr)), QString::fromLatin1(Py_GetVersion()));
|
||||
.arg(appName,
|
||||
QString::fromUtf8(e.what()),
|
||||
QString::fromUtf8(Py_EncodeLocale(Py_GetPath(), nullptr)),
|
||||
QString::fromLatin1(Py_GetVersion()));
|
||||
const char* pythonhome = getenv("PYTHONHOME");
|
||||
if (pythonhome) {
|
||||
msg += QObject::tr("\nThe environment variable PYTHONHOME is set to '%1'.")
|
||||
.arg(QString::fromUtf8(pythonhome));
|
||||
.arg(QString::fromUtf8(pythonhome));
|
||||
msg += QObject::tr("\nSetting this environment variable might cause Python to fail. "
|
||||
"Please contact your administrator to unset it on your system.\n\n");
|
||||
} else {
|
||||
msg += QObject::tr("\nPlease contact the application's support team for more information.\n\n");
|
||||
"Please contact your administrator to unset it on your system.\n\n");
|
||||
}
|
||||
else {
|
||||
msg += QObject::tr(
|
||||
"\nPlease contact the application's support team for more information.\n\n");
|
||||
}
|
||||
|
||||
QMessageBox::critical(nullptr, QObject::tr("Initialization of %1 failed").arg(appName), msg);
|
||||
QMessageBox::critical(nullptr,
|
||||
QObject::tr("Initialization of %1 failed").arg(appName),
|
||||
msg);
|
||||
exit(100);
|
||||
}
|
||||
catch (...) {
|
||||
// Popup an own dialog box instead of that one of Windows
|
||||
QApplication app(argc,argv);
|
||||
QApplication app(argc, argv);
|
||||
QString appName = QString::fromLatin1(App::Application::Config()["ExeName"].c_str());
|
||||
QString msg = QObject::tr("Unknown runtime error occurred while initializing %1.\n\n"
|
||||
"Please contact the application's support team for more information.\n\n").arg(appName);
|
||||
QMessageBox::critical(nullptr, QObject::tr("Initialization of %1 failed").arg(appName), msg);
|
||||
QString msg =
|
||||
QObject::tr("Unknown runtime error occurred while initializing %1.\n\n"
|
||||
"Please contact the application's support team for more information.\n\n")
|
||||
.arg(appName);
|
||||
QMessageBox::critical(nullptr,
|
||||
QObject::tr("Initialization of %1 failed").arg(appName),
|
||||
msg);
|
||||
exit(101);
|
||||
}
|
||||
|
||||
// Run phase ===========================================================
|
||||
Base::RedirectStdOutput stdcout;
|
||||
Base::RedirectStdLog stdclog;
|
||||
Base::RedirectStdError stdcerr;
|
||||
Base::RedirectStdLog stdclog;
|
||||
Base::RedirectStdError stdcerr;
|
||||
std::streambuf* oldcout = std::cout.rdbuf(&stdcout);
|
||||
std::streambuf* oldclog = std::clog.rdbuf(&stdclog);
|
||||
std::streambuf* oldcerr = std::cerr.rdbuf(&stdcerr);
|
||||
|
||||
try {
|
||||
// if console option is set then run in cmd mode
|
||||
if (App::Application::Config()["Console"] == "1")
|
||||
if (App::Application::Config()["Console"] == "1") {
|
||||
App::Application::runApplication();
|
||||
if (App::Application::Config()["RunMode"] == "Gui" ||
|
||||
App::Application::Config()["RunMode"] == "Internal") {
|
||||
}
|
||||
if (App::Application::Config()["RunMode"] == "Gui"
|
||||
|| App::Application::Config()["RunMode"] == "Internal") {
|
||||
Gui::Application::runApplication();
|
||||
} else
|
||||
}
|
||||
else {
|
||||
App::Application::runApplication();
|
||||
}
|
||||
}
|
||||
catch (const Base::SystemExitException& e) {
|
||||
exit(e.getExitCode());
|
||||
@@ -300,27 +321,27 @@ int main( int argc, char ** argv )
|
||||
std::cerr.rdbuf(oldcerr);
|
||||
|
||||
// Destruction phase ===========================================================
|
||||
Base::Console().Log("%s terminating...\n",App::Application::Config()["ExeName"].c_str());
|
||||
Base::Console().Log("%s terminating...\n", App::Application::Config()["ExeName"].c_str());
|
||||
|
||||
// cleans up
|
||||
App::Application::destruct();
|
||||
|
||||
Base::Console().Log("%s completely terminated\n",App::Application::Config()["ExeName"].c_str());
|
||||
Base::Console().Log("%s completely terminated\n",
|
||||
App::Application::Config()["ExeName"].c_str());
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
|
||||
typedef BOOL (__stdcall *tMDWD)(
|
||||
IN HANDLE hProcess,
|
||||
IN DWORD ProcessId,
|
||||
IN HANDLE hFile,
|
||||
IN MINIDUMP_TYPE DumpType,
|
||||
IN CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam, OPTIONAL
|
||||
IN CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam, OPTIONAL
|
||||
IN CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam OPTIONAL
|
||||
);
|
||||
typedef BOOL(__stdcall* tMDWD)(IN HANDLE hProcess,
|
||||
IN DWORD ProcessId,
|
||||
IN HANDLE hFile,
|
||||
IN MINIDUMP_TYPE DumpType,
|
||||
IN CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
|
||||
OPTIONAL IN CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam,
|
||||
OPTIONAL IN CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam
|
||||
OPTIONAL);
|
||||
|
||||
static tMDWD s_pMDWD;
|
||||
static HMODULE s_hDbgHelpMod;
|
||||
@@ -328,104 +349,111 @@ static MINIDUMP_TYPE s_dumpTyp = MiniDumpNormal;
|
||||
static std::wstring s_szMiniDumpFileName; // initialize with whatever appropriate...
|
||||
|
||||
#include <Base/StackWalker.h>
|
||||
class MyStackWalker : public StackWalker
|
||||
class MyStackWalker: public StackWalker
|
||||
{
|
||||
DWORD threadId;
|
||||
|
||||
public:
|
||||
MyStackWalker() : StackWalker(), threadId(GetCurrentThreadId())
|
||||
MyStackWalker()
|
||||
: StackWalker()
|
||||
, threadId(GetCurrentThreadId())
|
||||
{
|
||||
std::string name = App::Application::Config()["UserAppData"] + "crash.log";
|
||||
Base::Console().AttachObserver(new Base::ConsoleObserverFile(name.c_str()));
|
||||
}
|
||||
MyStackWalker(DWORD dwProcessId, HANDLE hProcess) : StackWalker(dwProcessId, hProcess) {}
|
||||
MyStackWalker(DWORD dwProcessId, HANDLE hProcess)
|
||||
: StackWalker(dwProcessId, hProcess)
|
||||
{}
|
||||
virtual void OnOutput(LPCSTR szText)
|
||||
{
|
||||
Base::Console().Log("Id: %ld: %s", threadId, szText);
|
||||
//StackWalker::OnOutput(szText);
|
||||
// StackWalker::OnOutput(szText);
|
||||
}
|
||||
};
|
||||
|
||||
static LONG __stdcall MyCrashHandlerExceptionFilter(EXCEPTION_POINTERS* pEx)
|
||||
static LONG __stdcall MyCrashHandlerExceptionFilter(EXCEPTION_POINTERS* pEx)
|
||||
{
|
||||
#ifdef _M_IX86
|
||||
if (pEx->ExceptionRecord->ExceptionCode == EXCEPTION_STACK_OVERFLOW)
|
||||
{
|
||||
// be sure that we have enough space...
|
||||
static char MyStack[1024*128];
|
||||
// it assumes that DS and SS are the same!!! (this is the case for Win32)
|
||||
// change the stack only if the selectors are the same (this is the case for Win32)
|
||||
//__asm push offset MyStack[1024*128];
|
||||
//__asm pop esp;
|
||||
__asm mov eax,offset MyStack[1024*128];
|
||||
__asm mov esp,eax;
|
||||
}
|
||||
#endif
|
||||
MyStackWalker sw;
|
||||
sw.ShowCallstack(GetCurrentThread(), pEx->ContextRecord);
|
||||
Base::Console().Log("*** Unhandled Exception!\n");
|
||||
Base::Console().Log(" ExpCode: 0x%8.8X\n", pEx->ExceptionRecord->ExceptionCode);
|
||||
Base::Console().Log(" ExpFlags: %d\n", pEx->ExceptionRecord->ExceptionFlags);
|
||||
Base::Console().Log(" ExpAddress: 0x%8.8X\n", pEx->ExceptionRecord->ExceptionAddress);
|
||||
#ifdef _M_IX86
|
||||
if (pEx->ExceptionRecord->ExceptionCode == EXCEPTION_STACK_OVERFLOW) {
|
||||
// be sure that we have enough space...
|
||||
static char MyStack[1024 * 128];
|
||||
// it assumes that DS and SS are the same!!! (this is the case for Win32)
|
||||
// change the stack only if the selectors are the same (this is the case for Win32)
|
||||
//__asm push offset MyStack[1024*128];
|
||||
//__asm pop esp;
|
||||
__asm mov eax, offset MyStack[1024 * 128];
|
||||
__asm mov esp, eax;
|
||||
}
|
||||
#endif
|
||||
MyStackWalker sw;
|
||||
sw.ShowCallstack(GetCurrentThread(), pEx->ContextRecord);
|
||||
Base::Console().Log("*** Unhandled Exception!\n");
|
||||
Base::Console().Log(" ExpCode: 0x%8.8X\n", pEx->ExceptionRecord->ExceptionCode);
|
||||
Base::Console().Log(" ExpFlags: %d\n", pEx->ExceptionRecord->ExceptionFlags);
|
||||
Base::Console().Log(" ExpAddress: 0x%8.8X\n", pEx->ExceptionRecord->ExceptionAddress);
|
||||
|
||||
bool bFailed = true;
|
||||
HANDLE hFile;
|
||||
hFile = CreateFileW(s_szMiniDumpFileName.c_str(), GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
|
||||
if (hFile != INVALID_HANDLE_VALUE)
|
||||
{
|
||||
MINIDUMP_EXCEPTION_INFORMATION stMDEI;
|
||||
stMDEI.ThreadId = GetCurrentThreadId();
|
||||
stMDEI.ExceptionPointers = pEx;
|
||||
stMDEI.ClientPointers = true;
|
||||
// try to create a miniDump:
|
||||
if (s_pMDWD(
|
||||
GetCurrentProcess(),
|
||||
GetCurrentProcessId(),
|
||||
hFile,
|
||||
s_dumpTyp,
|
||||
&stMDEI,
|
||||
NULL,
|
||||
NULL
|
||||
))
|
||||
{
|
||||
bFailed = false; // succeeded
|
||||
}
|
||||
CloseHandle(hFile);
|
||||
}
|
||||
bool bFailed = true;
|
||||
HANDLE hFile;
|
||||
hFile = CreateFileW(s_szMiniDumpFileName.c_str(),
|
||||
GENERIC_WRITE,
|
||||
0,
|
||||
NULL,
|
||||
CREATE_ALWAYS,
|
||||
FILE_ATTRIBUTE_NORMAL,
|
||||
NULL);
|
||||
if (hFile != INVALID_HANDLE_VALUE) {
|
||||
MINIDUMP_EXCEPTION_INFORMATION stMDEI;
|
||||
stMDEI.ThreadId = GetCurrentThreadId();
|
||||
stMDEI.ExceptionPointers = pEx;
|
||||
stMDEI.ClientPointers = true;
|
||||
// try to create a miniDump:
|
||||
if (s_pMDWD(GetCurrentProcess(),
|
||||
GetCurrentProcessId(),
|
||||
hFile,
|
||||
s_dumpTyp,
|
||||
&stMDEI,
|
||||
NULL,
|
||||
NULL)) {
|
||||
bFailed = false; // succeeded
|
||||
}
|
||||
CloseHandle(hFile);
|
||||
}
|
||||
|
||||
if (bFailed)
|
||||
{
|
||||
return EXCEPTION_CONTINUE_SEARCH;
|
||||
}
|
||||
if (bFailed) {
|
||||
return EXCEPTION_CONTINUE_SEARCH;
|
||||
}
|
||||
|
||||
// Optional display an error message
|
||||
// FatalAppExit(-1, ("Application failed!"));
|
||||
// Optional display an error message
|
||||
// FatalAppExit(-1, ("Application failed!"));
|
||||
|
||||
|
||||
// or return one of the following:
|
||||
// - EXCEPTION_CONTINUE_SEARCH
|
||||
// - EXCEPTION_CONTINUE_EXECUTION
|
||||
// - EXCEPTION_EXECUTE_HANDLER
|
||||
return EXCEPTION_CONTINUE_SEARCH; // this will trigger the "normal" OS error-dialog
|
||||
}
|
||||
// or return one of the following:
|
||||
// - EXCEPTION_CONTINUE_SEARCH
|
||||
// - EXCEPTION_CONTINUE_EXECUTION
|
||||
// - EXCEPTION_EXECUTE_HANDLER
|
||||
return EXCEPTION_CONTINUE_SEARCH; // this will trigger the "normal" OS error-dialog
|
||||
}
|
||||
|
||||
void InitMiniDumpWriter(const std::string& filename)
|
||||
{
|
||||
if (s_hDbgHelpMod != NULL)
|
||||
return;
|
||||
Base::FileInfo fi(filename);
|
||||
s_szMiniDumpFileName = fi.toStdWString();
|
||||
if (s_hDbgHelpMod != NULL) {
|
||||
return;
|
||||
}
|
||||
Base::FileInfo fi(filename);
|
||||
s_szMiniDumpFileName = fi.toStdWString();
|
||||
|
||||
// Initialize the member, so we do not load the dll after the exception has occurred
|
||||
// which might be not possible anymore...
|
||||
s_hDbgHelpMod = LoadLibraryA(("dbghelp.dll"));
|
||||
if (s_hDbgHelpMod != NULL)
|
||||
s_pMDWD = (tMDWD) GetProcAddress(s_hDbgHelpMod, "MiniDumpWriteDump");
|
||||
// Initialize the member, so we do not load the dll after the exception has occurred
|
||||
// which might be not possible anymore...
|
||||
s_hDbgHelpMod = LoadLibraryA(("dbghelp.dll"));
|
||||
if (s_hDbgHelpMod != NULL) {
|
||||
s_pMDWD = (tMDWD)GetProcAddress(s_hDbgHelpMod, "MiniDumpWriteDump");
|
||||
}
|
||||
|
||||
// Register Unhandled Exception-Filter:
|
||||
SetUnhandledExceptionFilter(MyCrashHandlerExceptionFilter);
|
||||
// Register Unhandled Exception-Filter:
|
||||
SetUnhandledExceptionFilter(MyCrashHandlerExceptionFilter);
|
||||
|
||||
// Additional call "PreventSetUnhandledExceptionFilter"...
|
||||
// See also: "SetUnhandledExceptionFilter" and VC8 (and later)
|
||||
// http://blog.kalmbachnet.de/?postid=75
|
||||
// Additional call "PreventSetUnhandledExceptionFilter"...
|
||||
// See also: "SetUnhandledExceptionFilter" and VC8 (and later)
|
||||
// http://blog.kalmbachnet.de/?postid=75
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user