vbox的更動 51612 路徑 trunk/src/VBox/Main/src-client/VMMDevInterface.cpp

時間撮記:

2014-6-12 下午04:46:20 (10 年 以前)

作者:

vboxsync

訊息:

6813 Use of server side API wrapper code - ConsoleImpl.cpp

檔案:

• trunk/src/VBox/Main/src-client/VMMDevInterface.cpp (修改) (22 筆差異)

trunk/src/VBox/Main/src-client/VMMDevInterface.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -160 +160 @@
 
     /* Store that information in IGuest */
-    Guest* guest = pConsole->getGuest();
+    Guest* guest = pConsole->i_getGuest();
     AssertPtrReturnVoid(guest);
 
     guest->setAdditionsStatus((VBoxGuestFacilityType)uFacility, (VBoxGuestFacilityStatus)uStatus, fFlags, pTimeSpecTS);
-    pConsole->onAdditionsStateChange();
+    pConsole->i_onAdditionsStateChange();
 }
 
@@ -182 +182 @@
 
     /* Store that information in IGuest. */
-    Guest* pGuest = pConsole->getGuest();
+    Guest* pGuest = pConsole->i_getGuest();
     AssertPtrReturnVoid(pGuest);
 
@@ -203 +203 @@
 {
     AssertPtrReturnVoid(guestInfo);
-    
+
     PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector);
     Console *pConsole = pDrv->pVMMDev->getParent();
 
     /* Store that information in IGuest */
-    Guest* guest = pConsole->getGuest();
+    Guest* guest = pConsole->i_getGuest();
     AssertPtrReturnVoid(guest);
 
@@ -221 +221 @@
          * so that it can notify its consumers.
          */
-        pConsole->onAdditionsStateChange();
+        pConsole->i_onAdditionsStateChange();
 
         if (guestInfo->interfaceVersion < VMMDEV_VERSION)
-            pConsole->onAdditionsOutdated();
+            pConsole->i_onAdditionsOutdated();
     }
     else
@@ -239 +239 @@
         RTTimeNow(&TimeSpecTS);
         guest->setAdditionsStatus(VBoxGuestFacilityType_All, VBoxGuestFacilityStatus_Inactive, 0 /*fFlags*/, &TimeSpecTS);
-        pConsole->onAdditionsStateChange();
+        pConsole->i_onAdditionsStateChange();
     }
 }
@@ -254 +254 @@
 
     /* Store that information in IGuest. */
-    Guest *pGuest = pDrv->pVMMDev->getParent()->getGuest();
+    Guest *pGuest = pDrv->pVMMDev->getParent()->i_getGuest();
     AssertPtrReturnVoid(pGuest);
 
@@ -283 +283 @@
 
     /* store that information in IGuest */
-    Guest* pGuest = pConsole->getGuest();
+    Guest* pGuest = pConsole->i_getGuest();
     AssertPtrReturnVoid(pGuest);
 
@@ -295 +295 @@
      * so that it can notify its consumers.
      */
-    pConsole->onAdditionsStateChange();
+    pConsole->i_onAdditionsStateChange();
 }
 
@@ -316 +316 @@
      * so that it can notify its consumers.
      */
-    Mouse *pMouse = pConsole->getMouse();
+    Mouse *pMouse = pConsole->i_getMouse();
     if (pMouse)  /** @todo and if not?  Can that actually happen? */
         pMouse->i_onVMMDevGuestCapsChange(fNewCaps & VMMDEV_MOUSE_GUEST_MASK);
@@ -356 +356 @@
     if (pShape)
         ::memcpy(shapeData.raw(), pShape, cbShapeSize);
-    pConsole->onMousePointerShapeChange(fVisible, fAlpha, xHot, yHot, width, height, ComSafeArrayAsInParam(shapeData));
+    pConsole->i_onMousePointerShapeChange(fVisible, fAlpha, xHot, yHot, width, height, ComSafeArrayAsInParam(shapeData));
 }
 
@@ -364 +364 @@
     Console *pConsole = pDrv->pVMMDev->getParent();
 
-    Display *display = pConsole->getDisplay();
+    Display *display = pConsole->i_getDisplay();
 
     if (display)
@@ -379 +379 @@
     Console *pConsole = pDrv->pVMMDev->getParent();
 
-    Display *display = pConsole->getDisplay();
+    Display *display = pConsole->i_getDisplay();
 
     if (display)
@@ -400 +400 @@
 #endif
     IFramebuffer *framebuffer = NULL;
-    HRESULT hrc = pConsole->getDisplay()->QueryFramebuffer(display, &framebuffer);
+    HRESULT hrc = pConsole->i_getDisplay()->QueryFramebuffer(display, &framebuffer);
     if (SUCCEEDED(hrc) && framebuffer)
     {
@@ -424 +424 @@
         return VERR_INVALID_PARAMETER;
     IFramebuffer *framebuffer = NULL;
-    HRESULT hrc = pConsole->getDisplay()->QueryFramebuffer(0, &framebuffer);
+    HRESULT hrc = pConsole->i_getDisplay()->QueryFramebuffer(0, &framebuffer);
     if (SUCCEEDED(hrc) && framebuffer)
     {
@@ -451 +451 @@
 
     /* Forward to Display, which calls corresponding framebuffers. */
-    pConsole->getDisplay()->handleSetVisibleRegion(cRect, pRect);
+    pConsole->i_getDisplay()->handleSetVisibleRegion(cRect, pRect);
 
     return VINF_SUCCESS;
@@ -462 +462 @@
 
     /* Forward to Display, which calls corresponding framebuffers. */
-    pConsole->getDisplay()->handleQueryVisibleRegion(pcRect, pRect);
+    pConsole->i_getDisplay()->handleQueryVisibleRegion(pcRect, pRect);
 
     return VINF_SUCCESS;
@@ -485 +485 @@
 
     /* store that information in IGuest */
-    Guest* guest = pConsole->getGuest();
+    Guest* guest = pConsole->i_getGuest();
     AssertPtrReturn(guest, VERR_GENERAL_FAILURE);
 
@@ -511 +511 @@
 
     /* store that information in IGuest */
-    Guest* guest = pConsole->getGuest();
+    Guest* guest = pConsole->i_getGuest();
     AssertPtrReturn(guest, VERR_GENERAL_FAILURE);
 
@@ -537 +537 @@
 
     /* store that information in IGuest */
-    Guest* guest = pConsole->getGuest();
+    Guest* guest = pConsole->i_getGuest();
     AssertPtrReturn(guest, VERR_GENERAL_FAILURE);
 
@@ -560 +560 @@
 
     /* store that information in IGuest */
-    Guest* guest = pConsole->getGuest();
+    Guest* guest = pConsole->i_getGuest();
     AssertPtrReturn(guest, VERR_GENERAL_FAILURE);
 
@@ -574 +574 @@
 
     /** @todo r=bird: Convert from 4KB to 1KB units?
-     *        CollectorGuestHAL::getGuestMemLoad says it returns KB units to
+     *        CollectorGuestHAL::i_getGuestMemLoad says it returns KB units to
      *        preCollect().  I might be wrong ofc, this is convoluted code... */
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_PHYS_MEM_TOTAL)