Fixed some warnings

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

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index c86c0909eb4faffce814882a47d9e5b69faa4cf7..06cc6a47712ec8274de62550eb5d0e55f7b9c722 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,9 +24,14 @@
     #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"
+    #include "wx/utils.h"
+#endif //WX_PRECOMP
+

 #include "wx/cmdline.h"
 #include "wx/cmdline.h"

+#include "wx/dynlib.h"

 #include "wx/scopeguard.h"
 
 #include "wx/msw/private.h"
 #include "wx/scopeguard.h"
 
 #include "wx/msw/private.h"


@@ -57,6 +62,7 @@
 
 // defined in common/init.cpp
 extern int wxEntryReal(int& argc, wxChar **argv);
 
 // defined in common/init.cpp
 extern int wxEntryReal(int& argc, wxChar **argv);

+extern int wxEntryCleanupReal(int& argc, wxChar **argv);

 
 // ============================================================================
 // implementation: various entry points
 
 // ============================================================================
 // implementation: various entry points


@@ -64,28 +70,6 @@ extern int wxEntryReal(int& argc, wxChar **argv);
 
 #if wxUSE_BASE
 
 
 #if wxUSE_BASE
 

-#if wxUSE_ON_FATAL_EXCEPTION && defined(__VISUALC__) && !defined(__WXWINCE__)
-    // 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
-
-    // note that the SE translator must be called wxSETranslator!
-    #define DisableAutomaticSETranslator() _set_se_translator(wxSETranslator)
-#else // !__VISUALC__
-    #define DisableAutomaticSETranslator()
-#endif // __VISUALC__/!__VISUALC__
-

 // ----------------------------------------------------------------------------
 // wrapper wxEntry catching all Win32 exceptions occurring in a wx program
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wrapper wxEntry catching all Win32 exceptions occurring in a wx program
 // ----------------------------------------------------------------------------


@@ -137,7 +121,7 @@ void wxSETranslator(unsigned int WXUNUSED(code), EXCEPTION_POINTERS *ep)
     switch ( wxGlobalSEHandler(ep) )
     {
         default:
     switch ( wxGlobalSEHandler(ep) )
     {
         default:

-            wxFAIL_MSG( _T("unexpected wxGlobalSEHandler() return value") );
+            wxFAIL_MSG( wxT("unexpected wxGlobalSEHandler() return value") );

             // fall through
 
         case EXCEPTION_EXECUTE_HANDLER:
             // fall through
 
         case EXCEPTION_EXECUTE_HANDLER:


@@ -171,19 +155,19 @@ bool wxHandleFatalExceptions(bool doit)
         wxChar fullname[MAX_PATH];
         if ( !::GetTempPath(WXSIZEOF(fullname), fullname) )
         {
         wxChar fullname[MAX_PATH];
         if ( !::GetTempPath(WXSIZEOF(fullname), fullname) )
         {

-            wxLogLastError(_T("GetTempPath"));
+            wxLogLastError(wxT("GetTempPath"));

 
             // when all else fails...
 
             // when all else fails...

-            wxStrcpy(fullname, _T("c:\\"));
+            wxStrcpy(fullname, wxT("c:\\"));

         }
 
         // use PID and date to make the report file name more unique
         wxString name = wxString::Format
                         (
         }
 
         // 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(),
+                            wxT("%s_%s_%lu.dmp"),
+                            wxTheApp ? (const wxChar*)wxTheApp->GetAppDisplayName().c_str()
+                                     : wxT("wxwindows"),
+                            wxDateTime::Now().Format(wxT("%Y%m%dT%H%M%S")).c_str(),

                             ::GetCurrentProcessId()
                         );
 
                             ::GetCurrentProcessId()
                         );
 


@@ -209,21 +193,8 @@ int wxEntry(int& argc, wxChar **argv)
 
 #else // !wxUSE_ON_FATAL_EXCEPTION
 
 
 #else // !wxUSE_ON_FATAL_EXCEPTION
 

-#if defined(__VISUALC__) && !defined(__WXWINCE__)
-
-static void
-wxSETranslator(unsigned int WXUNUSED(code), EXCEPTION_POINTERS * WXUNUSED(ep))
-{
-    // see wxSETranslator() version for wxUSE_ON_FATAL_EXCEPTION above
-    throw;
-}
-
-#endif // __VISUALC__
-

 int wxEntry(int& argc, wxChar **argv)
 {
 int wxEntry(int& argc, wxChar **argv)
 {

-    DisableAutomaticSETranslator();
-

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


@@ -231,7 +202,10 @@ int wxEntry(int& argc, wxChar **argv)
 
 #endif // wxUSE_BASE
 
 
 #endif // wxUSE_BASE
 

-#if wxUSE_GUI && defined(__WXMSW__)
+#if wxUSE_GUI
+
+namespace
+{

 
 #if wxUSE_UNICODE && !defined(__WXWINCE__)
     #define NEED_UNICODE_CHECK
 
 #if wxUSE_UNICODE && !defined(__WXWINCE__)
     #define NEED_UNICODE_CHECK


@@ -240,14 +214,14 @@ int wxEntry(int& argc, wxChar **argv)
 #ifdef NEED_UNICODE_CHECK
 
 // check whether Unicode is available
 #ifdef NEED_UNICODE_CHECK
 
 // check whether Unicode is available

-static bool wxIsUnicodeAvailable()
+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


@@ -311,41 +285,82 @@ static bool wxIsUnicodeAvailable()
 
 #endif // NEED_UNICODE_CHECK
 
 
 #endif // NEED_UNICODE_CHECK
 

+void wxSetProcessDPIAware()
+{
+#if wxUSE_DYNLIB_CLASS
+    typedef BOOL (WINAPI *SetProcessDPIAware_t)(void);
+    wxDynamicLibrary dllUser32(wxT("user32.dll"));
+    SetProcessDPIAware_t pfnSetProcessDPIAware =
+        (SetProcessDPIAware_t)dllUser32.RawGetSymbol(wxT("SetProcessDPIAware"));
+
+    if ( pfnSetProcessDPIAware )
+        pfnSetProcessDPIAware();
+#endif // wxUSE_DYNLIB_CLASS
+}
+
+} //anonymous namespace
+

 // ----------------------------------------------------------------------------
 // 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)
+struct wxMSWCommandLineArguments

 {
 {

-    for ( int i = 0; i < argc; i++ )
+    wxMSWCommandLineArguments() { argc = 0; argv = NULL; }
+
+    void Init(const wxArrayString& args)

     {
     {

-        free(argv[i]);
+        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].t_str());
+        }
+
+        // argv[] must be NULL-terminated
+        argv[argc] = NULL;

     }
 
     }
 

-    delete [] argv;
-}
+    void Free()
+    {
+        if ( !argc )
+            return;

 
 

-WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
-                        HINSTANCE WXUNUSED(hPrevInstance),
-                        wxCmdLineArgType WXUNUSED(pCmdLine),
-                        int nCmdShow)
+        for ( int i = 0; i < argc; i++ )
+        {
+            free(argv[i]);
+        }
+
+        wxDELETEA(argv);
+        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() )
 {
     // 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
 
 
     // remember the parameters Windows gave us
     wxSetInstance(hInstance);
 #endif // NEED_UNICODE_CHECK
 
 
     // remember the parameters Windows gave us
     wxSetInstance(hInstance);

+#ifdef __WXMSW__

     wxApp::m_nCmdShow = nCmdShow;
     wxApp::m_nCmdShow = nCmdShow;

+#endif

 
     // 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
 
     // 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


@@ -365,24 +380,43 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
     args.Insert(wxGetFullModuleName(), 0);
 #endif
 
     args.Insert(wxGetFullModuleName(), 0);
 #endif
 

-    int argc = args.GetCount();
+    wxArgs.Init(args);

 
 

-    // +1 here for the terminating NULL
-    wxChar **argv = new wxChar *[argc + 1];
-    for ( int i = 0; i < argc; i++ )
-    {
-        argv[i] = wxStrdup(args[i]);
-    }
+    return true;
+}

 
 

-    // argv[] must be NULL-terminated
-    argv[argc] = NULL;
+WXDLLEXPORT bool wxEntryStart(HINSTANCE hInstance,
+                              HINSTANCE WXUNUSED(hPrevInstance),
+                              wxCmdLineArgType WXUNUSED(pCmdLine),
+                              int nCmdShow)
+{
+    if ( !wxMSWEntryCommon(hInstance, nCmdShow) )
+       return false;

 
 

-    wxON_BLOCK_EXIT2(wxFreeArgs, argc, argv);
+    return wxEntryStart(wxArgs.argc, wxArgs.argv);
+}

 
 

-    return wxEntry(argc, argv);
+WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
+                        HINSTANCE WXUNUSED(hPrevInstance),
+                        wxCmdLineArgType WXUNUSED(pCmdLine),
+                        int nCmdShow)
+{
+    // wxWidgets library doesn't have problems with non-default DPI settings,
+    // so we can mark the app as "DPI aware" for Vista/Win7 (see
+    // http://msdn.microsoft.com/en-us/library/dd464659%28VS.85%29.aspx).
+    // Note that we intentionally do it here and not in wxApp, so that it
+    // doesn't happen if wx code is hosted in another app (e.g. a plugin).
+    wxSetProcessDPIAware();
+
+    if ( !wxMSWEntryCommon(hInstance, nCmdShow) )
+        return -1;
+
+    wxON_BLOCK_EXIT_OBJ0(wxArgs, wxMSWCommandLineArguments::Free);
+
+    return wxEntry(wxArgs.argc, wxArgs.argv);

 }
 
 }
 

-#endif // wxUSE_GUI && __WXMSW__
+#endif // wxUSE_GUI

 
 // ----------------------------------------------------------------------------
 // global HINSTANCE
 
 // ----------------------------------------------------------------------------
 // global HINSTANCE


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

-