Changeset 32687 in vbox for trunk/src

Timestamp:

Sep 22, 2010 8:40:24 AM (14 years ago)

Author:

vboxsync

Message:

VBoxTray: Applied refined patch for NT4 resizing/graphics capabilities from #5232c20.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxDisplay.cpp (modified) (4 diffs)
• VBoxSeamless.cpp (modified) (5 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25 +25 @@
 #include "helpers.h"
 #include <malloc.h>
+#include <VBoxGuestInternal.h>
 
 typedef struct _VBOXDISPLAYCONTEXT
@@ -455 +456 @@
     maskInfo.u32OrMask = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST | VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED;
     maskInfo.u32NotMask = 0;
-    if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
-    {
-        Log(("VBoxTray: VBoxDisplayThread: DeviceIOControl(CtlMask - or) succeeded\n"));
-    }
-    else
-    {
-        Log(("VBoxTray: VBoxDisplayThread: DeviceIOControl(CtlMask) failed, DisplayChangeThread exited\n"));
-        return -1;
+    if (!DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
+    {
+        Log(("VBoxTray: VBoxDisplayThread: DeviceIOControl(CtlMask - or) failed, thead exiting\n"));
+        return 0;
+    }
+
+    int rc = VbglR3SetGuestCaps(VMMDEV_GUEST_SUPPORTS_GRAPHICS, 0);
+    if (RT_FAILURE(rc))
+    {
+        LogRel(("VBoxTray: VBoxDisplayThread: Failed to set the graphics capability with rc=%Rrc, thead exiting\n", rc));
+        return 0;
     }
 
@@ -700 +704 @@
     } while (!fTerminate);
 
+    /*
+     * Remove event filter and graphics capability report.
+     */
     maskInfo.u32OrMask = 0;
     maskInfo.u32NotMask = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST | VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED;
-    if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
-    {
-        Log(("VBoxTray: VBoxDisplayThread: DeviceIOControl(CtlMask - not) succeeded\n"));
-    }
-    else
-    {
-        Log(("VBoxTray: VBoxDisplayThread: DeviceIOControl(CtlMask) failed\n"));
-    }
+    if (!DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
+        Log(("VBoxTray: VBoxDisplayThread: DeviceIOControl(CtlMask - not) failed\n"));
+    VbglR3SetGuestCaps(0, VMMDEV_GUEST_SUPPORTS_GRAPHICS);
 
     Log(("VBoxTray: VBoxDisplayThread: finished display change request thread\n"));

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -23 +23 @@
 #include <VBox/VMMDev.h>
 #include <iprt/assert.h>
+#include <VBoxGuestInternal.h>
 #include "helpers.h"
 
@@ -61 +62 @@
     GetVersionEx (&OSinfo);
 
+    int rc = VINF_SUCCESS;
+
     /* We have to jump out here when using NT4, otherwise it complains about
        a missing API function "UnhookWinEvent" used by the dynamically loaded VBoxHook.dll below */
@@ -66 +69 @@
     {
         Log(("VBoxTray: VBoxSeamlessInit: Windows NT 4.0 or older not supported!\n"));
-        return VERR_NOT_SUPPORTED;
-    }
-
-    /* Will fail if SetWinEventHook is not present (version < NT4 SP6 apparently) */
-    gCtx.hModule = LoadLibrary(VBOXHOOK_DLL_NAME);
-    if (gCtx.hModule)
-    {
-        *(uintptr_t *)&gCtx.pfnVBoxInstallHook = (uintptr_t)GetProcAddress(gCtx.hModule, "VBoxInstallHook");
-        *(uintptr_t *)&gCtx.pfnVBoxRemoveHook  = (uintptr_t)GetProcAddress(gCtx.hModule, "VBoxRemoveHook");
-
-        /* inform the host that we support the seamless window mode */
-        VMMDevReqGuestCapabilities vmmreqGuestCaps = {0};
-        vmmdevInitRequest((VMMDevRequestHeader*)&vmmreqGuestCaps, VMMDevReq_ReportGuestCapabilities);
-        vmmreqGuestCaps.caps = VMMDEV_GUEST_SUPPORTS_SEAMLESS;
-
-        DWORD cbReturned;
-        if (!DeviceIoControl(pEnv->hDriver, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(vmmreqGuestCaps)), &vmmreqGuestCaps, sizeof(vmmreqGuestCaps),
-                             &vmmreqGuestCaps, sizeof(vmmreqGuestCaps), &cbReturned, NULL))
-        {
-            Log(("VBoxTray: VBoxSeamlessInit: VMMDevReq_ReportGuestCapabilities: error doing IOCTL, last error: %d\n", GetLastError()));
-            return VERR_INVALID_PARAMETER;
-        }
-
-        *pfStartThread = true;
-        *ppInstance = &gCtx;
-        return VINF_SUCCESS;
+        rc = VERR_NOT_SUPPORTED;
     }
     else
     {
-        Log(("VBoxTray: VBoxSeamlessInit: LoadLibrary failed with %d\n", GetLastError()));
-        return VERR_INVALID_PARAMETER;
-    }
-
-    return VINF_SUCCESS;
+        /* Will fail if SetWinEventHook is not present (version < NT4 SP6 apparently) */
+        gCtx.hModule = LoadLibrary(VBOXHOOK_DLL_NAME);
+        if (gCtx.hModule)
+        {
+            *(uintptr_t *)&gCtx.pfnVBoxInstallHook = (uintptr_t)GetProcAddress(gCtx.hModule, "VBoxInstallHook");
+            *(uintptr_t *)&gCtx.pfnVBoxRemoveHook  = (uintptr_t)GetProcAddress(gCtx.hModule, "VBoxRemoveHook");
+
+            /* Inform the host that we support the seamless window mode. */
+            rc = VbglR3SetGuestCaps(VMMDEV_GUEST_SUPPORTS_SEAMLESS, 0);
+            if (RT_SUCCESS(rc))
+            {
+                *pfStartThread = true;
+                *ppInstance = &gCtx;
+            }
+            else
+                Log(("VBoxTray: VBoxSeamlessInit: Failed to set seamless capability\n"));
+        }
+        else
+        {
+            rc = RTErrConvertFromWin32(GetLastError());
+            Log(("VBoxTray: VBoxSeamlessInit: LoadLibrary of \"%s\" failed with rc=%Rrc\n", VBOXHOOK_DLL_NAME, rc));
+        }
+    }
+
+    return rc;
 }
 
@@ -106 +104 @@
 {
     Log(("VBoxTray: VBoxSeamlessDestroy\n"));
-    /* inform the host that we no longer support the seamless window mode */
-    VMMDevReqGuestCapabilities vmmreqGuestCaps = {0};
-    vmmdevInitRequest((VMMDevRequestHeader*)&vmmreqGuestCaps, VMMDevReq_ReportGuestCapabilities);
-    vmmreqGuestCaps.caps = 0;
-
-    DWORD cbReturned;
-    if (!DeviceIoControl(pEnv->hDriver, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(vmmreqGuestCaps)), &vmmreqGuestCaps, sizeof(vmmreqGuestCaps),
-                         &vmmreqGuestCaps, sizeof(vmmreqGuestCaps), &cbReturned, NULL))
-    {
-        Log(("VBoxTray: VMMDevReq_ReportGuestCapabilities: error doing IOCTL, last error: %d\n", GetLastError()));
-    }
+
+    /* Inform the host that we no longer support the seamless window mode. */
+    int rc = VbglR3SetGuestCaps(0, VMMDEV_GUEST_SUPPORTS_SEAMLESS);
+    if (RT_FAILURE(rc))
+        Log(("VBoxTray: VBoxSeamlessDestroy: Failed to unset seamless capability, rc=%Rrc\n", rc));
 
     if (gCtx.pfnVBoxRemoveHook)