Changeset 23115 in vbox

Timestamp:

Sep 18, 2009 8:27:42 AM (15 years ago)

Author:

vboxsync

Message:

VBoxTray: Added guest property option to disable host version check.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxHostVersion.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxHostVersion.cpp

@@ -59 +59 @@
         Log(("VBoxTray: Failed to connect to the guest property service! Error: %d\n", rc));
 
+    /* Do we need to do all this stuff? */
+    char *pszCheckHostVersion;
+    rc = VbglR3GuestPropReadValueAlloc(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/CheckHostVersion", &pszCheckHostVersion);
+    if (RT_FAILURE(rc))    
+    {
+        if (rc == VERR_NOT_FOUND)
+            rc = VERR_NOT_SUPPORTED; /* If we don't find the value above this is not critical */
+        else
+            Log(("VBoxTray: Could not read check host version flag! rc = %d\n", rc));
+    }
+    else
+    {
+        if (pszCheckHostVersion && atoi(pszCheckHostVersion) <= 0)
+            rc = VERR_NOT_SUPPORTED;
+        VbglR3GuestPropReadValueFree(pszCheckHostVersion);
+    }
+    if (rc == VERR_NOT_SUPPORTED)            
+        Log(("VBoxTray: No host version check performed."));
+
     char szMsg[256] = "\0"; /* Sizes according to MSDN. */
     char szTitle[64] = "\0";
@@ -68 +87 @@
         rc = VbglR3GuestPropReadValueAlloc(uGuestPropSvcClientID, "/VirtualBox/HostInfo/VBoxVer", &pszVBoxHostVer);
         if (RT_FAILURE(rc))
-            Log(("VBoxTray: Could not read VBox host version! rc = %d\n", rc));
-
-        if (RT_SUCCESS(rc))
+        {
+            Log(("VBoxTray: Could not read VBox host version! rc = %d\n", rc));    
+        }
+        else
         {
             Log(("VBoxTray: Host version: %s\n", pszVBoxHostVer));
@@ -102 +122 @@
                 }
 
-                /** @todo implement a special value of last informed host version (or a new flag) to disable this service. */
-
                 /* Compare both versions and prepare message */
                 if (   RT_SUCCESS(rc)
@@ -129 +147 @@
                         if (lRet == ERROR_SUCCESS)
                         {
-                            lRet = RegSetValueEx(hKey, "HostVerLastChecked", 0, REG_SZ, (BYTE*)pszVBoxHostVer, strlen(pszVBoxHostVer)*sizeof(char));
+                            lRet = RegSetValueEx(hKey, "HostVerLastChecked", 0, REG_SZ, (BYTE*)pszVBoxHostVer, (DWORD)(strlen(pszVBoxHostVer)*sizeof(char)));
                             if (lRet != ERROR_SUCCESS)
                                 Log(("VBoxTray: Could not write HostVerLastChecked! Error = %ld\n", lRet));
@@ -153 +171 @@
     }
 
+    /* If we didn't have to check for the host version then this is not an error */
+    if (rc == VERR_NOT_SUPPORTED)
+        rc = VINF_SUCCESS;
+
     VbglR3GuestPropDisconnect(uGuestPropSvcClientID);
     return rc;