X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3b466481eac25cbef1d35aaf6ee9d94167a07b9..a647d42abcf7461dbd3abb88df3262e4bb495f73:/src/msw/main.cpp

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 044388d1af..6ad79060fc 100644
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -1,91 +1,201 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        main.cpp
-// Purpose:     Main/DllMain
+// Name:        msw/main.cpp
+// Purpose:     WinMain/DllMain
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
 #ifdef __GNUG__
-#pragma implementation
+    #pragma implementation
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#include "wx/event.h"
 #include "wx/app.h"
-#include <windows.h>
+#include "wx/cmdline.h"
 
-// May wish not to have a DllMain or WinMain, e.g. if we're programming
-// a Netscape plugin.
-#ifndef NOMAIN
+#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
+#endif
+
+#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
 
-// NT defines APIENTRY, 3.x not
-#if !defined(APIENTRY)
-#define APIENTRY FAR PASCAL
+#if defined(__WXMICROWIN__)
+    #define HINSTANCE HANDLE
 #endif
 
-/////////////////////////////////////////////////////////////////////////////////
+#if wxUSE_GUI
+
+// ----------------------------------------------------------------------------
+// function prototypes
+// ----------------------------------------------------------------------------
+
+// from src/msw/app.cpp
+extern void WXDLLEXPORT wxEntryCleanup();
+
+static wxChar **ConvertToStandardCommandArgs(const wxChar *p, int& argc);
+
+// ============================================================================
+// implementation: various entry points
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// Windows-specific wxEntry
+// ----------------------------------------------------------------------------
+
+WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
+                        HINSTANCE WXUNUSED(hPrevInstance),
+                        char *pCmdLine,
+                        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);
+
+    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 wxWindows.
 
 #if !defined(_WINDLL)
 
-#ifdef __WATCOMC__
-int PASCAL
-#else
-int APIENTRY
-#endif
-
- WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR m_lpCmdLine, int nCmdShow )
+int PASCAL WinMain(HINSTANCE hInstance,
+                   HINSTANCE hPrevInstance,
+                   LPSTR lpCmdLine,
+                   int nCmdShow)
 {
-  return wxEntry((WXHINSTANCE) hInstance, (WXHINSTANCE) hPrevInstance, m_lpCmdLine, nCmdShow);
+    return wxEntry(hInstance, hPrevInstance, lpCmdLine, nCmdShow);
 }
-#endif
-
-/////////////////////////////////////////////////////////////////////////////////
-// DllMain
 
-#if defined(_WINDLL)
+#else // _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.
-
-#if !defined(WXMAKINGDLL)
-        return wxEntry((WXHINSTANCE) hModule);
-#endif
-	    break;
+    {
+        case DLL_PROCESS_ATTACH:
+            return wxEntry(hModule);
+
+        case DLL_PROCESS_DETACH:
+            wxEntryCleanup();
+            break;
+    }
+#else
+	(void)hModule;
+	(void)fdwReason;
+#endif // !WXMAKINGDLL
 
-	case DLL_PROCESS_DETACH:
-	default:
-	    break;
-	}
-  return TRUE;
+    return TRUE;
 }
 
-#endif
+#endif // _WINDLL/!_WINDLL
 
-#endif
+} // 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];
+
+    argv[0] = new wxChar[MAX_PATH];
+    ::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 HINSTANCE
+// ----------------------------------------------------------------------------
+
+#if wxUSE_BASE
+
+HINSTANCE wxhInstance = 0;
+
+HINSTANCE wxGetInstance()
+{
+    return wxhInstance;
+}
+
+void wxSetInstance(HINSTANCE hInst)
+{
+    wxhInstance = hInst;
+}
+
+#endif // wxUSE_BASE