Changeset 24866 in vbox for trunk

Timestamp:

Nov 23, 2009 12:49:24 PM (15 years ago)

Author:

vboxsync

Message:

VBoxService: Made file version lookup on Windows more quiet on default.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp (modified) (7 diffs)

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

@@ -76 +76 @@
 
 #ifdef RT_OS_WINDOWS
+/** @todo return an iprt status code instead of BOOL */
 BOOL VBoxServiceGetFileString(const char* pszFileName,
                               char* pszBlock,
@@ -100 +101 @@
     if (!dwLen)
     {
-        VBoxServiceError("No file information found! File = %s, Error: %ld\n", pszFileName, GetLastError());
+        /* Don't print this to release log -- this confuses people if a file
+         * isn't present because it's optional / was not installed intentionally. */
+        VBoxServiceVerbose(3, "No file information found! File = %s, Error: %Rrc\n",
+            pszFileName, RTErrConvertFromWin32(GetLastError()));
         return FALSE;
     }
@@ -107 +111 @@
     if (!lpData)
     {
-        VBoxServiceError("Could not allocate temp buffer!\n");
+        VBoxServiceError("Could not allocate temp buffer for file string lookup!\n");
         return FALSE;
     }
@@ -123 +127 @@
             memcpy(pszString, lpValue, uiSize);
         }
-        else VBoxServiceError("Could not query value!\n");
-    }
-    else VBoxServiceError("Could not get file version info!\n");
+        else VBoxServiceVerbose(3, "No file string value for \"%s\" in file \"%s\" available!\n", pszBlock, pszFileName);
+    }
+    else VBoxServiceVerbose(3, "No file version table for file \"%s\" available!\n", pszFileName);
 
     RTMemFree(lpData);
@@ -132 +136 @@
 
 
+/** @todo return an iprt status code instead of BOOL */
 BOOL VBoxServiceGetFileVersion(const char* pszFileName,
                                DWORD* pdwMajor,
@@ -171 +176 @@
         if (!lpData)
         {
-            VBoxServiceError("Could not allocate temp buffer!\n");
+            VBoxServiceError("Could not allocate temp buffer for file version string!\n");
             return FALSE;
         }
@@ -183 +188 @@
                 *pdwBuildNumber = HIWORD(pFileInfo->dwFileVersionLS);
                 *pdwRevisionNumber = LOWORD(pFileInfo->dwFileVersionLS);
+                bRet = TRUE;
             }
-            else VBoxServiceError("Could not query file information value!\n");
+            else VBoxServiceVerbose(3, "No file version value for file \"%s\" available!\n", pszFileName);
         }
-        else VBoxServiceError("Could not get file version info!\n");
+        else VBoxServiceVerbose(3, "No file version struct for file \"%s\" available!\n", pszFileName);
 
         RTMemFree(lpData);