Changeset 25985 in vbox for trunk/src/VBox/Main/DisplayImpl.cpp

Timestamp:

Jan 23, 2010 12:51:04 AM (15 years ago)

Author:

vboxsync

Message:

pdmifs.h: the final batch of refactored interface ID code.

File:

• trunk/src/VBox/Main/DisplayImpl.cpp (modified) (12 diffs)

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -58 +58 @@
     PPDMIDISPLAYPORT            pUpPort;
     /** Our display connector interface. */
-    PDMIDISPLAYCONNECTOR        Connector;
+    PDMIDISPLAYCONNECTOR        IConnector;
 #if defined(VBOX_WITH_VIDEOHWACCEL)
     /** VBVA callbacks */
@@ -66 +66 @@
 
 /** Converts PDMIDISPLAYCONNECTOR pointer to a DRVMAINDISPLAY pointer. */
-#define PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface)  RT_FROM_MEMBER(pInterface, DRVMAINDISPLAY, Connector)
+#define PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface)  RT_FROM_MEMBER(pInterface, DRVMAINDISPLAY, IConnector)
 
 #ifdef DEBUG_sunlover
@@ -1001 +1001 @@
 #ifdef DEBUG_sunlover
     LogFlowFunc (("%d,%d %dx%d (%d,%d)\n",
-                  x, y, w, h, mpDrv->Connector.cx, mpDrv->Connector.cy));
+                  x, y, w, h, mpDrv->IConnector.cx, mpDrv->IConnector.cy));
 #endif /* DEBUG_sunlover */
 
@@ -1019 +1019 @@
 
     if (uScreenId == VBOX_VIDEO_PRIMARY_SCREEN)
-        checkCoordBounds (&x, &y, &w, &h, mpDrv->Connector.cx, mpDrv->Connector.cy);
+        checkCoordBounds (&x, &y, &w, &h, mpDrv->IConnector.cx, mpDrv->IConnector.cy);
     else
         checkCoordBounds (&x, &y, &w, &h, maFramebuffers[uScreenId].w,
@@ -1947 +1947 @@
     CHECK_CONSOLE_DRV (mpDrv);
 
-    *width = mpDrv->Connector.cx;
+    *width = mpDrv->IConnector.cx;
 
     return S_OK;
@@ -1969 +1969 @@
     CHECK_CONSOLE_DRV (mpDrv);
 
-    *height = mpDrv->Connector.cy;
+    *height = mpDrv->IConnector.cy;
 
     return S_OK;
@@ -2083 +2083 @@
     ULONG width  = aWidth;
     if (!width)
-        width    = mpDrv->Connector.cx;
+        width    = mpDrv->IConnector.cx;
     ULONG height = aHeight;
     if (!height)
-        height   = mpDrv->Connector.cy;
+        height   = mpDrv->IConnector.cy;
     ULONG bpp    = aBitsPerPixel;
     if (!bpp)
@@ -2613 +2613 @@
         }
 
-        mpDrv->Connector.pu8Data = (uint8_t *) address;
-        mpDrv->Connector.cbScanline = bytesPerLine;
-        mpDrv->Connector.cBits = bitsPerPixel;
-        mpDrv->Connector.cx = width;
-        mpDrv->Connector.cy = height;
+        mpDrv->IConnector.pu8Data = (uint8_t *) address;
+        mpDrv->IConnector.cbScanline = bytesPerLine;
+        mpDrv->IConnector.cBits = bitsPerPixel;
+        mpDrv->IConnector.cx = width;
+        mpDrv->IConnector.cy = height;
     }
     else
     {
         /* black hole */
-        mpDrv->Connector.pu8Data = NULL;
-        mpDrv->Connector.cbScanline = 0;
-        mpDrv->Connector.cBits = 0;
-        mpDrv->Connector.cx = 0;
-        mpDrv->Connector.cy = 0;
+        mpDrv->IConnector.pu8Data = NULL;
+        mpDrv->IConnector.cbScanline = 0;
+        mpDrv->IConnector.cBits = 0;
+        mpDrv->IConnector.cx = 0;
+        mpDrv->IConnector.cy = 0;
     }
 }
@@ -2780 +2780 @@
                 if (!pFBInfo->pFramebuffer.isNull() && pFBInfo->u32ResizeStatus == ResizeStatus_Void)
                 {
-                    Assert(pDrv->Connector.pu8Data);
+                    Assert(pDrv->IConnector.pu8Data);
                     pDisplay->vbvaLock();
                     pDrv->pUpPort->pfnUpdateDisplay(pDrv->pUpPort);
@@ -2841 +2841 @@
                 if (!pFBInfo->pFramebuffer.isNull())
                 {
-                    Assert(pDrv->Connector.pu8Data);
+                    Assert(pDrv->IConnector.pu8Data);
                     Assert(pFBInfo->u32ResizeStatus == ResizeStatus_Void);
                     pDrv->pUpPort->pfnUpdateDisplay(pDrv->pUpPort);
@@ -3369 +3369 @@
     PPDMDRVINS pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
     PDRVMAINDISPLAY pDrv = PDMINS_2_DATA(pDrvIns, PDRVMAINDISPLAY);
-    if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
-        return &pDrvIns->IBase;
-    if (RTUuidCompare2Strs(pszIID, PDMIDISPLAYCONNECTOR_IID) == 0)
-        return &pDrv->Connector;
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pDrvIns->IBase);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIDISPLAYCONNECTOR, &pDrv->IConnector);
     return NULL;
 }
@@ -3423 +3421 @@
      * Init Interfaces.
      */
-    pDrvIns->IBase.pfnQueryInterface       = Display::drvQueryInterface;
-
-    pData->Connector.pfnResize             = Display::displayResizeCallback;
-    pData->Connector.pfnUpdateRect         = Display::displayUpdateCallback;
-    pData->Connector.pfnRefresh            = Display::displayRefreshCallback;
-    pData->Connector.pfnReset              = Display::displayResetCallback;
-    pData->Connector.pfnLFBModeChange      = Display::displayLFBModeChangeCallback;
-    pData->Connector.pfnProcessAdapterData = Display::displayProcessAdapterDataCallback;
-    pData->Connector.pfnProcessDisplayData = Display::displayProcessDisplayDataCallback;
+    pDrvIns->IBase.pfnQueryInterface        = Display::drvQueryInterface;
+
+    pData->IConnector.pfnResize             = Display::displayResizeCallback;
+    pData->IConnector.pfnUpdateRect         = Display::displayUpdateCallback;
+    pData->IConnector.pfnRefresh            = Display::displayRefreshCallback;
+    pData->IConnector.pfnReset              = Display::displayResetCallback;
+    pData->IConnector.pfnLFBModeChange      = Display::displayLFBModeChangeCallback;
+    pData->IConnector.pfnProcessAdapterData = Display::displayProcessAdapterDataCallback;
+    pData->IConnector.pfnProcessDisplayData = Display::displayProcessDisplayDataCallback;
 #ifdef VBOX_WITH_VIDEOHWACCEL
-    pData->Connector.pfnVHWACommandProcess = Display::displayVHWACommandProcess;
+    pData->IConnector.pfnVHWACommandProcess = Display::displayVHWACommandProcess;
 #endif
 #ifdef VBOX_WITH_HGSMI
-    pData->Connector.pfnVBVAEnable         = Display::displayVBVAEnable;
-    pData->Connector.pfnVBVADisable        = Display::displayVBVADisable;
-    pData->Connector.pfnVBVAUpdateBegin    = Display::displayVBVAUpdateBegin;
-    pData->Connector.pfnVBVAUpdateProcess  = Display::displayVBVAUpdateProcess;
-    pData->Connector.pfnVBVAUpdateEnd      = Display::displayVBVAUpdateEnd;
-    pData->Connector.pfnVBVAResize         = Display::displayVBVAResize;
-    pData->Connector.pfnVBVAMousePointerShape = Display::displayVBVAMousePointerShape;
+    pData->IConnector.pfnVBVAEnable         = Display::displayVBVAEnable;
+    pData->IConnector.pfnVBVADisable        = Display::displayVBVADisable;
+    pData->IConnector.pfnVBVAUpdateBegin    = Display::displayVBVAUpdateBegin;
+    pData->IConnector.pfnVBVAUpdateProcess  = Display::displayVBVAUpdateProcess;
+    pData->IConnector.pfnVBVAUpdateEnd      = Display::displayVBVAUpdateEnd;
+    pData->IConnector.pfnVBVAResize         = Display::displayVBVAResize;
+    pData->IConnector.pfnVBVAMousePointerShape = Display::displayVBVAMousePointerShape;
 #endif