#ifndef WX_PRECOMP
#include "wx/event.h"
+ #include "wx/app.h"
+ #include "wx/utils.h"
#endif //WX_PRECOMP
-#include "wx/app.h"
#include "wx/cmdline.h"
#include "wx/scopeguard.h"
// defined in common/init.cpp
extern int wxEntryReal(int& argc, wxChar **argv);
+extern int wxEntryCleanupReal(int& argc, wxChar **argv);
// ============================================================================
// implementation: various entry points
#if wxUSE_BASE
-#if wxUSE_ON_FATAL_EXCEPTION && defined(__VISUALC__) && !defined(__WXWINCE__)
+// ----------------------------------------------------------------------------
+// wrapper wxEntry catching all Win32 exceptions occurring in a wx program
+// ----------------------------------------------------------------------------
+
+// wrap real wxEntry in a try-except block to be able to call
+// OnFatalException() if necessary
+#if wxUSE_ON_FATAL_EXCEPTION
+
+#if defined(__VISUALC__) && !defined(__WXWINCE__)
// VC++ (at least from 4.0 up to version 7.1) is incredibly broken in that
// a "catch ( ... )" will *always* catch SEH exceptions in it even though
// it should have never been the case... to prevent such catches from
// this warns that /EHa (async exceptions) should be used when using
// _set_se_translator but, in fact, this doesn't seem to change anything
- // with VC++ up to 7.1 -- to be confirmed with VC++ 8
- #if _MSC_VER <= 1310
+ // with VC++ up to 8.0
+ #if _MSC_VER <= 1400
#pragma warning(disable:4535)
#endif
#define DisableAutomaticSETranslator()
#endif // __VISUALC__/!__VISUALC__
-// ----------------------------------------------------------------------------
-// wrapper wxEntry catching all Win32 exceptions occurring in a wx program
-// ----------------------------------------------------------------------------
-
-// wrap real wxEntry in a try-except block to be able to call
-// OnFatalException() if necessary
-#if wxUSE_ON_FATAL_EXCEPTION
-
// global pointer to exception information, only valid inside OnFatalException,
// used by wxStackWalker and wxCrashReport
extern EXCEPTION_POINTERS *wxGlobalSEInformation = NULL;
wxString name = wxString::Format
(
_T("%s_%s_%lu.dmp"),
- wxTheApp ? wxTheApp->GetAppName().c_str()
+ wxTheApp ? (const wxChar*)wxTheApp->GetAppDisplayName().c_str()
: _T("wxwindows"),
wxDateTime::Now().Format(_T("%Y%m%dT%H%M%S")).c_str(),
::GetCurrentProcessId()
#else // !wxUSE_ON_FATAL_EXCEPTION
-#if defined(__VISUALC__) && !defined(__WXWINCE__)
-
-static void
-wxSETranslator(unsigned int WXUNUSED(code), EXCEPTION_POINTERS * WXUNUSED(ep))
-{
- // see wxSETranslator() version for wxUSE_ON_FATAL_EXCEPTION above
- throw;
-}
-
-#endif // __VISUALC__
-
int wxEntry(int& argc, wxChar **argv)
{
- DisableAutomaticSETranslator();
-
return wxEntryReal(argc, argv);
}
{
static const wchar_t *ERROR_STRING = L"wxWidgets Fatal Error";
- if ( wxGetOsVersion() != wxWINDOWS_NT )
+ if ( wxGetOsVersion() != wxOS_WINDOWS_NT )
{
// we need to be built with MSLU support
#if !wxUSE_UNICODE_MSLU
// Windows-specific wxEntry
// ----------------------------------------------------------------------------
-// helper function used to clean up in wxEntry() just below
-//
-// notice that argv elements are supposed to be allocated using malloc() while
-// argv array itself is allocated with new
-static void wxFreeArgs(int argc, wxChar **argv)
+struct wxMSWCommandLineArguments
{
- for ( int i = 0; i < argc; i++ )
+ wxMSWCommandLineArguments() { argc = 0; argv = NULL; }
+
+ void Init(const wxArrayString& args)
+ {
+ argc = args.size();
+
+ // +1 here for the terminating NULL
+ argv = new wxChar *[argc + 1];
+ for ( int i = 0; i < argc; i++ )
+ {
+ argv[i] = wxStrdup(args[i].wx_str());
+ }
+
+ // argv[] must be NULL-terminated
+ argv[argc] = NULL;
+ }
+
+ void Free()
{
- free(argv[i]);
+ if ( !argc )
+ return;
+
+ for ( int i = 0; i < argc; i++ )
+ {
+ free(argv[i]);
+ }
+
+ delete [] argv;
+ argv = NULL;
+ argc = 0;
}
- delete [] argv;
-}
+ int argc;
+ wxChar **argv;
+};
-WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
- HINSTANCE WXUNUSED(hPrevInstance),
- wxCmdLineArgType WXUNUSED(pCmdLine),
- int nCmdShow)
+static wxMSWCommandLineArguments wxArgs;
+
+// common part of wxMSW-specific wxEntryStart() and wxEntry() overloads
+static bool
+wxMSWEntryCommon(HINSTANCE hInstance, int nCmdShow)
{
// the first thing to do is to check if we're trying to run an Unicode
// program under Win9x w/o MSLU emulation layer - if so, abort right now
// as it has no chance to work and has all chances to crash
#ifdef NEED_UNICODE_CHECK
if ( !wxIsUnicodeAvailable() )
- return -1;
+ return false;
#endif // NEED_UNICODE_CHECK
args.Insert(wxGetFullModuleName(), 0);
#endif
- int argc = args.GetCount();
+ wxArgs.Init(args);
- // +1 here for the terminating NULL
- wxChar **argv = new wxChar *[argc + 1];
- for ( int i = 0; i < argc; i++ )
- {
- argv[i] = wxStrdup(args[i]);
- }
+ return true;
+}
+
+WXDLLEXPORT bool wxEntryStart(HINSTANCE hInstance,
+ HINSTANCE WXUNUSED(hPrevInstance),
+ wxCmdLineArgType WXUNUSED(pCmdLine),
+ int nCmdShow)
+{
+ if ( !wxMSWEntryCommon(hInstance, nCmdShow) )
+ return false;
- // argv[] must be NULL-terminated
- argv[argc] = NULL;
+ return wxEntryStart(wxArgs.argc, wxArgs.argv);
+}
+
+WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
+ HINSTANCE WXUNUSED(hPrevInstance),
+ wxCmdLineArgType WXUNUSED(pCmdLine),
+ int nCmdShow)
+{
+ if ( !wxMSWEntryCommon(hInstance, nCmdShow) )
+ return -1;
- wxON_BLOCK_EXIT2(wxFreeArgs, argc, argv);
+ wxON_BLOCK_EXIT_OBJ0(wxArgs, wxMSWCommandLineArguments::Free);
- return wxEntry(argc, argv);
+ return wxEntry(wxArgs.argc, wxArgs.argv);
}
#endif // wxUSE_GUI && __WXMSW__
projects / wxWidgets.git / blobdiff