Changeset 63289 in vbox for trunk/src/VBox

Timestamp:

Aug 10, 2016 3:24:06 PM (8 years ago)

Author:

vboxsync

Message:

VBoxAutostart: Warnings

Location:

trunk/src/VBox/Frontends/VBoxAutostart

Files:

• VBoxAutostart-win.cpp (modified) (17 diffs)
• VBoxAutostartCfg.cpp (modified) (6 diffs)
• VBoxAutostartStop.cpp (modified) (1 diff)
• VBoxAutostartUtils.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-win.cpp

@@ -89 +89 @@
 
     BOOL fCompleted = FALSE;
-    ULONG ulCurrentPercent = 0;
-    ULONG ulLastPercent = 0;
-
-    ULONG ulLastOperationPercent = (ULONG)-1;
-
-    ULONG ulLastOperation = (ULONG)-1;
+    ULONG uCurrentPercent = 0;
     Bstr bstrOperationDescription;
 
@@ -114 +109 @@
     while (SUCCEEDED(hrc))
     {
-        progress->COMGETTER(Percent(&ulCurrentPercent));
+        progress->COMGETTER(Percent(&uCurrentPercent));
 
         if (fCompleted)
@@ -183 +178 @@
                             apsz,                    /* lpStrings */
                             NULL);                   /* lpRawData */
-    AssertMsg(fRc, ("%d\n", GetLastError()));
+    AssertMsg(fRc, ("%u\n", GetLastError())); NOREF(fRc);
     DeregisterEventSource(hEventLog);
 }
@@ -233 +228 @@
  */
 static SC_HANDLE autostartSvcWinOpenService(const char *pszAction, DWORD dwSCMAccess, DWORD dwSVCAccess,
-                                      unsigned cIgnoredErrors, ...)
+                                            unsigned cIgnoredErrors, ...)
 {
     SC_HANDLE hSCM = autostartSvcWinOpenSCManager(pszAction, dwSCMAccess);
@@ -252 +247 @@
         va_start(va, cIgnoredErrors);
         while (!fIgnored && cIgnoredErrors-- > 0)
-            fIgnored = va_arg(va, long) == err;
+            fIgnored = (DWORD)va_arg(va, int) == err;
         va_end(va);
         if (!fIgnored)
@@ -278 +273 @@
 static RTEXITCODE autostartSvcWinInterrogate(int argc, char **argv)
 {
+    RT_NOREF(argc, argv);
     RTPrintf("VBoxAutostartSvc: The \"interrogate\" action is not implemented.\n");
     return RTEXITCODE_FAILURE;
@@ -285 +281 @@
 static RTEXITCODE autostartSvcWinStop(int argc, char **argv)
 {
+    RT_NOREF(argc, argv);
     RTPrintf("VBoxAutostartSvc: The \"stop\" action is not implemented.\n");
     return RTEXITCODE_FAILURE;
@@ -292 +289 @@
 static RTEXITCODE autostartSvcWinContinue(int argc, char **argv)
 {
+    RT_NOREF(argc, argv);
     RTPrintf("VBoxAutostartSvc: The \"continue\" action is not implemented.\n");
     return RTEXITCODE_FAILURE;
@@ -299 +297 @@
 static RTEXITCODE autostartSvcWinPause(int argc, char **argv)
 {
+    RT_NOREF(argc, argv);
     RTPrintf("VBoxAutostartSvc: The \"pause\" action is not implemented.\n");
     return RTEXITCODE_FAILURE;
@@ -306 +305 @@
 static RTEXITCODE autostartSvcWinStart(int argc, char **argv)
 {
+    RT_NOREF(argc, argv);
     RTPrintf("VBoxAutostartSvc: The \"start\" action is not implemented.\n");
     return RTEXITCODE_SUCCESS;
@@ -313 +313 @@
 static RTEXITCODE autostartSvcWinQueryDescription(int argc, char **argv)
 {
+    RT_NOREF(argc, argv);
     RTPrintf("VBoxAutostartSvc: The \"qdescription\" action is not implemented.\n");
     return RTEXITCODE_FAILURE;
@@ -320 +321 @@
 static RTEXITCODE autostartSvcWinQueryConfig(int argc, char **argv)
 {
+    RT_NOREF(argc, argv);
     RTPrintf("VBoxAutostartSvc: The \"qconfig\" action is not implemented.\n");
     return RTEXITCODE_FAILURE;
@@ -327 +329 @@
 static RTEXITCODE autostartSvcWinDisable(int argc, char **argv)
 {
+    RT_NOREF(argc, argv);
     RTPrintf("VBoxAutostartSvc: The \"disable\" action is not implemented.\n");
     return RTEXITCODE_FAILURE;
@@ -333 +336 @@
 static RTEXITCODE autostartSvcWinEnable(int argc, char **argv)
 {
+    RT_NOREF(argc, argv);
     RTPrintf("VBoxAutostartSvc: The \"enable\" action is not implemented.\n");
     return RTEXITCODE_FAILURE;
@@ -623 +627 @@
     NOREF(pvEventData);
     NOREF(pvContext);
-    return NO_ERROR;
-}
-
-static int autostartWorker(RTTHREAD ThreadSelf, void *pvUser)
-{
-                        int rc = autostartSetup();
-
-                        /** @todo: Implement config options. */
-                        rc = autostartStartMain(NULL);
-                        if (RT_FAILURE(rc))
-                            autostartSvcLogError("Starting VMs failed, rc=%Rrc", rc);
+    /* not reached */
+}
+
+static DECLCALLBACK(int) autostartWorkerThread(RTTHREAD hThreadSelf, void *pvUser)
+{
+    RT_NOREF(hThreadSelf, pvUser);
+    int rc = autostartSetup();
+
+    /** @todo: Implement config options. */
+    rc = autostartStartMain(NULL);
+    if (RT_FAILURE(rc))
+        autostartSvcLogError("Starting VMs failed, rc=%Rrc", rc);
 
     return rc;
@@ -649 +654 @@
 static VOID WINAPI autostartSvcWinServiceMain(DWORD cArgs, LPTSTR *papszArgs)
 {
+    RT_NOREF(papszArgs);
     LogFlowFuncEnter();
 
@@ -677 +683 @@
                         LogFlow(("autostartSvcWinServiceMain: calling RTSemEventMultiWait\n"));
                         RTTHREAD hWorker;
-                        RTThreadCreate(&hWorker, autostartWorker, NULL, 0, RTTHREADTYPE_DEFAULT, 0, "WorkerThread");
+                        RTThreadCreate(&hWorker, autostartWorkerThread, NULL, 0, RTTHREADTYPE_DEFAULT, 0, "WorkerThread");
 
                         LogFlow(("autostartSvcWinServiceMain: woke up\n"));

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostartCfg.cpp

@@ -72 +72 @@
     unsigned        iLine;
     /** Starting character of the token in the stream. */
-    unsigned        cchStart;
+    size_t          cchStart;
     /** Type dependen token data. */
     union
@@ -107 +107 @@
     unsigned   iLine;
     /** Current character of the line. */
-    unsigned   cchCurr;
+    size_t     cchCurr;
     /** Flag whether the end of the config stream is reached. */
     bool       fEof;
@@ -410 +410 @@
             return "<Invalid>";
     }
-
-    AssertFailed();
-    return NULL;
+    /* not reached */
 }
 
@@ -452 +450 @@
             return 0;
     }
-
-    AssertFailed();
-    return 0;
+    /* not reached */
 }
 
@@ -596 +592 @@
                                             PCFGAST *ppCfgAst)
 {
-    int rc = VINF_SUCCESS;
     unsigned cAstNodesMax = 10;
-    unsigned idxAstNodeCur = 0;
-    PCFGAST pCfgAst = NULL;
-
-    pCfgAst = (PCFGAST)RTMemAllocZ(RT_OFFSETOF(CFGAST, u.Compound.apAstNodes[cAstNodesMax]));
+    PCFGAST pCfgAst = (PCFGAST)RTMemAllocZ(RT_OFFSETOF(CFGAST, u.Compound.apAstNodes[cAstNodesMax]));
     if (!pCfgAst)
         return VERR_NO_MEMORY;
@@ -614 +606 @@
     }
 
+    int rc = VINF_SUCCESS;
     do
     {

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostartStop.cpp

@@ -107 +107 @@
 DECLHIDDEN(RTEXITCODE) autostartStopMain(PCFGAST pCfgAst)
 {
+    RT_NOREF(pCfgAst);
     RTEXITCODE rcExit = RTEXITCODE_SUCCESS;
-    int vrc = VINF_SUCCESS;
     std::list<AUTOSTOPVM> listVM;
 

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostartUtils.cpp

@@ -218 +218 @@
 }
 
-DECLHIDDEN(RTEXITCODE) autostartSvcDisplayGetOptError(const char *pszAction, int rc, int argc, char **argv, int iArg, PCRTGETOPTUNION pValue)
-{
+DECLHIDDEN(RTEXITCODE) autostartSvcDisplayGetOptError(const char *pszAction, int rc, int argc, char **argv, int iArg,
+                                                      PCRTGETOPTUNION pValue)
+{
+    RT_NOREF(pValue);
     autostartSvcDisplayError("%s - RTGetOpt failure, %Rrc (%d): %s\n",
                        pszAction, rc, rc, iArg < argc ? argv[iArg] : "<null>");
@@ -227 +229 @@
 DECLHIDDEN(RTEXITCODE) autostartSvcDisplayTooManyArgsError(const char *pszAction, int argc, char **argv, int iArg)
 {
+    RT_NOREF(argc);
     Assert(iArg < argc);
     autostartSvcDisplayError("%s - Too many arguments: %s\n", pszAction, argv[iArg]);