Changeset 3110 in vbox for trunk/src

Timestamp:

Jun 14, 2007 4:18:18 PM (18 years ago)

Author:

vboxsync

Message:

Added the display index parameter to the SetVideoModeHint (in the guest all hints are still processed only for the primary monitor).

Location:

trunk/src/VBox

Files:

• Additions/WINNT/VBoxService/VBoxService.cpp (modified) (6 diffs)
• Devices/VMMDev/VBoxDev.cpp (modified) (4 diffs)
• Devices/VMMDev/VMMDevState.h (modified) (1 diff)
• Frontends/VBoxBFE/DisplayImpl.cpp (modified) (1 diff)
• Frontends/VBoxBFE/DisplayImpl.h (modified) (1 diff)
• Frontends/VBoxBFE/VBoxBFE.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManage.cpp (modified) (3 diffs)
• Frontends/VBoxSDL/VBoxSDL.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/VBoxConsoleView.cpp (modified) (1 diff)
• Main/DisplayImpl.cpp (modified) (2 diffs)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/DisplayImpl.h (modified) (1 diff)

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

@@ -420 +420 @@
 }
 
-static bool isVBoxDisplayDriverActive (void)
+static bool isVBoxDisplayDriverActive (TCHAR *paszDeviceName)
 {
     bool result = false;
@@ -452 +452 @@
             {
                 DDCLOG(("VBox display driver is active.\n"));
+                strcpy (paszDeviceName, dispDevice.DeviceName);
                 result = true;
             }
@@ -463 +464 @@
 
         devNum++;
+    }
+
+    return result;
+}
+
+static LPCTSTR vboxQueryMonitorName (TCHAR *DeviceName, TCHAR *MonitorName, INT idx)
+{
+    LPCTSTR result = NULL;
+
+    DISPLAY_DEVICE dispDevice;
+#ifdef DEBUG_DISPLAY_CHANGE
+    FillMemory(&dispDevice, sizeof(DISPLAY_DEVICE), 0);
+
+    dispDevice.cb = sizeof(DISPLAY_DEVICE);
+    
+    INT devNum = 0;
+
+    while (EnumDisplayDevices(DeviceName,
+                              devNum,
+                              &dispDevice,
+                              0))
+    {
+        DDCLOG(("DevNum:%d\nName:%s\nString:%s\nID:%s\nKey:%s\nFlags=%08X\n\n",
+                      devNum,
+                      &dispDevice.DeviceName[0],
+                      &dispDevice.DeviceString[0],
+                      &dispDevice.DeviceID[0],
+                      &dispDevice.DeviceKey[0],
+                      dispDevice.StateFlags));
+
+        FillMemory(&dispDevice, sizeof(DISPLAY_DEVICE), 0);
+
+        dispDevice.cb = sizeof(DISPLAY_DEVICE);
+
+        devNum++;
+    }
+#endif /* DEBUG_DISPLAY_CHANGE */
+
+    FillMemory(&dispDevice, sizeof(DISPLAY_DEVICE), 0);
+
+    dispDevice.cb = sizeof(DISPLAY_DEVICE);
+
+    DDCLOG(("VBoxService: vboxQueryMonitorName: DeviceName: %s, idx %d (sizeof (TCHAR) %d)\n", DeviceName, idx, sizeof (TCHAR)));
+
+    if (EnumDisplayDevices(DeviceName,
+                           idx,
+                           &dispDevice,
+                           0))
+    {
+        DDCLOG(("DevNum:%d\nName:%s\nString:%s\nID:%s\nKey:%s\nFlags=%08X\n\n",
+                      devNum,
+                      &dispDevice.DeviceName[0],
+                      &dispDevice.DeviceString[0],
+                      &dispDevice.DeviceID[0],
+                      &dispDevice.DeviceKey[0],
+                      dispDevice.StateFlags));
+
+        strcpy (MonitorName, dispDevice.DeviceName);
+        result = &MonitorName[0];
     }
 
@@ -477 +537 @@
     VBoxGuestFilterMaskInfo maskInfo;
     DWORD cbReturned;
+    
+    typedef LONG WINAPI defChangeDisplaySettingsEx(LPCTSTR lpszDeviceName, LPDEVMODE lpDevMode, HWND hwnd, DWORD dwflags, LPVOID lParam);
+    typedef BOOL WINAPI defEnumDisplaySettingsEx(LPCTSTR lpszDeviceName, DWORD iModeNum, LPDEVMODE lpDevMode, DWORD dwFlags);
+    
+    defChangeDisplaySettingsEx *pChangeDisplaySettingsEx = NULL;
+    defEnumDisplaySettingsEx *pEnumDisplaySettingsEx = NULL;
+
+    HMODULE hUser = GetModuleHandle("USER32");
+
+    if (hUser)
+    {
+        pChangeDisplaySettingsEx = (defChangeDisplaySettingsEx *)GetProcAddress(hUser, "ChangeDisplaySettingsExA"); 
+        pEnumDisplaySettingsEx = (defEnumDisplaySettingsEx *)GetProcAddress(hUser, "EnumDisplaySettingsExA");
+        DDCLOG(("VBoxService: pChangeDisplaySettingsEx = %p, pEnumDisplaySettingsEx = %p\n", pChangeDisplaySettingsEx, pEnumDisplaySettingsEx));
+    }
 
     maskInfo.u32OrMask = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST;
@@ -518 +593 @@
                 {
                     /* get the display change request */
-                    VMMDevDisplayChangeRequest displayChangeRequest = {0};
-                    displayChangeRequest.header.size        = sizeof(VMMDevDisplayChangeRequest);
+                    VMMDevDisplayChangeRequest2 displayChangeRequest = {0};
+                    displayChangeRequest.header.size        = sizeof(VMMDevDisplayChangeRequest2);
                     displayChangeRequest.header.version     = VMMDEV_REQUEST_HEADER_VERSION;
-                    displayChangeRequest.header.requestType = VMMDevReq_GetDisplayChangeRequest;
+                    displayChangeRequest.header.requestType = VMMDevReq_GetDisplayChangeRequest2;
                     displayChangeRequest.eventAck           = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST;
-                    if (DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_VMMREQUEST, &displayChangeRequest, sizeof(displayChangeRequest),
-                                        &displayChangeRequest, sizeof(displayChangeRequest), &cbReturned, NULL))
+                    BOOL fDisplayChangeQueried = DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_VMMREQUEST, &displayChangeRequest, sizeof(VMMDevDisplayChangeRequest2),
+                                                                 &displayChangeRequest, sizeof(VMMDevDisplayChangeRequest2), &cbReturned, NULL);
+                    if (!fDisplayChangeQueried)
                     {
-                        DDCLOG(("VBoxService: VMMDevReq_GetDisplayChangeRequest: %dx%dx%d\n", displayChangeRequest.xres, displayChangeRequest.yres, displayChangeRequest.bpp));
+                        /* Try the old version of the request for old VBox hosts. */
+                        displayChangeRequest.header.size        = sizeof(VMMDevDisplayChangeRequest);
+                        displayChangeRequest.header.version     = VMMDEV_REQUEST_HEADER_VERSION;
+                        displayChangeRequest.header.requestType = VMMDevReq_GetDisplayChangeRequest;
+                        displayChangeRequest.eventAck           = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST;
+                        fDisplayChangeQueried = DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_VMMREQUEST, &displayChangeRequest, sizeof(VMMDevDisplayChangeRequest),
+                                                                 &displayChangeRequest, sizeof(VMMDevDisplayChangeRequest), &cbReturned, NULL);
+                        displayChangeRequest.display = 0;
+                    }
+                    if (fDisplayChangeQueried)
+                    {
+                        DDCLOG(("VBoxService: VMMDevReq_GetDisplayChangeRequest2: %dx%dx%d at %d\n", displayChangeRequest.xres, displayChangeRequest.yres, displayChangeRequest.bpp, displayChangeRequest.display));
 
                         /*
                          * Only try to change video mode if the active display driver is VBox additions.
                          */
-                        if (isVBoxDisplayDriverActive ())
+                        TCHAR DeviceName[32];
+                        if (isVBoxDisplayDriverActive (DeviceName))
                         {
+                            TCHAR MonitorName[32];
+                            LPCTSTR lpszDeviceName = NULL;
+                            if (displayChangeRequest.display > 0 && pChangeDisplaySettingsEx != NULL)
+                            {
+                                lpszDeviceName = vboxQueryMonitorName (DeviceName, MonitorName, displayChangeRequest.display);
+                            }
+
+                            DDCLOG(("VBoxService: lpszDeviceName: %s\n", lpszDeviceName? lpszDeviceName: "(empty)"));
+
                             DEVMODE devMode;
-
-                            /* get the current screen setup */
-                            if (EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devMode))
+                            memset (&devMode, 0, sizeof (devMode));
+                            devMode.dmSize = sizeof(DEVMODE);
+
+                            /* get the current screen setup, using Ex to get dmPosition if available. */
+                            if (pEnumDisplaySettingsEx?
+                                    pEnumDisplaySettingsEx(lpszDeviceName, ENUM_CURRENT_SETTINGS, &devMode, 0):
+                                    EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devMode))
                             {
-                                SvcDebugOut2("VBoxService: Current mode: %dx%dx%d\n", devMode.dmPelsWidth, devMode.dmPelsHeight, devMode.dmBitsPerPel);
+                                SvcDebugOut2("VBoxService: Current mode: %dx%dx%d at %d,%d\n", devMode.dmPelsWidth, devMode.dmPelsHeight, devMode.dmBitsPerPel, devMode.dmPosition.x, devMode.dmPosition.y);
 
                                 /* Horizontal resolution must be a multiple of 8, round down. */
@@ -584 +685 @@
                                     devMode.dmBitsPerPel = displayChangeRequest.bpp;
 
+                                if (lpszDeviceName) devMode.dmFields |= DM_POSITION;
+
                                 DDCLOG(("VBoxService: setting the new mode %dx%dx%d\n", devMode.dmPelsWidth, devMode.dmPelsHeight, devMode.dmBitsPerPel));
 
                                 /* set the new mode */
                                 LONG status;
-                                status = ChangeDisplaySettings(&devMode, CDS_UPDATEREGISTRY);
+                                status = pChangeDisplaySettingsEx?
+                                             pChangeDisplaySettingsEx(lpszDeviceName, &devMode, NULL, CDS_UPDATEREGISTRY, NULL):
+                                             ChangeDisplaySettings(&devMode, CDS_UPDATEREGISTRY);
                                 if (status != DISP_CHANGE_SUCCESSFUL)
                                 {

trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp

@@ -773 +773 @@
         }
 
+        case VMMDevReq_GetDisplayChangeRequest2:
+        {
+            if (requestHeader->size != sizeof(VMMDevDisplayChangeRequest2))
+            {
+                requestHeader->rc = VERR_INVALID_PARAMETER;
+            }
+            else
+            {
+                VMMDevDisplayChangeRequest2 *displayChangeRequest = (VMMDevDisplayChangeRequest2*)requestHeader;
+                /* just pass on the information */
+                Log(("VMMDev: returning display change request xres = %d, yres = %d, bpp = %d at %d\n",
+                     pData->displayChangeRequest.xres, pData->displayChangeRequest.yres, pData->displayChangeRequest.bpp, pData->displayChangeRequest.display));
+                displayChangeRequest->xres    = pData->displayChangeRequest.xres;
+                displayChangeRequest->yres    = pData->displayChangeRequest.yres;
+                displayChangeRequest->bpp     = pData->displayChangeRequest.bpp;
+                displayChangeRequest->display = pData->displayChangeRequest.display;
+
+                if (displayChangeRequest->eventAck == VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST)
+                {
+                    /* Remember which resolution the client have queried. */
+                    pData->lastReadDisplayChangeRequest = pData->displayChangeRequest;
+                }
+
+                requestHeader->rc = VINF_SUCCESS;
+            }
+            break;
+        }
+
         /*
          * Query whether the given video mode is supported
@@ -1374 +1402 @@
 
 
-static DECLCALLBACK(int) vmmdevRequestDisplayChange(PPDMIVMMDEVPORT pInterface, uint32_t xres, uint32_t yres, uint32_t bpp)
+static DECLCALLBACK(int) vmmdevRequestDisplayChange(PPDMIVMMDEVPORT pInterface, uint32_t xres, uint32_t yres, uint32_t bpp, uint32_t display)
 {
     VMMDevState *pData = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
@@ -1381 +1409 @@
     bool fSameResolution = (!xres || (pData->lastReadDisplayChangeRequest.xres == xres)) &&
                            (!yres || (pData->lastReadDisplayChangeRequest.yres == yres)) &&
-                           (!bpp || (pData->lastReadDisplayChangeRequest.bpp == bpp));
+                           (!bpp || (pData->lastReadDisplayChangeRequest.bpp == bpp)) &&
+                           pData->lastReadDisplayChangeRequest.display == display;
 
     if (!xres && !yres && !bpp)
@@ -1390 +1419 @@
 
 #ifdef DEBUG_sunlover
-    Log(("vmmdevRequestDisplayChange: same=%d. new: xres=%d, yres=%d, bpp=%d. old: xres=%d, yres=%d, bpp=%d.\n",
-          fSameResolution, xres, yres, bpp, pData->lastReadDisplayChangeRequest.xres, pData->lastReadDisplayChangeRequest.yres, pData->lastReadDisplayChangeRequest.bpp));
+    Log(("vmmdevRequestDisplayChange: same=%d. new: xres=%d, yres=%d, bpp=%d, display=%d. old: xres=%d, yres=%d, bpp=%d, display=%d.\n",
+          fSameResolution, xres, yres, bpp, display, pData->lastReadDisplayChangeRequest.xres, pData->lastReadDisplayChangeRequest.yres, pData->lastReadDisplayChangeRequest.bpp, pData->lastReadDisplayChangeRequest.display));
 #endif /* DEBUG_sunlover */
 
     if (!fSameResolution)
     {
-        LogRel(("VMMDev::SetVideoModeHint: got a video mode hint (%dx%dx%d)\n",
-                xres, yres, bpp));
+        LogRel(("VMMDev::SetVideoModeHint: got a video mode hint (%dx%dx%d) at %d\n",
+                xres, yres, bpp, display));
 
         /* we could validate the information here but hey, the guest can do that as well! */
-        pData->displayChangeRequest.xres = xres;
-        pData->displayChangeRequest.yres = yres;
-        pData->displayChangeRequest.bpp  = bpp;
+        pData->displayChangeRequest.xres    = xres;
+        pData->displayChangeRequest.yres    = yres;
+        pData->displayChangeRequest.bpp     = bpp;
+        pData->displayChangeRequest.display = display;
 
         /* IRQ so the guest knows what's going on */

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -108 +108 @@
         uint32_t yres;
         uint32_t bpp;
+        uint32_t display;
     } displayChangeRequest,
       lastReadDisplayChangeRequest;

trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp

@@ -824 +824 @@
 }
 
-void VMDisplay::SetVideoModeHint(ULONG aWidth, ULONG aHeight, ULONG aColorDepth)
+void VMDisplay::SetVideoModeHint(ULONG aWidth, ULONG aHeight, ULONG aColorDepth, ULONG aDisplay)
 {
     PPDMIVMMDEVPORT pVMMDevPort = gVMMDev->getVMMDevPort ();
 
     if (pVMMDevPort)
-        pVMMDevPort->pfnRequestDisplayChange(pVMMDevPort, aWidth, aHeight, aColorDepth);
+        pVMMDevPort->pfnRequestDisplayChange(pVMMDevPort, aWidth, aHeight, aColorDepth, aDisplay);
 }
 

trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.h

@@ -47 +47 @@
 
     void updatePointerShape(bool fVisible, bool fAlpha, uint32_t xHot, uint32_t yHot, uint32_t width, uint32_t height, void *pShape);
-    void SetVideoModeHint(ULONG aWidth, ULONG aHeight, ULONG aColorDepth);
+    void SetVideoModeHint(ULONG aWidth, ULONG aHeight, ULONG aColorDepth, ULONG aDisplay);
 
     static const PDMDRVREG  DrvReg;

trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp

@@ -730 +730 @@
                           * gFramebuffer->getHostYres()
                           * (gDisplay->getColorDepth() / 8))
-        gDisplay->SetVideoModeHint(gFramebuffer->getHostXres(), gFramebuffer->getHostYres(), 0);
+        gDisplay->SetVideoModeHint(gFramebuffer->getHostXres(), gFramebuffer->getHostYres(), 0, 0);
 #endif
 

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -395 +395 @@
                  "                            dvdattach none|<uuid>|<filename>|host:<drive> |\n"
                  "                            floppyattach none|<uuid>|<filename>|host:<drive> |\n"
-                 "                            setvideomodehint <xres> <yres> <bpp> |\n"
+                 "                            setvideomodehint <xres> <yres> <bpp> [display]|\n"
                  "                            setcredentials <username> <password> <domain>\n"
                  "                                           [-allowlocallogon <yes|no>]\n"
@@ -4277 +4277 @@
         else if (strcmp(argv[1], "setvideomodehint") == 0)
         {
-            if (argc != 5)
+            if (argc != 5 && argc != 6)
             {
                 errorSyntax(USAGE_CONTROLVM, "Incorrect number of parameters");
@@ -4286 +4286 @@
             uint32_t yres = atoi(argv[3]);
             uint32_t bpp  = atoi(argv[4]);
+            uint32_t displayIdx = 0;
+            if (argc == 6)
+                displayIdx = atoi(argv[5]);
 
             ComPtr<IDisplay> display;
             CHECK_ERROR_BREAK(console, COMGETTER(Display)(display.asOutParam()));
-            CHECK_ERROR_BREAK(display, SetVideoModeHint(xres, yres, bpp));
+            CHECK_ERROR_BREAK(display, SetVideoModeHint(xres, yres, bpp, displayIdx));
         }
         else if (strcmp(argv[1], "setcredentials") == 0)

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -2288 +2288 @@
                  */
                 /* communicate the resize event to the guest */
-                gDisplay->SetVideoModeHint(uResizeWidth, uResizeHeight, 0);
+                gDisplay->SetVideoModeHint(uResizeWidth, uResizeHeight, 0, 0);
                 break;
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -3010 +3010 @@
         LogFlowFunc (("Will suggest %d,%d\n", sz.width(), sz.height()));
 
-        cconsole.GetDisplay().SetVideoModeHint (sz.width(), sz.height(), 0);
+        cconsole.GetDisplay().SetVideoModeHint (sz.width(), sz.height(), 0, 0);
     }
 }

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -1334 +1334 @@
 }
 
-STDMETHODIMP Display::SetVideoModeHint(ULONG aWidth, ULONG aHeight, ULONG aColorDepth)
+STDMETHODIMP Display::SetVideoModeHint(ULONG aWidth, ULONG aHeight, ULONG aColorDepth, ULONG aDisplay)
 {
     AutoLock lock(this);
@@ -1358 +1358 @@
         bpp = cBits;
     }
-    ULONG vramSize;
-    mParent->machine()->COMGETTER(VRAMSize)(&vramSize);
-    /* enough VRAM? */
-    if ((width * height * (bpp / 8)) > (vramSize * 1024 * 1024))
-        return setError(E_FAIL, tr("Not enough VRAM for the selected video mode"));
+    ULONG cMonitors;
+    mParent->machine()->COMGETTER(MonitorCount)(&cMonitors);
+    if (cMonitors == 0 && aDisplay > 0)
+        return E_INVALIDARG;
+    if (aDisplay >= cMonitors)
+        return E_INVALIDARG;
+
+// sunlover 20070614: It is up to the guest to decide whether the hint is valid.
+//    ULONG vramSize;
+//    mParent->machine()->COMGETTER(VRAMSize)(&vramSize);
+//    /* enough VRAM? */
+//    if ((width * height * (bpp / 8)) > (vramSize * 1024 * 1024))
+//        return setError(E_FAIL, tr("Not enough VRAM for the selected video mode"));
 
     if (mParent->getVMMDev())
-        mParent->getVMMDev()->getVMMDevPort()->pfnRequestDisplayChange(mParent->getVMMDev()->getVMMDevPort(), aWidth, aHeight, aColorDepth);
+        mParent->getVMMDev()->getVMMDevPort()->pfnRequestDisplayChange(mParent->getVMMDev()->getVMMDevPort(), aWidth, aHeight, aColorDepth, aDisplay);
     return S_OK;
 }

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -6298 +6298 @@
     <interface
         name="IDisplay" extends="$unknown"
-        uuid="FD443EC1-0012-4F5B-9282-D72760A66916"
+        uuid="0a6a7746-5469-47e4-9a00-8b1ea28891b8"
         wsmap="suppress"
     >
@@ -6353 +6353 @@
                 Specifying "0" for either width and height or the color depth
                 means that the dimensions or color depth should not be changed.
+                It is possible to specify the number of the guest display
+                that has to be resized, if guest supports multimonitor configuration.
+                The display value 0 means primary display, 1 - first secondary.
             </desc>
             <param name="width" type="unsigned long" dir="in"/>
             <param name="height" type="unsigned long" dir="in"/>
             <param name="colorDepth" type="unsigned long" dir="in"/>
+            <param name="display" type="unsigned long" dir="in"/>
         </method>
 

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -138 +138 @@
     STDMETHOD(UnlockFramebuffer)();
     STDMETHOD(RegisterExternalFramebuffer)(IFramebuffer *frameBuf);
-    STDMETHOD(SetVideoModeHint)(ULONG width, ULONG height, ULONG colorDepth);
+    STDMETHOD(SetVideoModeHint)(ULONG width, ULONG height, ULONG colorDepth, ULONG display);
     STDMETHOD(TakeScreenShot)(BYTE *address, ULONG width, ULONG height);
     STDMETHOD(DrawToScreen)(BYTE *address, ULONG x, ULONG y, ULONG width, ULONG height);