X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69c54afe2107b65f2d4363c959fda1c73061054b..12acbc9bf7c4b486a74293be2eb5c0ebaf4828da:/src/msw/main.cpp diff --git a/src/msw/main.cpp b/src/msw/main.cpp index 8e0a07afc1..00728f40fd 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,20 @@ #pragma hdrstop #endif -#include "wx/event.h" -#include "wx/app.h" +#ifndef WX_PRECOMP + #include "wx/event.h" + #include "wx/app.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__ @@ -121,16 +118,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 +135,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) ) { @@ -211,20 +203,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 @@ -253,37 +236,36 @@ int wxEntry(int& argc, wxChar **argv) #if wxUSE_GUI && defined(__WXMSW__) -// ---------------------------------------------------------------------------- -// Windows-specific wxEntry -// ---------------------------------------------------------------------------- +#if wxUSE_UNICODE && !defined(__WXWINCE__) + #define NEED_UNICODE_CHECK +#endif -WXDLLEXPORT int wxEntry(HINSTANCE hInstance, - HINSTANCE WXUNUSED(hPrevInstance), - wxCmdLineArgType WXUNUSED(pCmdLine), - int nCmdShow) +#ifdef NEED_UNICODE_CHECK + +// check whether Unicode is available +static bool wxIsUnicodeAvailable() { - // 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 && !defined(__WXWINCE__) - if ( wxGetOsVersion() != wxWINDOWS_NT ) + static const wchar_t *ERROR_STRING = L"wxWidgets Fatal Error"; + + 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 ::MessageBox ( NULL, - _T("This program uses Unicode and requires Windows NT/2000/XP.\n\nProgram aborted."), - _T("wxWidgets Fatal Error"), + L"This program uses Unicode and requires Windows NT/2000/XP.\n" + L"\n" + L"Program aborted.", + ERROR_STRING, MB_ICONERROR | MB_OK ); - return -1; -#endif // !wxUSE_UNICODE_MSLU - + return false; +#else // wxUSE_UNICODE_MSLU // and the MSLU DLL must also be available HMODULE hmod = ::LoadLibraryA("unicows.dll"); if ( !hmod ) @@ -291,17 +273,77 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance, ::MessageBox ( NULL, - _T("This program uses Unicode and requires unicows.dll to work under current operating system.\n\nPlease install unicows.dll and relaunch the program."), - _T("wxWidgets Fatal Error"), + L"This program uses Unicode and requires unicows.dll to work " + L"under current operating system.\n" + L"\n" + L"Please install unicows.dll and relaunch the program.", + ERROR_STRING, MB_ICONERROR | MB_OK ); - return -1; + return false; } // this is not really necessary but be tidy ::FreeLibrary(hmod); + + // finally do the last check: has unicows.lib initialized correctly? + hmod = ::LoadLibraryW(L"unicows.dll"); + if ( !hmod ) + { + ::MessageBox + ( + NULL, + L"This program uses Unicode but is not using unicows.dll\n" + L"correctly and so cannot work under current operating system.\n" + L"Please contact the program author for an updated version.\n" + L"\n" + L"Program aborted.", + ERROR_STRING, + MB_ICONERROR | MB_OK + ); + + return false; + } + + ::FreeLibrary(hmod); +#endif // !wxUSE_UNICODE_MSLU } -#endif // wxUSE_UNICODE && !wxUSE_UNICODE_MSLU + + return true; +} + +#endif // NEED_UNICODE_CHECK + +// ---------------------------------------------------------------------------- +// 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) +{ + for ( int i = 0; i < argc; i++ ) + { + free(argv[i]); + } + + delete [] argv; +} + +WXDLLEXPORT int wxEntry(HINSTANCE hInstance, + HINSTANCE WXUNUSED(hPrevInstance), + 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 +#ifdef NEED_UNICODE_CHECK + if ( !wxIsUnicodeAvailable() ) + return -1; +#endif // NEED_UNICODE_CHECK // remember the parameters Windows gave us @@ -338,58 +380,11 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance, // argv[] must be NULL-terminated argv[argc] = NULL; - return wxEntry(argc, argv); -} - -// 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" -{ - -// ---------------------------------------------------------------------------- -// 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 - -BOOL WINAPI -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 - // initialisation will be called when the application implicitly - // calls WinMain. -#ifndef WXMAKINGDLL - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - return wxEntry(hModule); - - case DLL_PROCESS_DETACH: - wxEntryCleanup(); - break; - } -#else - (void)hModule; - (void)fdwReason; -#endif // !WXMAKINGDLL + wxON_BLOCK_EXIT2(wxFreeArgs, argc, argv); - return TRUE; + return wxEntry(argc, argv); } -#endif // _WINDLL - -} // extern "C" - -#endif // !NOMAIN - #endif // wxUSE_GUI && __WXMSW__ // ---------------------------------------------------------------------------- @@ -411,4 +406,3 @@ void wxSetInstance(HINSTANCE hInst) } #endif // wxUSE_BASE -