X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f2df739f416d5f00bd294c7a29f71a46cd61fc2..69659fd770f615210efac4b4fa741b3ad6223616:/src/msw/main.cpp diff --git a/src/msw/main.cpp b/src/msw/main.cpp index ead91896d5..583460c7b1 100644 --- a/src/msw/main.cpp +++ b/src/msw/main.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/main.cpp +// Name: src/msw/main.cpp // Purpose: WinMain/DllMain // Author: Julian Smart // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,19 +24,21 @@ #pragma hdrstop #endif -#include "wx/event.h" -#include "wx/app.h" +#ifndef WX_PRECOMP + #include "wx/event.h" + #include "wx/app.h" + #include "wx/utils.h" +#endif //WX_PRECOMP + #include "wx/cmdline.h" +#include "wx/scopeguard.h" #include "wx/msw/private.h" +#include "wx/msw/seh.h" #if wxUSE_ON_FATAL_EXCEPTION #include "wx/datetime.h" #include "wx/msw/crashrpt.h" - - #ifdef __VISUALC__ - #include - #endif // __VISUALC__ #endif // wxUSE_ON_FATAL_EXCEPTION #ifdef __WXWINCE__ @@ -63,6 +61,7 @@ // defined in common/init.cpp extern int wxEntryReal(int& argc, wxChar **argv); +extern int wxEntryCleanupReal(int& argc, wxChar **argv); // ============================================================================ // implementation: various entry points @@ -81,8 +80,8 @@ extern int wxEntryReal(int& argc, wxChar **argv); // 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 @@ -121,16 +120,11 @@ unsigned long wxGlobalSEHandler(EXCEPTION_POINTERS *pExcPtrs) wxGlobalSEInformation = pExcPtrs; // give the user a chance to do something special about this - __try + wxSEH_TRY { wxTheApp->OnFatalException(); } - __except ( EXCEPTION_EXECUTE_HANDLER ) - { - // nothing to do here, just ignore the exception inside the - // exception handler - ; - } + wxSEH_IGNORE // ignore any exceptions inside the exception handler wxGlobalSEInformation = NULL; @@ -143,7 +137,7 @@ unsigned long wxGlobalSEHandler(EXCEPTION_POINTERS *pExcPtrs) #ifdef __VISUALC__ -static void wxSETranslator(unsigned int WXUNUSED(code), EXCEPTION_POINTERS *ep) +void wxSETranslator(unsigned int WXUNUSED(code), EXCEPTION_POINTERS *ep) { switch ( wxGlobalSEHandler(ep) ) { @@ -192,7 +186,7 @@ bool wxHandleFatalExceptions(bool doit) wxString name = wxString::Format ( _T("%s_%s_%lu.dmp"), - wxTheApp ? wxTheApp->GetAppName().c_str() + wxTheApp ? (const wxChar*)wxTheApp->GetAppName().c_str() : _T("wxwindows"), wxDateTime::Now().Format(_T("%Y%m%dT%H%M%S")).c_str(), ::GetCurrentProcessId() @@ -211,20 +205,11 @@ int wxEntry(int& argc, wxChar **argv) { DisableAutomaticSETranslator(); - __try + wxSEH_TRY { return wxEntryReal(argc, argv); } - __except ( wxGlobalSEHandler(GetExceptionInformation()) ) - { - wxFatalExit(); - -#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 // !__VISUALC__ in release build - } + wxSEH_HANDLE(-1) } #else // !wxUSE_ON_FATAL_EXCEPTION @@ -264,10 +249,10 @@ static bool wxIsUnicodeAvailable() { 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 +#if !wxUSE_UNICODE_MSLU // 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 @@ -282,8 +267,7 @@ static bool wxIsUnicodeAvailable() ); return false; -#endif // !wxUSE_UNICODE_MSLU - +#else // wxUSE_UNICODE_MSLU // and the MSLU DLL must also be available HMODULE hmod = ::LoadLibraryA("unicows.dll"); if ( !hmod ) @@ -324,6 +308,7 @@ static bool wxIsUnicodeAvailable() } ::FreeLibrary(hmod); +#endif // !wxUSE_UNICODE_MSLU } return true; @@ -335,17 +320,56 @@ static bool wxIsUnicodeAvailable() // Windows-specific wxEntry // ---------------------------------------------------------------------------- -WXDLLEXPORT int wxEntry(HINSTANCE hInstance, - HINSTANCE WXUNUSED(hPrevInstance), - wxCmdLineArgType WXUNUSED(pCmdLine), - int nCmdShow) +struct wxMSWCommandLineArguments +{ + 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() + { + if ( !argc ) + return; + + for ( int i = 0; i < argc; i++ ) + { + free(argv[i]); + } + + delete [] argv; + argv = NULL; + argc = 0; + } + + int argc; + wxChar **argv; +}; + +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 @@ -371,70 +395,35 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance, args.Insert(wxGetFullModuleName(), 0); #endif - int argc = args.GetCount(); - - // +1 here for the terminating NULL - wxChar **argv = new wxChar *[argc + 1]; - for ( int i = 0; i < argc; i++ ) - { - argv[i] = wxStrdup(args[i]); - } - - // argv[] must be NULL-terminated - argv[argc] = NULL; + wxArgs.Init(args); - return wxEntry(argc, argv); + return true; } -// May wish not to have a DllMain or WinMain, e.g. if we're programming -// a Netscape plugin or if we're writing a console application -#if !defined(NOMAIN) - -extern "C" +WXDLLEXPORT bool wxEntryStart(HINSTANCE hInstance, + HINSTANCE WXUNUSED(hPrevInstance), + wxCmdLineArgType WXUNUSED(pCmdLine), + int nCmdShow) { + if ( !wxMSWEntryCommon(hInstance, nCmdShow) ) + return false; -// ---------------------------------------------------------------------------- -// WinMain -// ---------------------------------------------------------------------------- - -// Note that WinMain is also defined in dummy.obj, which is linked to -// an application that is using the DLL version of wxWidgets. - -#if defined(_WINDLL) - -// DLL entry point + return wxEntryStart(wxArgs.argc, wxArgs.argv); +} -BOOL WINAPI -DllMain(HINSTANCE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved)) +WXDLLEXPORT int wxEntry(HINSTANCE hInstance, + HINSTANCE WXUNUSED(hPrevInstance), + wxCmdLineArgType WXUNUSED(pCmdLine), + int nCmdShow) { - // Only call wxEntry if the application itself is part of the DLL. - // If only the wxWidgets library is in the DLL, then the - // initialisation will be called when the application implicitly - // calls WinMain. -#ifndef WXMAKINGDLL - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - return wxEntry(hModule); + if ( !wxMSWEntryCommon(hInstance, nCmdShow) ) + return -1; - case DLL_PROCESS_DETACH: - wxEntryCleanup(); - break; - } -#else - (void)hModule; - (void)fdwReason; -#endif // !WXMAKINGDLL + wxON_BLOCK_EXIT_OBJ0(wxArgs, wxMSWCommandLineArguments::Free); - return TRUE; + return wxEntry(wxArgs.argc, wxArgs.argv); } -#endif // _WINDLL - -} // extern "C" - -#endif // !NOMAIN - #endif // wxUSE_GUI && __WXMSW__ // ---------------------------------------------------------------------------- @@ -456,4 +445,3 @@ void wxSetInstance(HINSTANCE hInst) } #endif // wxUSE_BASE -