fixed typo in last commit

[wxWidgets.git] / src / msw / main.cpp

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index f761ec971a33e85714679c6de9bc90d1498141e0..900ef4fdefad0b35f4c391b1f81e4638b770c3ad 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation
 #endif
 
     #pragma implementation
 #endif
 


@@ -34,9 +34,19 @@
 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

-// Don't implement WinMain if we're building an MFC/wxWindows hybrid app.
-#if wxUSE_MFC && !defined(NOMAIN)
-    #define NOMAIN 1
+#if wxUSE_ON_FATAL_EXCEPTION
+    #include "wx/datetime.h"
+    #include "wx/msw/crashrpt.h"
+
+    #ifdef __VISUALC__
+        #include <eh.h>
+    #endif // __VISUALC__
+#endif // wxUSE_ON_FATAL_EXCEPTION
+
+#ifdef __WXWINCE__
+    // there is no ExitProcess() under CE but exiting the main thread has the
+    // same effect
+    #define ExitProcess ExitThread

 #endif
 
 #ifdef __BORLANDC__
 #endif
 
 #ifdef __BORLANDC__


@@ -49,20 +59,141 @@
     #define HINSTANCE HANDLE
 #endif
 
     #define HINSTANCE HANDLE
 #endif
 

-#if wxUSE_GUI
+// ============================================================================
+// implementation: various entry points
+// ============================================================================

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// function prototypes
+// wrapper wxEntry catching all Win32 exceptions occuring in a wx program

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// from src/msw/app.cpp
-extern void WXDLLEXPORT wxEntryCleanup();
+// wrap real wxEntry in a try-except block to be able to call
+// OnFatalException() if necessary
+#if wxUSE_ON_FATAL_EXCEPTION && wxUSE_BASE

 
 

-static wxChar **ConvertToStandardCommandArgs(const wxChar *p, int& argc);
+// global pointer to exception information, only valid inside OnFatalException,
+// used by wxStackWalker and wxCrashReport
+extern EXCEPTION_POINTERS *wxGlobalSEInformation = NULL;

 
 

-// ============================================================================
-// implementation: various entry points
-// ============================================================================
+// flag telling us whether the application wants to handle exceptions at all
+static bool gs_handleExceptions = false;
+
+unsigned long wxGlobalSEHandler(EXCEPTION_POINTERS *pExcPtrs)
+{
+    if ( gs_handleExceptions && wxTheApp )
+    {
+        // store the pointer to exception info
+        wxGlobalSEInformation = pExcPtrs;
+
+        // give the user a chance to do something special about this
+        __try
+        {
+            wxTheApp->OnFatalException();
+        }
+        __except ( EXCEPTION_EXECUTE_HANDLER )
+        {
+            // nothing to do here, just ignore the exception inside the
+            // exception handler
+            ;
+        }
+
+        wxGlobalSEInformation = NULL;
+
+        // this will execute our handler and terminate the process
+        return EXCEPTION_EXECUTE_HANDLER;
+    }
+
+    return EXCEPTION_CONTINUE_SEARCH;
+}
+
+#ifdef __VISUALC__
+
+static void wxSETranslator(unsigned int WXUNUSED(code), EXCEPTION_POINTERS *ep)
+{
+    wxGlobalSEHandler(ep);
+}
+
+#endif // __VISUALC__
+
+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 )
+    {
+        // try to find a place where we can put out report file later
+        wxChar fullname[MAX_PATH];
+        if ( !::GetTempPath(WXSIZEOF(fullname), fullname) )
+        {
+            wxLogLastError(_T("GetTempPath"));
+
+            // when all else fails...
+            wxStrcpy(fullname, _T("c:\\"));
+        }
+
+        // use PID and date to make the report file name more unique
+        wxString name = wxString::Format
+                        (
+                            _T("%s_%s_%lu.dmp"),
+                            wxTheApp ? wxTheApp->GetAppName().c_str()
+                                     : _T("wxwindows"),
+                            wxDateTime::Now().Format(_T("%Y%m%dT%H%M%S")).c_str(),
+                            ::GetCurrentProcessId()
+                        );
+
+        wxStrncat(fullname, name, WXSIZEOF(fullname) - wxStrlen(fullname) - 1);
+
+        wxCrashReport::SetFileName(fullname);
+    }
+#endif // wxUSE_CRASHREPORT
+
+    return true;
+}
+
+int wxEntry(int& argc, wxChar **argv)
+{
+    __try
+    {
+        extern int wxEntryReal(int& argc, wxChar **argv);
+
+        return wxEntryReal(argc, argv);
+    }
+    __except ( wxGlobalSEHandler(GetExceptionInformation()) )
+    {
+        ::ExitProcess(3); // the same exit code as abort()
+
+#if !defined(_MSC_VER) || _MSC_VER < 1300
+        // this code is unreachable but put it here to suppress warnings
+        // from some compilers
+        return -1;
+#endif
+    }
+}
+
+#endif // wxUSE_ON_FATAL_EXCEPTION && wxUSE_BASE
+
+#if wxUSE_GUI

 
 // ----------------------------------------------------------------------------
 // Windows-specific wxEntry
 
 // ----------------------------------------------------------------------------
 // Windows-specific wxEntry


@@ -70,16 +201,42 @@ static wxChar **ConvertToStandardCommandArgs(const wxChar *p, int& argc);
 
 WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
                         HINSTANCE WXUNUSED(hPrevInstance),
 
 WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
                         HINSTANCE WXUNUSED(hPrevInstance),

-                        char *pCmdLine,
+                        wxCmdLineArgType WXUNUSED(pCmdLine),

                         int nCmdShow)
 {
     // remember the parameters Windows gave us
     wxSetInstance(hInstance);
     wxApp::m_nCmdShow = nCmdShow;
 
                         int nCmdShow)
 {
     // remember the parameters Windows gave us
     wxSetInstance(hInstance);
     wxApp::m_nCmdShow = nCmdShow;
 

-    // parse the command line
-    int argc;
-    wxChar **argv = ConvertToStandardCommandArgs(wxConvertMB2WX(pCmdLine), argc);
+    // parse the command line: we can't use pCmdLine in Unicode build so it is
+    // simpler to never use it at all (this also results in a more correct
+    // argv[0])
+
+    // break the command line in words
+    wxArrayString args;
+
+    const wxChar *cmdLine = ::GetCommandLine();
+    if ( cmdLine )
+    {
+        args = wxCmdLineParser::ConvertStringToArgs(cmdLine);
+    }
+
+#ifdef __WXWINCE__
+    // WinCE doesn't insert the program itself, so do it ourselves.
+    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;

 
     return wxEntry(argc, argv);
 }
 
     return wxEntry(argc, argv);
 }


@@ -96,29 +253,9 @@ extern "C"
 // ----------------------------------------------------------------------------
 
 // Note that WinMain is also defined in dummy.obj, which is linked to
 // ----------------------------------------------------------------------------
 
 // Note that WinMain is also defined in dummy.obj, which is linked to

-// an application that is using the DLL version of wxWindows.
+// an application that is using the DLL version of wxWidgets.

 
 

-#if !defined(_WINDLL)
-
-#ifdef __WXWINCE__
-int WINAPI WinMain(HINSTANCE hInstance,
-                   HINSTANCE hPrevInstance,
-                   LPWSTR lpCmdLine,
-                   int nCmdShow)
-{
-    return wxEntry(hInstance, hPrevInstance, (char*) lpCmdLine, nCmdShow);
-}
-#else
-int PASCAL WinMain(HINSTANCE hInstance,
-                   HINSTANCE hPrevInstance,
-                   LPSTR lpCmdLine,
-                   int nCmdShow)
-{
-    return wxEntry(hInstance, hPrevInstance, lpCmdLine, nCmdShow);
-}
-#endif
-
-#else // _WINDLL
+#if defined(_WINDLL)

 
 // DLL entry point
 
 
 // DLL entry point
 


@@ -126,7 +263,7 @@ BOOL WINAPI
 DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved))
 {
     // Only call wxEntry if the application itself is part of the DLL.
 DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved))
 {
     // Only call wxEntry if the application itself is part of the DLL.

-    // If only the wxWindows library is in the DLL, then the
+    // If only the wxWidgets library is in the DLL, then the

     // initialisation will be called when the application implicitly
     // calls WinMain.
 #ifndef WXMAKINGDLL
     // initialisation will be called when the application implicitly
     // calls WinMain.
 #ifndef WXMAKINGDLL


@@ -140,55 +277,19 @@ DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved))
             break;
     }
 #else
             break;
     }
 #else

-       (void)hModule;
-       (void)fdwReason;
+    (void)hModule;
+    (void)fdwReason;

 #endif // !WXMAKINGDLL
 
     return TRUE;
 }
 
 #endif // !WXMAKINGDLL
 
     return TRUE;
 }
 

-#endif // _WINDLL/!_WINDLL
+#endif // _WINDLL

 
 } // extern "C"
 
 #endif // !NOMAIN
 
 
 } // extern "C"
 
 #endif // !NOMAIN
 

-// ---------------------------------------------------------------------------
-// Convert Windows to argc, argv style
-// ---------------------------------------------------------------------------
-
-wxChar **ConvertToStandardCommandArgs(const wxChar *p, int& argc)
-{
-    // break the command line in words
-    wxArrayString args;
-    if ( p )
-    {
-        args = wxCmdLineParser::ConvertStringToArgs(p);
-    }
-
-    // +1 here for the program name
-    argc = args.GetCount() + 1;
-
-    // and +1 here for the terminating NULL
-    wxChar **argv = new wxChar *[argc + 1];
-
-    // as we use wxStrdup below we must allocate the first argument using
-    // malloc(), not new[], as well
-    argv[0] = (wxChar *)malloc(MAX_PATH * sizeof(wxChar));
-    ::GetModuleFileName(wxhInstance, argv[0], MAX_PATH);
-
-    // copy all the other arguments to wxApp::argv[]
-    for ( int i = 1; i < argc; i++ )
-    {
-        argv[i] = wxStrdup(args[i - 1]);
-    }
-
-    // argv[] must be NULL-terminated
-    argv[argc] = NULL;
-
-    return argv;
-}
-

 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------


@@ -199,7 +300,7 @@ wxChar **ConvertToStandardCommandArgs(const wxChar *p, int& argc)
 
 HINSTANCE wxhInstance = 0;
 
 
 HINSTANCE wxhInstance = 0;
 

-HINSTANCE wxGetInstance()
+extern "C" HINSTANCE wxGetInstance()

 {
     return wxhInstance;
 }
 {
     return wxhInstance;
 }