X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/msw/main.cpp?ds=sidebyside

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 1967e0cff2..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:
@@ -24,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 <eh.h>
-    #endif // __VISUALC__
 #endif // wxUSE_ON_FATAL_EXCEPTION
 
 #ifdef __WXWINCE__
@@ -117,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;
 
@@ -139,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) )
     {
@@ -207,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
@@ -260,10 +247,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
@@ -331,6 +318,20 @@ static bool wxIsUnicodeAvailable()
 // 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),
@@ -379,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.
+    wxON_BLOCK_EXIT2(wxFreeArgs, argc, argv);
 
-#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
-
-    return TRUE;
+    return wxEntry(argc, argv);
 }
 
-#endif // _WINDLL
-
-} // extern "C"
-
-#endif // !NOMAIN
-
 #endif // wxUSE_GUI && __WXMSW__
 
 // ----------------------------------------------------------------------------
@@ -452,4 +406,3 @@ void wxSetInstance(HINSTANCE hInst)
 }
 
 #endif // wxUSE_BASE
-