Changeset 24332 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Nov 4, 2009 2:08:09 PM (15 years ago)

Author:

vboxsync

Message:

VBoxGuestR3LibHostVersion.cpp: r=bird: RTStrAPrintf does not return a IPRT status value (fixed). Added a couple of todos about bugs.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp (modified) (4 diffs)

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

@@ -177 +177 @@
 VBGLR3DECL(int) VbglR3SetGuestCaps(uint32_t fOr, uint32_t fNot)
 {
-    VMMDevReqGuestCapabilities2 vmmreqGuestCaps;
-    int rc;
-
-    vmmdevInitRequest(&vmmreqGuestCaps.header, VMMDevReq_SetGuestCapabilities);
-    vmmreqGuestCaps.u32OrMask = fOr;
-    vmmreqGuestCaps.u32NotMask = fNot;
-    rc = vbglR3GRPerform(&vmmreqGuestCaps.header);
+    VMMDevReqGuestCapabilities2 Req;
+
+    vmmdevInitRequest(&Req.header, VMMDevReq_SetGuestCapabilities);
+    Req.u32OrMask = fOr;
+    Req.u32NotMask = fNot;
+    int rc = vbglR3GRPerform(&Req.header);
 #ifdef DEBUG
     if (RT_SUCCESS(rc))
-        LogRel(("Successfully changed guest capabilities: or mask 0x%x, not mask 0x%x.\n",
-                fOr, fNot));
+        LogRel(("Successfully changed guest capabilities: or mask 0x%x, not mask 0x%x.\n", fOr, fNot));
     else
-        LogRel(("Failed to change guest capabilities: or mask 0x%x, not mask 0x%x.  rc = %Rrc.\n",
-                fOr, fNot, rc));
+        LogRel(("Failed to change guest capabilities: or mask 0x%x, not mask 0x%x.  rc=%Rrc.\n", fOr, fNot, rc));
 #endif
     return rc;
@@ -197 +194 @@
 
 /**
- * Retrieves the installed Guest Additions version/revision.
+ * Fallback for vbglR3GetAdditionsVersion.
+ */
+static int vbglR3GetAdditionsCompileTimeVersion(char **ppszVer, char **ppszRev)
+{
+    if (ppszVer)
+    {
+        *ppszVer = RTStrDup(VBOX_VERSION_STRING);
+        if (!*ppszVer)
+            return VERR_NO_STR_MEMORY;
+    }
+
+    if (ppszRev)
+    {
+        char szRev[64];
+        RTStrPrintf(szRev, sizeof(szRev), "%d", VBOX_SVN_REV);
+        *ppszRev = RTStrDup(szRev);
+        if (!*ppszRev)
+        {
+            if (ppszVer)
+            {
+                RTStrFree(*ppszVer);
+                *ppszVer = NULL;
+            }
+            return VERR_NO_STR_MEMORY;
+        }
+    }
+
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Retrieves the installed Guest Additions version and/or revision.
  *
  * @returns IPRT status value
- * @param   ppszVer    Receives pointer of allocated version string. NULL is accepted.
- *                     The returned pointer must be freed using RTStrFree().
- * @param   ppszRev    Receives pointer of allocated revision string. NULL is accepted.
- *                     The returned pointer must be freed using RTStrFree().
+ * @param   ppszVer     Receives pointer of allocated version string. NULL is
+ *                      accepted. The returned pointer must be freed using
+ *                      RTStrFree().
+ * @param   ppszRev     Receives pointer of allocated revision string. NULL is
+ *                      accepted. The returned pointer must be freed using
+ *                      RTStrFree().
  */
 VBGLR3DECL(int) VbglR3GetAdditionsVersion(char **ppszVer, char **ppszRev)
 {
+#ifdef RT_OS_WINDOWS
+    /*
+     * Try get the *installed* version first.
+     */
     int rc = VINF_SUCCESS;
-#ifdef RT_OS_WINDOWS
     HKEY hKey;
     LONG r;
@@ -238 +272 @@
     if (r == ERROR_SUCCESS)
     {
+/** @todo r=bird: If anything fails here, this code will end up returning
+ *        rc=VINF_SUCCESS and uninitialized output pointers.  It will also
+ *        leak memory in some cases.  Iff the value type isn't string,
+ *        garbage is returned.
+ *
+ *        RTMemAlloc shall be freed by RTMemFree not RTStrFree.  Don't ever mix
+ *        because it will blow up in an annoying way when using the eletrical
+ *        fences and stuff.  Use a temporary buffer and RTStrDupEx.
+ */
         /* Version. */
         DWORD dwType;
@@ -264 +307 @@
     else
     {
-        /* No registry entries found, return the compile-time version string atm. */
-        /* Version. */
-        if (ppszVer)
-            rc = RTStrAPrintf(ppszVer, "%s", VBOX_VERSION_STRING);
-        /* Revision. */
-        if (ppszRev)
-            rc = RTStrAPrintf(ppszRev, "%s", VBOX_SVN_REV);
-    }
-    if (NULL != hKey)
+        /*
+         * No registry entries found, return the version string compiled
+         * into this binary.
+         */
+        rc = vbglR3GetAdditionsCompileTimeVersion(ppszVer, ppszRev);
+    }
+    if (hKey != NULL) /** @todo r=bird: This looks kind of wrong for the failure case... */
         RegCloseKey(hKey);
-# else /* !RT_OS_WINDOWS */
-    /* On non-Windows platforms just return the compile-time version string atm. */
-    /* Version. */
-    if (ppszVer)
-        rc = RTStrAPrintf(ppszVer, "%s", VBOX_VERSION_STRING);
-    /* Revision. */
-    if (ppszRev)
-        rc = RTStrAPrintf(ppszRev, "%s", VBOX_SVN_REV);
-# endif /* !RT_OS_WINDOWS */
-    return rc;
-}
+    return rc;
+
+#else /* !RT_OS_WINDOWS */
+    /*
+     * On non-Windows platforms just return the compile-time version string.
+     */
+    return vbglR3GetAdditionsCompileTimeVersion(ppszVer, ppszRev);
+#endif /* !RT_OS_WINDOWS */
+}