fixed LastRead() after Read(wxOutputStream&) (patch 1658301)

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

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 35f1ada5fc6a9def1a20378859348cc22f9a8942..4676a2d24159d43ff72dd4c35fcfd97c23477182 100644 (file)
--- 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:
 // Purpose:     WinMain/DllMain
 // Author:      Julian Smart
 // Modified by:


@@ -24,19 +24,20 @@
     #pragma hdrstop
 #endif
 
     #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/cmdline.h"

+#include "wx/scopeguard.h"

 
 #include "wx/msw/private.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"
 
 #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__
 #endif // wxUSE_ON_FATAL_EXCEPTION
 
 #ifdef __WXWINCE__


@@ -77,8 +78,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
 
     // 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
 
         #pragma warning(disable:4535)
     #endif
 


@@ -117,16 +118,11 @@ unsigned long wxGlobalSEHandler(EXCEPTION_POINTERS *pExcPtrs)
         wxGlobalSEInformation = pExcPtrs;
 
         // give the user a chance to do something special about this
         wxGlobalSEInformation = pExcPtrs;
 
         // give the user a chance to do something special about this

-        __try
+        wxSEH_TRY

         {
             wxTheApp->OnFatalException();
         }
         {
             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;
 
 
         wxGlobalSEInformation = NULL;
 


@@ -139,7 +135,7 @@ unsigned long wxGlobalSEHandler(EXCEPTION_POINTERS *pExcPtrs)
 
 #ifdef __VISUALC__
 
 
 #ifdef __VISUALC__
 

-static void wxSETranslator(unsigned int WXUNUSED(code), EXCEPTION_POINTERS *ep)
+void wxSETranslator(unsigned int WXUNUSED(code), EXCEPTION_POINTERS *ep)

 {
     switch ( wxGlobalSEHandler(ep) )
     {
 {
     switch ( wxGlobalSEHandler(ep) )
     {


@@ -207,20 +203,11 @@ int wxEntry(int& argc, wxChar **argv)
 {
     DisableAutomaticSETranslator();
 
 {
     DisableAutomaticSETranslator();
 

-    __try
+    wxSEH_TRY

     {
         return wxEntryReal(argc, argv);
     }
     {
         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
 }
 
 #else // !wxUSE_ON_FATAL_EXCEPTION


@@ -260,10 +247,10 @@ static bool wxIsUnicodeAvailable()
 {
     static const wchar_t *ERROR_STRING = L"wxWidgets Fatal Error";
 
 {
     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
     {
         // 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
         // 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
 // ----------------------------------------------------------------------------
 
 // 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),
 WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
                         HINSTANCE WXUNUSED(hPrevInstance),
                         wxCmdLineArgType WXUNUSED(pCmdLine),


@@ -379,6 +380,8 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
     // argv[] must be NULL-terminated
     argv[argc] = NULL;
 
     // argv[] must be NULL-terminated
     argv[argc] = NULL;
 

+    wxON_BLOCK_EXIT2(wxFreeArgs, argc, argv);
+

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


@@ -403,4 +406,3 @@ void wxSetInstance(HINSTANCE hInst)
 }
 
 #endif // wxUSE_BASE
 }
 
 #endif // wxUSE_BASE

-