Changeset 37019 in vbox for trunk/src/VBox/Additions

Timestamp:

May 10, 2011 8:20:35 AM (14 years ago)

Author:

vboxsync

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

71634

Message:

Guest Additions: Also report extended version information to the host to "/VirtualBox/GuestAdd/VersionEx".

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxGuestLib/VBoxGuestR3LibAdditions.cpp (modified) (6 diffs)
• VBoxGuestLib/VBoxGuestR3LibHostVersion.cpp (modified) (1 diff)
• VBoxService/VBoxServiceVMInfo.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp

@@ -39 +39 @@
  * Fallback for vbglR3GetAdditionsVersion.
  */
-static int vbglR3GetAdditionsCompileTimeVersion(char **ppszVer, char **ppszRev)
-{
+static int vbglR3GetAdditionsCompileTimeVersion(char **ppszVer, char **ppszVerEx, char **ppszRev)
+{
+    /* Raw version string: major.minor.build. */
     if (ppszVer)
     {
         *ppszVer = RTStrDup(VBOX_VERSION_STRING_RAW);
         if (!*ppszVer)
+            return VERR_NO_STR_MEMORY;
+    }
+
+    /* Extended version string: major.minor.build (+ vendor [suffix(es)]). */
+    if (ppszVerEx)
+    {
+        *ppszVerEx = RTStrDup(VBOX_VERSION_STRING);
+        if (!*ppszVerEx)
             return VERR_NO_STR_MEMORY;
     }
@@ -169 +178 @@
  *
  * @returns IPRT status value
- * @param   ppszVer     Receives pointer of allocated version string. NULL is
+ * @param   ppszVer     Receives pointer of allocated raw version string
+ *                      (major.minor.build). NULL is accepted. The returned
+ *                      pointer must be freed using RTStrFree().*
+ * @param   ppszVerEx   Receives pointer of allocated full version string
+ *                      (raw version + vendor suffix(es)). NULL is
  *                      accepted. The returned pointer must be freed using
  *                      RTStrFree().
@@ -176 +189 @@
  *                      RTStrFree().
  */
-VBGLR3DECL(int) VbglR3GetAdditionsVersion(char **ppszVer, char **ppszRev)
+VBGLR3DECL(int) VbglR3GetAdditionsVersion(char **ppszVer, char **ppszVerEx, char **ppszRev)
 {
 #ifdef RT_OS_WINDOWS
@@ -210 +223 @@
                 rc = VERR_NO_MEMORY;
         }
+        if (ppszVerEx)
+        {
+            dwSize = 32; /* Reset */
+            pszTmp = (char*)RTMemAlloc(dwSize);
+            if (pszTmp)
+            {
+                l = RegQueryValueEx(hKey, "VersionEx", NULL, &dwType, (BYTE*)(LPCTSTR)pszTmp, &dwSize);
+                if (l == ERROR_SUCCESS)
+                {
+                    if (dwType == REG_SZ)
+                        rc = RTStrDupEx(ppszVerEx, pszTmp);
+                    else
+                        rc = VERR_INVALID_PARAMETER;
+                }
+                else
+                {
+                    rc = RTErrConvertFromWin32(l);
+                }
+                RTMemFree(pszTmp);
+            }
+            else
+                rc = VERR_NO_MEMORY;
+        }
         /* Revision. */
         if (ppszRev)
@@ -248 +284 @@
          * into this binary.
          */
-        rc = vbglR3GetAdditionsCompileTimeVersion(ppszVer, ppszRev);
+        rc = vbglR3GetAdditionsCompileTimeVersion(ppszVer, ppszVerEx, ppszRev);
     }
     return rc;
@@ -256 +292 @@
      * On non-Windows platforms just return the compile-time version string.
      */
-    return vbglR3GetAdditionsCompileTimeVersion(ppszVer, ppszRev);
+    return vbglR3GetAdditionsCompileTimeVersion(ppszVer, ppszVerEx, ppszRev);
 #endif /* !RT_OS_WINDOWS */
 }

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibHostVersion.cpp

@@ -129 +129 @@
         if (RT_SUCCESS(rc))
         {
-            rc = VbglR3GetAdditionsVersion(ppszGuestVersion, NULL /* Revision not needed here */);
+            rc = VbglR3GetAdditionsVersion(ppszGuestVersion, NULL /* Extended version not needed here */,
+                                           NULL /* Revision not needed here */);
             if (RT_FAILURE(rc))
                 LogFlow(("Could not read VBox guest version! rc = %Rrc\n", rc));

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

@@ -190 +190 @@
      */
     char *pszAddVer;
+    char *pszAddVerEx;
     char *pszAddRev;
-    rc = VbglR3GetAdditionsVersion(&pszAddVer, &pszAddRev);
+    rc = VbglR3GetAdditionsVersion(&pszAddVer, &pszAddVerEx, &pszAddRev);
     VBoxServiceWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestAdd/Version",
                           "%s", RT_FAILURE(rc) ? "" : pszAddVer);
+    VBoxServiceWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestAdd/VersionEx",
+                          "%s", RT_FAILURE(rc) ? "" : pszAddVerEx);
     VBoxServiceWritePropF(g_uVMInfoGuestPropSvcClientID, "/VirtualBox/GuestAdd/Revision",
                           "%s", RT_FAILURE(rc) ? "" : pszAddRev);
@@ -199 +202 @@
     {
         RTStrFree(pszAddVer);
+        RTStrFree(pszAddVerEx);
         RTStrFree(pszAddRev);
     }