Changeset 70066 in vbox

Timestamp:

Dec 11, 2017 4:33:05 PM (7 years ago)

Author:

vboxsync

Message:

VBoxGuest: Enabled VGDrvCommonProcessOptionsFromHost for all but linux and freebsd.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• VBoxGuest-darwin.cpp (modified) (1 diff)
• VBoxGuest-freebsd.c (modified) (2 diffs)
• VBoxGuest-haiku.c (modified) (1 diff)
• VBoxGuest-linux.c (modified) (1 diff)
• VBoxGuest-netbsd.c (modified) (1 diff)
• VBoxGuest-os2.cpp (modified) (1 diff)
• VBoxGuest-solaris.c (modified) (1 diff)
• VBoxGuest-win.cpp (modified) (2 diffs)
• VBoxGuest.cpp (modified) (11 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-darwin.cpp

@@ -667 +667 @@
 {
     NOREF(pDevExt);
+}
+
+
+bool VGDrvNativeProcessOption(PVBOXGUESTDEVEXT pDevExt, const char *pszName, const char *pszValue)
+{
+    RT_NOREF(pDevExt); RT_NOREF(pszName); RT_NOREF(pszValue);
+    return false;
 }
 

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c

@@ -563 +563 @@
 }
 
+
 /**
  * Interrupt service routine.
@@ -587 +588 @@
     selwakeup(&g_SelInfo);
 }
+
+
+bool VGDrvNativeProcessOption(PVBOXGUESTDEVEXT pDevExt, const char *pszName, const char *pszValue)
+{
+    RT_NOREF(pDevExt); RT_NOREF(pszName); RT_NOREF(pszValue);
+    return false;
+}
+
 
 /**

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c

@@ -354 +354 @@
 
 
+bool VGDrvNativeProcessOption(PVBOXGUESTDEVEXT pDevExt, const char *pszName, const char *pszValue)
+{
+    RT_NOREF(pDevExt); RT_NOREF(pszName); RT_NOREF(pszValue);
+    return false;
+}
+
+
 /**
  * Sets IRQ for VMMDev.

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c

@@ -1058 +1058 @@
 
 
+bool VGDrvNativeProcessOption(PVBOXGUESTDEVEXT pDevExt, const char *pszName, const char *pszValue)
+{
+    RT_NOREF(pDevExt); RT_NOREF(pszName); RT_NOREF(pszValue);
+    return false;
+}
+
+
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
 

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-netbsd.c

@@ -530 +530 @@
 
 
+bool VGDrvNativeProcessOption(PVBOXGUESTDEVEXT pDevExt, const char *pszName, const char *pszValue)
+{
+    RT_NOREF(pDevExt); RT_NOREF(pszName); RT_NOREF(pszValue);
+    return false;
+}
+
+
 static int VBoxGuestNetBSDSetMouseStatus(vboxguest_softc *sc, uint32_t fStatus)
 {

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp

@@ -605 +605 @@
 
 
+bool VGDrvNativeProcessOption(PVBOXGUESTDEVEXT pDevExt, const char *pszName, const char *pszValue)
+{
+    RT_NOREF(pDevExt); RT_NOREF(pszName); RT_NOREF(pszValue);
+    return false;
+}
+
+
 #ifdef DEBUG_READ /** @todo figure out this one once and for all... */
 

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c

@@ -1083 +1083 @@
 
 
+bool VGDrvNativeProcessOption(PVBOXGUESTDEVEXT pDevExt, const char *pszName, const char *pszValue)
+{
+    RT_NOREF(pDevExt); RT_NOREF(pszName); RT_NOREF(pszValue);
+    return false;
+}
+
+
 /**
  * Sets the mouse notification callback.

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

@@ -1085 +1085 @@
 
 /**
+ * Hook for handling OS specfic options from the host.
+ *
+ * @returns true if handled, false if not.
+ * @param   pDevExt         The device extension.
+ * @param   pszName         The option name.
+ * @param   pszValue        The option value.
+ */
+bool VGDrvNativeProcessOption(PVBOXGUESTDEVEXT pDevExt, const char *pszName, const char *pszValue)
+{
+    RT_NOREF(pDevExt); RT_NOREF(pszName); RT_NOREF(pszValue);
+    return false;
+}
+
+
+
+/**
  * Queries (gets) a DWORD value from the registry.
  *
@@ -1138 +1154 @@
     }
 
-#if 0 /* test me */
     /*
      * Read configuration from the host.
      */
+    LogRelFunc(("Calling VGDrvCommonProcessOptionsFromHost...\n"));
     VGDrvCommonProcessOptionsFromHost(&pDevExt->Core);
-#endif
+    LogRelFunc(("VGDrvCommonProcessOptionsFromHost returned\n"));
 }
 

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -55 +55 @@
 #include <VBox/VMMDev.h> /* for VMMDEV_RAM_SIZE */
 #include <VBox/log.h>
+#if !defined(RT_OS_LINUX) && !defined(RT_OS_FREEBSD)
+# include <VBox/HostServices/GuestPropertySvc.h>
+#endif
 #include <iprt/ctype.h>
 #include <iprt/mem.h>
@@ -1136 +1139 @@
 }
 
-#if 0 /* needs testing */
-
-#include <VBox/HostServices/GuestPropertySvc.h>
-
-/**
- * Checks if the given option can be taken to no mean 'false'.
+
+/**
+ * Checks if the given option can be taken to not mean 'false'.
  *
  * @returns true or false accordingly.
@@ -1159 +1159 @@
             && ch != 'N' /* NO */
             && ch != 'd' /* disabled */
+            && ch != 'f' /* false*/
+            && ch != 'F' /* FALSE */
             && ch != 'D' /* DISABLED */
             && (   (ch != 'o' && ch != 'O') /* off, OFF, Off */
@@ -1170 +1172 @@
 
 /**
- * Hook for handling OS specfic options from the host.
- *
- * @returns true if handled, false if not.
- * @param   pDevExt         The device extension.
- * @param   pszName         The option name.
- * @param   pszValue        The option value.
- */
-bool VGDrvNativeProcessOption(PVBOXGUESTDEVEXT pDevExt, const char *pszName, const char *pszValue)
-{
-    RT_NOREF(pDevExt); RT_NOREF(pszName); RT_NOREF(pszValue);
-    return false;
-}
-
-/**
  * Processes a option.
  *
@@ -1211 +1199 @@
 void VGDrvCommonProcessOptionsFromHost(PVBOXGUESTDEVEXT pDevExt)
 {
+#if !defined(RT_OS_LINUX) && !defined(RT_OS_FREEBSD)
     /*
      * Create a kernel session without our selves, then connect to the HGCM service.
@@ -1222 +1211 @@
             VBGLIOCHGCMCONNECT          Connect;
             VBGLIOCHGCMDISCONNECT       Disconnect;
-            guestProp::EnumProperties   EnumMsg;
+            GuestPropMsgEnumProperties  EnumMsg;
         } uBuf;
 
@@ -1239 +1228 @@
 
             /*
-             * Enumerate all the relevant properties.  We try with a 2KB buffer, but
-             * will double it until we get what we want or go beyond 64KB.
+             * Enumerate all the relevant properties.  We try with a 1KB buffer, but
+             * will double it until we get what we want or go beyond 16KB.
              */
-            for (cbStrings = _2K; cbStrings <= _64K; cbStrings *= 2)
+            for (cbStrings = _1K; cbStrings <= _16K; cbStrings *= 2)
             {
                 pszzStrings = (char *)RTMemAllocZ(cbStrings);
                 if (pszzStrings)
                 {
-                    VBGL_HGCM_HDR_INIT(&uBuf.EnumMsg.hdr, idClient, guestProp::ENUM_PROPS, 3);
+                    VBGL_HGCM_HDR_INIT(&uBuf.EnumMsg.hdr, idClient, GUEST_PROP_FN_ENUM_PROPS, 3);
 
                     uBuf.EnumMsg.patterns.type                    = VMMDevHGCMParmType_LinAddr;
@@ -1263 +1252 @@
                                           &uBuf.EnumMsg.hdr.Hdr, sizeof(uBuf.EnumMsg));
                     if (RT_SUCCESS(rc))
+                    {
+                        if (   uBuf.EnumMsg.size.type == VMMDevHGCMParmType_32bit
+                            && uBuf.EnumMsg.size.u.value32 <= cbStrings
+                            && uBuf.EnumMsg.size.u.value32 > 0)
+                            cbStrings = uBuf.EnumMsg.size.u.value32;
+                        Log(("VGDrvCommonReadConfigurationFromHost: GUEST_PROP_FN_ENUM_PROPS -> %#x bytes (cbStrings=%#x)\n",
+                             uBuf.EnumMsg.size.u.value32, cbStrings));
                         break;
+                    }
 
                     RTMemFree(pszzStrings);
@@ -1313 +1310 @@
                                 if (!ch)
                                     break;
+                                if (fValidFields)
+                                    Log(("VGDrvCommonReadConfigurationFromHost: Invalid char %#x at %#x (field %u)\n",
+                                         ch, off - 1, iField));
                                 fValidFields = false;
                             }
                         }
                     }
-                    if (   off < cbStrings
+                    if (   off <= cbStrings
                         && fValidFields
                         && *apszFields[0] != '\0')
@@ -1342 +1342 @@
                     {
                         LogRel(("VBoxGuest: Malformed guest properties enum result!\n"));
+                        Log(("VBoxGuest: off=%#x cbStrings=%#x\n%.*Rhxd\n", off, cbStrings, cbStrings, pszzStrings));
                         break;
                     }
-                    else if (fValidFields)
+                    else if (!fValidFields)
                         LogRel(("VBoxGuest: Ignoring %.*Rhxs as it has invalid characters in one or more fields\n",
                                 (int)strlen(apszFields[0]), apszFields[0]));
@@ -1362 +1363 @@
     else
         LogRel(("VGDrvCommonReadConfigurationFromHost: failed to connect: %Rrc\n", rc));
-}
-
-#endif /* needs testing */
+
+#else   /* RT_OS_LINUX || RT_OS_FREEBSD */
+    RT_NOREF(pDevExt);
+#endif
+}
+
 
 /**