X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b39dbf34b887a73c525da903d8599f4f6b7eb8f9..3bf5a59b5e058bebffcf9d87f03550b4ecf93e73:/src/msw/main.cpp?ds=sidebyside

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index f09bc43588..9f96ac237c 100644
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        msw/main.cpp
-// Purpose:     Main/DllMain
+// Purpose:     WinMain/DllMain
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation
 #endif
 
@@ -30,112 +30,152 @@
 
 #include "wx/event.h"
 #include "wx/app.h"
+#include "wx/cmdline.h"
 
 #include "wx/msw/private.h"
 
-// Don't implement WinMain if we're building an MFC/wxWindows
-// hybrid app.
+// Don't implement WinMain if we're building an MFC/wxWindows hybrid app.
 #if wxUSE_MFC && !defined(NOMAIN)
-#define NOMAIN 1
+    #define NOMAIN 1
 #endif
 
-// from src/msw/app.cpp
-extern void WXDLLEXPORT wxEntryCleanup();
+#ifdef __BORLANDC__
+    // BC++ has to be special: its run-time expects the DLL entry point to be
+    // named DllEntryPoint instead of the (more) standard DllMain
+    #define DllMain DllEntryPoint
+#endif
+
+#if defined(__WXMICROWIN__)
+    #define HINSTANCE HANDLE
+#endif
+
+#if wxUSE_GUI
 
 // ----------------------------------------------------------------------------
-// globals
+// function prototypes
 // ----------------------------------------------------------------------------
 
-HINSTANCE wxhInstance = 0;
+static wxChar **ConvertToStandardCommandArgs(const wxChar *p, int& argc);
 
 // ============================================================================
-// implementation
+// implementation: various entry points
 // ============================================================================
 
 // ----------------------------------------------------------------------------
-// various entry points
+// Windows-specific wxEntry
 // ----------------------------------------------------------------------------
 
-// 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 wxUSE_GUI && !defined(NOMAIN)
-
-// NT defines APIENTRY, 3.x not
-#if !defined(APIENTRY)
-    #define APIENTRY FAR PASCAL
-#endif
-
-/////////////////////////////////////////////////////////////////////////////////
-// WinMain
-// Note that WinMain is also defined in dummy.obj, which is linked to
-// an application that is using the DLL version of wxWindows.
+WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
+                        HINSTANCE WXUNUSED(hPrevInstance),
+                        char *pCmdLine,
+                        int nCmdShow)
+{
+    // remember the parameters Windows gave us
+    wxSetInstance(hInstance);
+    wxApp::m_nCmdShow = nCmdShow;
 
-#if !defined(_WINDLL)
+    // parse the command line
+    int argc;
+    wxChar **argv = ConvertToStandardCommandArgs(wxConvertMB2WX(pCmdLine), argc);
 
-#if defined(__WXMICROWIN__)
-    #define HINSTANCE HANDLE
+    return wxEntry(argc, argv);
+}
 
-    extern "C"
-#endif
+// 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)
 
-int PASCAL WinMain(HINSTANCE hInstance,
-                   HINSTANCE hPrevInstance,
-                   LPSTR lpCmdLine,
-                   int nCmdShow)
+extern "C"
 {
-    return wxEntry((WXHINSTANCE) hInstance, (WXHINSTANCE) hPrevInstance,
-                   lpCmdLine, nCmdShow);
-}
 
-#endif // !defined(_WINDLL)
+// ----------------------------------------------------------------------------
+// WinMain
+// ----------------------------------------------------------------------------
 
-/////////////////////////////////////////////////////////////////////////////////
-// DllMain
+// Note that WinMain is also defined in dummy.obj, which is linked to
+// an application that is using the DLL version of wxWindows.
 
 #if defined(_WINDLL)
 
 // DLL entry point
 
-extern "C"
-#ifdef __BORLANDC__
-// SCD: I don't know why, but also OWL uses this function
-BOOL WINAPI DllEntryPoint (HANDLE hModule, DWORD fdwReason, LPVOID lpReserved)
-#else
-BOOL WINAPI DllMain (HANDLE hModule, DWORD fdwReason, LPVOID lpReserved)
-#endif
+BOOL WINAPI
+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
+    // initialisation will be called when the application implicitly
+    // calls WinMain.
 #ifndef WXMAKINGDLL
     switch (fdwReason)
     {
         case DLL_PROCESS_ATTACH:
-            // Only call wxEntry if the application itself is part of the DLL.
-            // If only the wxWindows library is in the DLL, then the
-            // initialisation will be called when the application implicitly
-            // calls WinMain.
-            return wxEntry((WXHINSTANCE) hModule);
+            return wxEntry(hModule);
 
         case DLL_PROCESS_DETACH:
-           if ( wxTheApp )
-              wxTheApp->OnExit();
-           wxEntryCleanup();
-           break;
+            wxEntryCleanup();
+            break;
     }
 #else
 	(void)hModule;
 	(void)fdwReason;
 #endif // !WXMAKINGDLL
-	(void)lpReserved;
+
     return TRUE;
 }
 
 #endif // _WINDLL
 
+} // 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
+
 // ----------------------------------------------------------------------------
-// global functions
+// global HINSTANCE
 // ----------------------------------------------------------------------------
 
+#if wxUSE_BASE
+
+HINSTANCE wxhInstance = 0;
+
 HINSTANCE wxGetInstance()
 {
     return wxhInstance;
@@ -146,3 +186,5 @@ void wxSetInstance(HINSTANCE hInst)
     wxhInstance = hInst;
 }
 
+#endif // wxUSE_BASE
+