Changeset 37670 in vbox for trunk/src/VBox

Timestamp:

Jun 28, 2011 6:17:16 PM (14 years ago)

Author:

vboxsync

Message:

Main/win/svcmain.cpp: fix command line parsing, and generally make the code change work

File:

• trunk/src/VBox/Main/src-server/win/svcmain.cpp (modified) (8 diffs)

trunk/src/VBox/Main/src-server/win/svcmain.cpp

@@ -16 +16 @@
  */
 
+#include <Windows.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "VBox/com/defs.h"
@@ -30 +32 @@
 
 #include <VBox/err.h>
+#include <iprt/buildconfig.h>
+#include <iprt/initterm.h>
+#include <iprt/string.h>
+#include <iprt/uni.h>
+#include <iprt/path.h>
 #include <iprt/getopt.h>
-#include <iprt/initterm.h>
-#include <iprt/path.h>
 
 #include <atlbase.h>
@@ -150 +155 @@
 /////////////////////////////////////////////////////////////////////////////
 //
-extern "C" int WINAPI _tWinMain(HINSTANCE hInstance,
-    HINSTANCE /*hPrevInstance*/, LPTSTR lpCmdLine, int /*nShowCmd*/)
-{
-    lpCmdLine = GetCommandLine(); /* this line necessary for _ATL_MIN_CRT */
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/, LPSTR /*lpCmdLine*/, int /*nShowCmd*/)
+{
+    LPCTSTR lpCmdLine = GetCommandLine(); /* this line necessary for _ATL_MIN_CRT */
 
     /* Need to parse the command line before initializing the VBox runtime. */
@@ -229 +233 @@
 
     RTGETOPTSTATE   GetOptState;
-    int vrc = RTGetOptInit(&GetOptState, argc, argv, &s_aOptions[0], RT_ELEMENTS(s_aOptions), 1, 0 /*fFlags*/);
+    int vrc = RTGetOptInit(&GetOptState, __argc, __argv, &s_aOptions[0], RT_ELEMENTS(s_aOptions), 1, 0 /*fFlags*/);
     AssertRC(vrc);
 
@@ -280 +284 @@
 
             case 'h':
+            {
                 TCHAR txt[]= L"Options:\n\n"
                              L"/RegServer:\tregister COM out-of-proc server\n"
@@ -288 +293 @@
                 fRun = false;
                 MessageBox(NULL, txt, title, MB_OK);
-                break;
+                return 0;
+            }
 
             case 'V':
+            {
                 char *psz = NULL;
                 RTStrAPrintf(&psz, "%sr%s\n", RTBldCfgVersion(), RTBldCfgRevisionStr());
-                TCHAR *txt;
-                RTStrToUni(psz, &txt);
+                PRTUTF16 txt = NULL;
+                RTStrToUtf16(psz, &txt);
                 TCHAR title[]=_T("Version");
                 fRun = false;
                 MessageBox(NULL, txt, title, MB_OK);
                 RTStrFree(psz);
-                RTUniFree(txt);
-                break;
+                RTUtf16Free(txt);
+                return 0;
+            }
 
             default:
                 /** @todo this assumes that stderr is visible, which is not
                  * true for standard Windows applications. */
-                return RTGetOptPrintError(vrc, &ValueUnion);
-        }
-    }
-
-    if (!pszLogFile)
-    {
-        char szLogFile[RTPATH_MAX];
-        vrc = com::GetVBoxUserHomeDirectory(szLogFile, sizeof(szLogFile));
-        if (RT_SUCCESS(vrc))
-            vrc = RTPathAppend(szLogFile, sizeof(szLogFile), "VBoxSVC.log");
-        if (RT_SUCCESS(vrc))
-            pszLogFile = RTStrDup(szLogFile);
-    }
+                /* continue on command line errors... */
+                RTGetOptPrintError(vrc, &ValueUnion);
+        }
+    }
+
     /* Only create the log file when running VBoxSVC normally, but not when
      * registering/unregistering or calling the helper functionality. */
     if (fRun)
+    {
+        if (!pszLogFile)
+        {
+            char szLogFile[RTPATH_MAX];
+            vrc = com::GetVBoxUserHomeDirectory(szLogFile, sizeof(szLogFile));
+            if (RT_SUCCESS(vrc))
+                vrc = RTPathAppend(szLogFile, sizeof(szLogFile), "VBoxSVC.log");
+            if (RT_SUCCESS(vrc))
+                pszLogFile = RTStrDup(szLogFile);
+        }
         VBoxSVCLogRelCreate(pszLogFile, cHistory, uHistoryFileTime, uHistoryFileSize);
+    }
 
     int nRet = 0;
@@ -342 +353 @@
             nRet = _Module.RegisterServer(TRUE);
         }
-        if (!pszPipeName)
+        if (pszPipeName)
         {
             Log(("SVCMAIN: Processing Helper request (cmdline=\"%s\")...\n", pszPipeName));
 
-            if (!*pipeName)
+            if (!*pszPipeName)
                 vrc = VERR_INVALID_PARAMETER;
 
@@ -353 +364 @@
                 /* do the helper job */
                 SVCHlpServer server;
-                vrc = server.open(pipeName.c_str());
+                vrc = server.open(pszPipeName);
                 if (RT_SUCCESS(vrc))
                     vrc = server.run();