X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58187c862cf9d22919d2d672a17a33bdf9548aba..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/msw/main.cpp?ds=sidebyside diff --git a/src/msw/main.cpp b/src/msw/main.cpp index 900ef4fdef..577873e340 100644 --- a/src/msw/main.cpp +++ b/src/msw/main.cpp @@ -46,30 +46,59 @@ #ifdef __WXWINCE__ // there is no ExitProcess() under CE but exiting the main thread has the // same effect - #define ExitProcess ExitThread -#endif + #ifndef ExitProcess + #define ExitProcess ExitThread + #endif +#endif // __WXWINCE__ #ifdef __BORLANDC__ // BC++ has to be special: its run-time expects the DLL entry point to be // named DllEntryPoint instead of the (more) standard DllMain #define DllMain DllEntryPoint -#endif +#endif // __BORLANDC__ #if defined(__WXMICROWIN__) #define HINSTANCE HANDLE #endif +// defined in common/init.cpp +extern int wxEntryReal(int& argc, wxChar **argv); + // ============================================================================ // implementation: various entry points // ============================================================================ +#if wxUSE_BASE + +#if wxUSE_ON_FATAL_EXCEPTION && 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 + // stealing the exceptions from our wxGlobalSEHandler which is only called + // if the exception is not handled elsewhere, we have to also call it from + // a special SEH translator function which is called by VC CRT when a Win32 + // exception occurs + + // 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 + #pragma warning(disable:4535) + #endif + + // note that the SE translator must be called wxSETranslator! + #define DisableAutomaticSETranslator() _set_se_translator(wxSETranslator) +#else // !__VISUALC__ + #define DisableAutomaticSETranslator() +#endif // __VISUALC__/!__VISUALC__ + // ---------------------------------------------------------------------------- -// wrapper wxEntry catching all Win32 exceptions occuring in a wx program +// 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 && wxUSE_BASE +#if wxUSE_ON_FATAL_EXCEPTION // global pointer to exception information, only valid inside OnFatalException, // used by wxStackWalker and wxCrashReport @@ -78,6 +107,12 @@ extern EXCEPTION_POINTERS *wxGlobalSEInformation = NULL; // flag telling us whether the application wants to handle exceptions at all static bool gs_handleExceptions = false; +static void wxFatalExit() +{ + // use the same exit code as abort() + ::ExitProcess(3); +} + unsigned long wxGlobalSEHandler(EXCEPTION_POINTERS *pExcPtrs) { if ( gs_handleExceptions && wxTheApp ) @@ -110,7 +145,27 @@ unsigned long wxGlobalSEHandler(EXCEPTION_POINTERS *pExcPtrs) static void wxSETranslator(unsigned int WXUNUSED(code), EXCEPTION_POINTERS *ep) { - wxGlobalSEHandler(ep); + switch ( wxGlobalSEHandler(ep) ) + { + default: + wxFAIL_MSG( _T("unexpected wxGlobalSEHandler() return value") ); + // fall through + + case EXCEPTION_EXECUTE_HANDLER: + // if wxApp::OnFatalException() had been called we should exit the + // application -- but we shouldn't kill our host when we're a DLL +#ifndef WXMAKINGDLL + wxFatalExit(); +#endif // not a DLL + break; + + case EXCEPTION_CONTINUE_SEARCH: + // we're called for each "catch ( ... )" and if we (re)throw from + // here, the catch handler body is not executed, so the effect is + // as if had inhibited translation of SE to C++ ones because the + // handler will never see any structured exceptions + throw; + } } #endif // __VISUALC__ @@ -120,25 +175,6 @@ bool wxHandleFatalExceptions(bool doit) // assume this can only be called from the main thread gs_handleExceptions = doit; -#ifdef __VISUALC__ - // 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 - // stealing the exceptions from our wxGlobalSEHandler which is only called - // if the exception is not handled elsewhere, we have to also call it from - // a special SEH translator function which is called by VC CRT when a Win32 - // exception occurs - - // 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 - #pragma warning(disable:4535) - #endif - - _set_se_translator(doit ? wxSETranslator : NULL); -#endif - #if wxUSE_CRASHREPORT if ( doit ) { @@ -173,25 +209,47 @@ bool wxHandleFatalExceptions(bool doit) int wxEntry(int& argc, wxChar **argv) { + DisableAutomaticSETranslator(); + __try { - extern int wxEntryReal(int& argc, wxChar **argv); - return wxEntryReal(argc, argv); } __except ( wxGlobalSEHandler(GetExceptionInformation()) ) { - ::ExitProcess(3); // the same exit code as abort() + wxFatalExit(); -#if !defined(_MSC_VER) || _MSC_VER < 1300 - // this code is unreachable but put it here to suppress warnings - // from some compilers +#if !defined(_MSC_VER) || defined(__WXDEBUG__) || (defined(_MSC_VER) && _MSC_VER <= 1200) + // this code is unreachable but put it here to suppress warnings in some compilers + // and disable for others to supress warnings too return -1; -#endif +#endif // !__VISUALC__ in release build } } -#endif // wxUSE_ON_FATAL_EXCEPTION && wxUSE_BASE +#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); +} + +#endif // wxUSE_ON_FATAL_EXCEPTION/!wxUSE_ON_FATAL_EXCEPTION + +#endif // wxUSE_BASE #if wxUSE_GUI @@ -204,6 +262,28 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance, wxCmdLineArgType WXUNUSED(pCmdLine), 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 +#if wxUSE_UNICODE && !wxUSE_UNICODE_MSLU && !defined(__WXWINCE__) + if ( wxGetOsVersion() != wxWINDOWS_NT ) + { + // note that we can use MessageBoxW() as it's implemented even under + // Win9x - OTOH, we can't use wxGetTranslation() because the file APIs + // used by wxLocale are not + ::MessageBox + ( + NULL, + _T("This program uses Unicode and requires Windows NT/2000/XP.\nProgram aborted."), + _T("wxWidgets Fatal Error"), + MB_ICONERROR | MB_OK + ); + + return -1; + } +#endif // wxUSE_UNICODE && !wxUSE_UNICODE_MSLU + + // remember the parameters Windows gave us wxSetInstance(hInstance); wxApp::m_nCmdShow = nCmdShow; @@ -260,7 +340,7 @@ extern "C" // DLL entry point BOOL WINAPI -DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved)) +DllMain(HINSTANCE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved)) { // Only call wxEntry if the application itself is part of the DLL. // If only the wxWidgets library is in the DLL, then the