Changeset 18510 in vbox for trunk/src/VBox/NetworkServices/DHCP

Timestamp:

Mar 29, 2009 3:07:18 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

45360

Message:

VBoxNetDHCP: Attempt at simplifying WinMain a bit...

File:

• trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp (modified) (3 diffs)

trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp

@@ -49 +49 @@
 #include <vector>
 #include <string>
+
+#ifdef RT_OS_WINDOWS /* WinMain */
+# include <Windows.h>
+# include <stdlib.h>
+#endif
 
 
@@ -2037 +2042 @@
 
 
-
 #ifndef VBOX_WITH_HARDENING
 
@@ -2053 +2057 @@
 
 # ifdef RT_OS_WINDOWS
-
-#include <windows.h>
-#include <iprt/mem.h>
-
-int WINAPI WinMain(          HINSTANCE hInstance,
-    HINSTANCE hPrevInstance,
-    LPSTR lpCmdLine,
-    int nCmdShow
-)
-{
-    int rc = RTR3InitAndSUPLib();
-    if (RT_FAILURE(rc))
-    {
-        RTStrmPrintf(g_pStdErr, "VBoxNetDHCP: RTR3InitAndSupLib failed, rc=%Rrc\n", rc);
-        return 1;
-    }
-
-/** @todo r=bird: crt0.c is already doing all this stuff for us. It's available thru stdlib.h __argv and __argc IIRC. */
-
-    LPWSTR lpwCmd = GetCommandLineW();
-    size_t size = wcslen(lpwCmd);
-    size++; /* for null terminator */
-
-    int argc;
-    int ret = 1;
-
-    LPWSTR * pwArgs = CommandLineToArgvW(lpwCmd,&argc);
-    if(pwArgs)
-    {
-        size+=argc-1; /* null terminators */
-        char **argv = (char**)RTMemTmpAlloc(size + argc*sizeof(char*));
-        if(argv)
-        {
-            char *pBuf = (char*)(argv+argc);
-            int i;
-            for(i = 0; i < argc; i++)
-            {
-                argv[i] = pBuf;
-
-                int num = WideCharToMultiByte(
-                        CP_ACP, /*UINT CodePage*/
-                        0, /*DWORD dwFlags*/
-                        pwArgs[i],
-                        -1, /*int cchWideChar */
-                        argv[i], /*LPSTR lpMultiByteStr*/
-                        size, /*int cbMultiByte*/
-                        NULL, /*LPCSTR lpDefaultChar*/
-                        FALSE/*LPBOOL lpUsedDefaultChar*/
-                    );
-                if(num <= 0)
-                    break;
-
-                size-=num;
-                pBuf+=num;
-            }
-
-            if(i == argc)
-            {
-                ret = TrustedMain(argc, argv, NULL);
-            }
-            RTMemFree(argv);
-        }
-
-        LocalFree(pwArgs);
-    }
-
-    return ret;
-}
-
-# endif
+/** (We don't want a console usually.) */
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
+{
+    NOREF(hInstance); NOREF(hPrevInstance); NOREF(lpCmdLine); NOREF(nCmdShow);
+    return main(__argc, __argv, environ);
+}
+# endif /* RT_OS_WINDOWS */
 
 #endif /* !VBOX_WITH_HARDENING */