Changeset 10094 in vbox

Timestamp:

Jul 2, 2008 11:23:06 AM (17 years ago)

Author:

vboxsync

Message:

Additions/WINNT: VBoxControl guest property fixes, and ifdef correctly

Location:

trunk/src/VBox/Additions/WINNT/VBoxControl

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxControl.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/WINNT/VBoxControl/Makefile.kmk

@@ -34 +34 @@
 
 # VBoxControl.cpp uses VBOX_SVN_REV.
-VBoxControl.cpp_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV) VBOX_HGCM
+VBoxControl.cpp_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV)
 VBoxControl.cpp_DEPS = $(VBOX_SVN_REV_KMK)
+VBoxControl_DEFS     += \
+        $(if $(VBOX_WITH_INFO_SVC),VBOX_WITH_INFO_SVC VBOX_HGCM,)
 
 include $(KBUILD_PATH)/subfooter.kmk

trunk/src/VBox/Additions/WINNT/VBoxControl/VBoxControl.cpp

@@ -783 +783 @@
 
 
+#ifdef VBOX_WITH_INFO_SVC
 /**
  * Open the VirtualBox guest device.
@@ -919 +920 @@
         rc = Msg.hdr.result;
     uint32_t cbActual;
-    if (RT_SUCCESS(rc))
-        rc = VbglHGCMParmUInt32Get(&Msg.size, &cbActual);
-    if (RT_SUCCESS(rc))
-    {
-        if (pcbActual != NULL)
-            *pcbActual = cbActual;
-        if (cbActual > cbValue)
-            rc = VINF_BUFFER_OVERFLOW;
+    if (RT_SUCCESS(rc) || (VERR_BUFFER_OVERFLOW == rc))
+    {
+        int rc2 = VbglHGCMParmUInt32Get(&Msg.size, &cbActual);
+        if (RT_SUCCESS(rc2))
+        {
+            if (pcbActual != NULL)
+                *pcbActual = cbActual;
+        }
         else
-            rc = Msg.hdr.result;
-        if ((cbValue > 0) && (0 == cbActual))  /* No such property */
-            pszValue[0] = 0;
-            
+            rc = rc2;
     }
     return rc;
@@ -1037 +1035 @@
         rc = hgcmInfoSvcGetProp(hDevice, u32ClientID, argv[0], szValue,
                                 sizeof(szValue), NULL);
-        if (!RT_SUCCESS(rc))
+        if (!RT_SUCCESS(rc) && (rc != VERR_NOT_FOUND))
             printf("Failed to retrieve the property value, RT error %d\n", rc);
     }
-    if (RT_SUCCESS(rc))
-    {
-        if (strlen(szValue) > 0)
+    if (RT_SUCCESS(rc) || (VERR_NOT_FOUND == rc))
+    {
+        if (RT_SUCCESS(rc))
             printf("Value: %s\n", szValue);
         else
@@ -1097 +1095 @@
     return rc;
 }
+#endif  /* VBOX_WITH_INFO_SVC */
 
 
@@ -1144 +1143 @@
         handleSetVideoMode(argc - 2, &argv[2]);
     }
+#ifdef VBOX_WITH_INFO_SVC
     else if (stricmp(argv[1], "getguestproperty") == 0)
     {
@@ -1153 +1153 @@
         handleSetGuestProperty(argc - 2, &argv[2]);
     }
+#endif  /* VBOX_WITH_INFO_SVC */
     else
     {