Changeset 62851 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Aug 1, 2016 10:13:35 PM (9 years ago)

Author:

vboxsync

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

109447

Message:

GAs/common: warnings

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxService-win.cpp (modified) (2 diffs)
• VBoxServicePageSharing.cpp (modified) (5 diffs)
• VBoxServicePropCache.cpp (modified) (2 diffs)
• VBoxServiceVMInfo-win.cpp (modified) (7 diffs)
• VBoxServiceVMInfo.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp

@@ -460 +460 @@
 #endif
 {
-    DWORD rcRet = NO_ERROR;
-
 #ifdef TARGET_NT4
     VGSvcVerbose(2, "Control handler: Control=%#x\n", dwControl);
 #else
+    RT_NOREF1(lpContext);
     VGSvcVerbose(2, "Control handler: Control=%#x, EventType=%#x\n", dwControl, dwEventType);
 #endif
 
+    DWORD rcRet = NO_ERROR;
     switch (dwControl)
     {
@@ -524 +524 @@
 static void WINAPI vgsvcWinMain(DWORD argc, LPTSTR *argv)
 {
+    RT_NOREF2(argc, argv);
     VGSvcVerbose(2, "Registering service control handler ...\n");
 #ifdef TARGET_NT4

trunk/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp

@@ -56 +56 @@
 #include <iprt/string.h>
 #include <iprt/semaphore.h>
+#include <iprt/string.h>
 #include <iprt/system.h>
 #include <iprt/thread.h>
@@ -186 +187 @@
     unsigned i;
     UINT     cbFileVersion;
-    char    *lpszFileVersion;
+    char    *pszFileVersion = NULL; /* Shut up MSC */
     unsigned cTranslationBlocks = cbTranslate/sizeof(struct LANGANDCODEPAGE);
 
-    for(i = 0; i < cTranslationBlocks; i++)
+    pModule->szFileVersion[0] = '\0';
+    for (i = 0; i < cTranslationBlocks; i++)
     {
         /* Fetch file version string. */
         char   szFileVersionLocation[256];
 
+/** @todo r=bird: Mixing ANSI and TCHAR crap again.  This code is a mess.  We
+ * always use the wide version of the API and convert to UTF-8/whatever. */
+
         sprintf(szFileVersionLocation, TEXT("\\StringFileInfo\\%04x%04x\\FileVersion"), lpTranslate[i].wLanguage, lpTranslate[i].wCodePage);
-        fRet = VerQueryValue(pVersionInfo, szFileVersionLocation, (LPVOID *)&lpszFileVersion, &cbFileVersion);
+        fRet = VerQueryValue(pVersionInfo, szFileVersionLocation, (LPVOID *)&pszFileVersion, &cbFileVersion);
         if (fRet)
+        {
+            RTStrCopy(pModule->szFileVersion, sizeof(pModule->szFileVersion), pszFileVersion);
             break;
+        }
     }
     if (i == cTranslationBlocks)
@@ -204 +212 @@
         goto end;
     }
-
-    _snprintf(pModule->szFileVersion, sizeof(pModule->szFileVersion), "%s", lpszFileVersion);
-    pModule->szFileVersion[RT_ELEMENTS(pModule->szFileVersion) - 1] = 0;
 
     unsigned idxRegion = 0;
@@ -361 +366 @@
                 VGSvcVerbose(3, "\n     executable     = %s",             ModuleInfo.szExePath );
                 VGSvcVerbose(3, "\n     process ID     = 0x%08X",         ModuleInfo.th32ProcessID );
-                VGSvcVerbose(3, "\n     base address   = 0x%08X", (DWORD) ModuleInfo.modBaseAddr );
+                VGSvcVerbose(3, "\n     base address   = %#010p", (uintptr_t) ModuleInfo.modBaseAddr );
                 VGSvcVerbose(3, "\n     base size      = %d",             ModuleInfo.modBaseSize );
 
@@ -510 +515 @@
                     VGSvcVerbose(3, "\n\n   KERNEL  MODULE NAME:     %s",     pModule->Info.szModule );
                     VGSvcVerbose(3, "\n     executable     = %s",             pModule->Info.szExePath );
-                    VGSvcVerbose(3, "\n     base address   = 0x%08X", (DWORD) pModule->Info.modBaseAddr );
+                    VGSvcVerbose(3, "\n     base address   = %#010p", (uintptr_t)pModule->Info.modBaseAddr );
                     VGSvcVerbose(3, "\n     flags          = 0x%08X",         pSystemModules->Modules[i].Flags);
                     VGSvcVerbose(3, "\n     base size      = %d",             pModule->Info.modBaseSize );

trunk/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp

@@ -36 +36 @@
                                                                uint32_t fFlags)
 {
+    RT_NOREF1(fFlags);
     AssertPtrReturn(pCache, NULL);
     AssertPtrReturn(pszName, NULL);
@@ -317 +318 @@
                                const char *pszPathFormat, ...)
 {
+    RT_NOREF1(fFlags);
     AssertPtrReturn(pCache, VERR_INVALID_POINTER);
     AssertPtrReturn(pszPathFormat, VERR_INVALID_POINTER);

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp

@@ -141 +141 @@
 static DECLCALLBACK(int) vgsvcWinVmInfoInitOnce(void *pvIgnored)
 {
+    RT_NOREF1(pvIgnored);
+
     /* SECUR32 */
     RTLDRMOD hLdrMod;
@@ -349 +351 @@
                 VGSvcError("Token class not implemented: %d\n", tkClass);
                 rc = VERR_NOT_IMPLEMENTED;
+                dwTokenInfoSize = 0; /* Shut up MSC. */
                 break;
         }
@@ -631 +634 @@
  *                              Optional.
  */
+/** @todo r=bird: The 'Has' indicates a predicate function, which this is
+ *        not.  Predicate functions always returns bool. */
 static uint32_t vgsvcVMInfoWinSessionHasProcesses(PLUID pSession, PVBOXSERVICEVMINFOPROC const paProcs, DWORD cProcs,
                                                   PULONG puTerminalSession)
@@ -640 +645 @@
     }
     if (!g_pfnLsaGetLogonSessionData)
-        return VERR_NOT_SUPPORTED;
+        return 0;
 
     PSECURITY_LOGON_SESSION_DATA pSessionData = NULL;
@@ -798 +803 @@
      */
     bool fFoundUser = false;
-    DWORD dwErr = NO_ERROR;
     if (   IsValidSid(pSessionData->Sid)
         && (   (SECURITY_LOGON_TYPE)pSessionData->LogonType == Interactive
@@ -973 +977 @@
             rc = RTLocalIpcSessionWrite(hSession, &ipcHdr, sizeof(ipcHdr));
 
-            VBOXTRAYIPCRES_USERLASTINPUT ipcRes;
             if (RT_SUCCESS(rc))
+            {
+                VBOXTRAYIPCRES_USERLASTINPUT ipcRes;
                 rc = RTLocalIpcSessionRead(hSession, &ipcRes, sizeof(ipcRes), NULL /* Exact read */);
-            if (   RT_SUCCESS(rc)
-                /* If uLastInput is set to UINT32_MAX VBoxTray was not able to retrieve the
-                 * user's last input time. This might happen when running on Windows NT4 or older. */
-                && ipcRes.uLastInput != UINT32_MAX)
-            {
-                userState = (ipcRes.uLastInput * 1000) < g_uVMInfoUserIdleThresholdMS
-                          ? VBoxGuestUserState_InUse
-                          : VBoxGuestUserState_Idle;
-
-                rc = VGSvcUserUpdateF(pCache, pszUser, pszDomain, "UsageState",
-                                      userState == VBoxGuestUserState_InUse ? "InUse" : "Idle");
-
-                /*
-                 * Note: vboxServiceUserUpdateF can return VINF_NO_CHANGE in case there wasn't anything
-                 *       to update. So only report the user's status to host when we really got something
-                 *       new.
-                 */
-                fReportToHost = rc == VINF_SUCCESS;
-                VGSvcVerbose(4, "User '%s' (domain '%s') is idle for %RU32, fReportToHost=%RTbool\n",
-                             pszUser, pszDomain ? pszDomain : "<None>", ipcRes.uLastInput, fReportToHost);
+                if (   RT_SUCCESS(rc)
+                    /* If uLastInput is set to UINT32_MAX VBoxTray was not able to retrieve the
+                     * user's last input time. This might happen when running on Windows NT4 or older. */
+                    && ipcRes.uLastInput != UINT32_MAX)
+                {
+                    userState = (ipcRes.uLastInput * 1000) < g_uVMInfoUserIdleThresholdMS
+                              ? VBoxGuestUserState_InUse
+                              : VBoxGuestUserState_Idle;
+
+                    rc = VGSvcUserUpdateF(pCache, pszUser, pszDomain, "UsageState",
+                                          userState == VBoxGuestUserState_InUse ? "InUse" : "Idle");
+
+                    /*
+                     * Note: vboxServiceUserUpdateF can return VINF_NO_CHANGE in case there wasn't anything
+                     *       to update. So only report the user's status to host when we really got something
+                     *       new.
+                     */
+                    fReportToHost = rc == VINF_SUCCESS;
+                    VGSvcVerbose(4, "User '%s' (domain '%s') is idle for %RU32, fReportToHost=%RTbool\n",
+                                 pszUser, pszDomain ? pszDomain : "<None>", ipcRes.uLastInput, fReportToHost);
 
 #if 0 /* Do we want to write the idle time as well? */
-                    /* Also write the user's current idle time, if there is any. */
-                    if (userState == VBoxGuestUserState_Idle)
-                        rc = vgsvcUserUpdateF(pCache, pszUser, pszDomain, "IdleTimeMs", "%RU32", ipcRes.uLastInputMs);
-                    else
-                        rc = vgsvcUserUpdateF(pCache, pszUser, pszDomain, "IdleTimeMs", NULL /* Delete property */);
-
-                    if (RT_SUCCESS(rc))
+                        /* Also write the user's current idle time, if there is any. */
+                        if (userState == VBoxGuestUserState_Idle)
+                            rc = vgsvcUserUpdateF(pCache, pszUser, pszDomain, "IdleTimeMs", "%RU32", ipcRes.uLastInputMs);
+                        else
+                            rc = vgsvcUserUpdateF(pCache, pszUser, pszDomain, "IdleTimeMs", NULL /* Delete property */);
+
+                        if (RT_SUCCESS(rc))
+#endif
+                }
+#ifdef DEBUG
+                else if (RT_SUCCESS(rc) && ipcRes.uLastInput == UINT32_MAX)
+                    VGSvcVerbose(4, "Last input for user '%s' is not supported, skipping\n", pszUser, rc);
 #endif
             }
 #ifdef DEBUG
-            else if (ipcRes.uLastInput == UINT32_MAX)
-                VGSvcVerbose(4, "Last input for user '%s' is not supported, skipping\n", pszUser, rc);
-
             VGSvcVerbose(4, "Getting last input for user '%s' ended with rc=%Rrc\n", pszUser, rc);
 #endif
@@ -1156 +1163 @@
                     /* Retrieve assigned processes of current session. */
                     uint32_t cCurSessionProcs = vgsvcVMInfoWinSessionHasProcesses(&paSessions[i], paProcs, cProcs,
-                                                                                        NULL /* Terminal session ID */);
+                                                                                  NULL /* Terminal session ID */);
                     /* Don't return here when current session does not have assigned processes
                      * anymore -- in that case we have to search through the unique users list below

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

@@ -936 +936 @@
 static int vgsvcVMInfoWriteNetwork(void)
 {
-    int         rc = VINF_SUCCESS;
     uint32_t    cIfsReported = 0;
     char        szPropPath[256];
@@ -1094 +1093 @@
 
     /* Get all available interfaces */
-    rc = getifaddrs(&pIfHead);
+    int rc = getifaddrs(&pIfHead);
     if (rc < 0)
     {
@@ -1163 +1162 @@
 
 #else /* !RT_OS_WINDOWS && !RT_OS_FREEBSD */
+    int rc;
     /*
      * Use SIOCGIFCONF to get a list of interface/protocol configurations.
@@ -1172 +1172 @@
     if (sd < 0)
     {
-        rc = RTErrConvertFromErrno(errno);
+        int rc = RTErrConvertFromErrno(errno);
         VGSvcError("VMInfo/Network: Failed to get a socket: Error %Rrc\n", rc);
         return rc;
@@ -1182 +1182 @@
     char           *pchBuf;
     struct ifconf   IfConf;
-    rc = VINF_SUCCESS;
+    int rc = VINF_SUCCESS;
     for (;;)
     {