Changeset 4579 in vbox for trunk/src/VBox/Additions/WINNT/VBoxGuest/VBoxGuest.cpp

Timestamp:

Sep 6, 2007 2:50:26 PM (17 years ago)

Author:

vboxsync

Message:

Updates

File:

• trunk/src/VBox/Additions/WINNT/VBoxGuest/VBoxGuest.cpp (modified) (4 diffs)

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

@@ -428 +428 @@
 }
 
-static NTSTATUS VBoxGuestQueryMemoryBalloon(PVBOXGUESTDEVEXT pDevExt)
-{
-    NTSTATUS Status = STATUS_SUCCESS;
-
+static int VBoxGuestQueryMemoryBalloon(PVBOXGUESTDEVEXT pDevExt, ULONG *pMemBalloonSize)
+{
     /* just perform the request */
     VMMDevGetMemBalloonChangeRequest *req = NULL;
@@ -449 +447 @@
             dprintf(("VBoxGuest::VBoxGuestDeviceControl IOCTL_VBOXGUEST_CTL_CHECK_BALLOON: error issuing request to VMMDev!"
                      "rc = %d, VMMDev rc = %Vrc\n", rc, req->header.rc));
-            Status = STATUS_UNSUCCESSFUL;
         }
         else
@@ -458 +455 @@
         VbglGRFree(&req->header);
     }
-    else
-    {
-        Status = STATUS_UNSUCCESSFUL;
-    }
-    return Status;
+    return rc;
 }
 
@@ -815 +808 @@
         case IOCTL_VBOXGUEST_CTL_CHECK_BALLOON:
         {
-            Status = VBoxGuestQueryMemoryBalloon(pDevExt);
+            ULONG *pMemBalloonSize = (ULONG *) pBuf;
+
+            if (pStack->Parameters.DeviceIoControl.OutputBufferLength != sizeof(ULONG))
+            {
+                dprintf(("VBoxGuest::VBoxGuestDeviceControl: OutputBufferLength %d != sizeof(ULONG) %d\n",
+                         pStack->Parameters.DeviceIoControl.OutputBufferLength, sizeof(ULONG)));
+                Status = STATUS_INVALID_PARAMETER;
+                break;
+            }
+
+            int rc = VBoxGuestQueryMemoryBalloon(pDevExt, pMemBalloonSize);
+            if (VBOX_FAILURE(rc))
+            {
+                dprintf(("IOCTL_VBOXGUEST_CTL_CHECK_BALLOON: vbox rc = %Vrc\n", rc));
+                Status = STATUS_UNSUCCESSFUL;
+            }
+            else
+            {
+                cbOut = pStack->Parameters.DeviceIoControl.OutputBufferLength;
+            }
             break;
         }