Changeset 53722 in vbox

Timestamp:

Jan 4, 2015 12:27:03 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

97500

Message:

Fixed some missing H()s in the graphics department. Use ptr for 'smart' pointers, not 'p'.

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (1 diff)
• src-client/ConsoleImpl2.cpp (modified) (10 diffs)

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

@@ -660 +660 @@
                                    const GraphicsControllerType_T graphicsController,
                                    BusAssignmentManager *pBusMgr,
-                                   const ComPtr<IMachine> &pMachine,
-                                   const ComPtr<IBIOSSettings> &biosSettings,
+                                   const ComPtr<IMachine> &ptrMachine,
+                                   const ComPtr<IBIOSSettings> &ptrBiosSettings,
                                    bool fHMEnabled);
     int i_configMediumAttachment(PCFGMNODE pCtlInst,

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

@@ -1553 +1553 @@
          * VGA.
          */
-        GraphicsControllerType_T graphicsController;
-        hrc = pMachine->COMGETTER(GraphicsControllerType)(&graphicsController);             H();
-        switch (graphicsController)
+        GraphicsControllerType_T enmGraphicsController;
+        hrc = pMachine->COMGETTER(GraphicsControllerType)(&enmGraphicsController);          H();
+        switch (enmGraphicsController)
         {
             case GraphicsControllerType_Null:
@@ -1563 +1563 @@
             case GraphicsControllerType_VMSVGA:
 #endif
-                rc = i_configGraphicsController(pDevices, graphicsController, pBusMgr, pMachine, biosSettings,
+                rc = i_configGraphicsController(pDevices, enmGraphicsController, pBusMgr, pMachine, biosSettings,
                                                 RT_BOOL(fHMEnabled));
                 if (FAILED(rc))
@@ -1569 +1569 @@
                 break;
             default:
-                AssertMsgFailed(("Invalid graphicsController=%d\n", graphicsController));
+                AssertMsgFailed(("Invalid graphicsController=%d\n", enmGraphicsController));
                 return VMR3SetError(pUVM, VERR_INVALID_PARAMETER, RT_SRC_POS,
-                                    N_("Invalid graphics controller type '%d'"), graphicsController);
+                                    N_("Invalid graphics controller type '%d'"), enmGraphicsController);
         }
 
@@ -3369 +3369 @@
 
 int Console::i_configGraphicsController(PCFGMNODE pDevices,
-                                        const GraphicsControllerType_T graphicsController,
+                                        const GraphicsControllerType_T enmGraphicsController,
                                         BusAssignmentManager *pBusMgr,
-                                        const ComPtr<IMachine> &pMachine,
-                                        const ComPtr<IBIOSSettings> &biosSettings,
+                                        const ComPtr<IMachine> &ptrMachine,
+                                        const ComPtr<IBIOSSettings> &ptrBiosSettings,
                                         bool fHMEnabled)
 {
@@ -3391 +3391 @@
         InsertConfigNode(pInst,    "Config", &pCfg);
         ULONG cVRamMBs;
-        hrc = pMachine->COMGETTER(VRAMSize)(&cVRamMBs);                                     H();
+        hrc = ptrMachine->COMGETTER(VRAMSize)(&cVRamMBs);                                   H();
         InsertConfigInteger(pCfg,  "VRamSize",             cVRamMBs * _1M);
         ULONG cMonitorCount;
-        hrc = pMachine->COMGETTER(MonitorCount)(&cMonitorCount);                            H();
+        hrc = ptrMachine->COMGETTER(MonitorCount)(&cMonitorCount);                          H();
         InsertConfigInteger(pCfg,  "MonitorCount",         cMonitorCount);
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
@@ -3405 +3405 @@
 
 #ifdef VBOX_WITH_VMSVGA
-        if (graphicsController == GraphicsControllerType_VMSVGA)
+        if (enmGraphicsController == GraphicsControllerType_VMSVGA)
         {
             InsertConfigInteger(pCfg, "VMSVGAEnabled", true);
@@ -3421 +3421 @@
             }
             BOOL f3DEnabled;
-            pMachine->COMGETTER(Accelerate3DEnabled)(&f3DEnabled);
+            hrc = ptrMachine->COMGETTER(Accelerate3DEnabled)(&f3DEnabled);                  H();
             InsertConfigInteger(pCfg, "VMSVGA3dEnabled", f3DEnabled);
 #endif
@@ -3433 +3433 @@
             char szExtraDataKey[sizeof("CustomVideoModeXX")];
             RTStrPrintf(szExtraDataKey, sizeof(szExtraDataKey), "CustomVideoMode%u", iMode);
-            hrc = pMachine->GetExtraData(Bstr(szExtraDataKey).raw(), bstr.asOutParam());    H();
+            hrc = ptrMachine->GetExtraData(Bstr(szExtraDataKey).raw(), bstr.asOutParam());  H();
             if (bstr.isEmpty())
                 break;
@@ -3462 +3462 @@
          */
         BOOL fFadeIn;
-        hrc = biosSettings->COMGETTER(LogoFadeIn)(&fFadeIn);                                H();
+        hrc = ptrBiosSettings->COMGETTER(LogoFadeIn)(&fFadeIn);                             H();
         InsertConfigInteger(pCfg,  "FadeIn",  fFadeIn ? 1 : 0);
         BOOL fFadeOut;
-        hrc = biosSettings->COMGETTER(LogoFadeOut)(&fFadeOut);                              H();
+        hrc = ptrBiosSettings->COMGETTER(LogoFadeOut)(&fFadeOut);                           H();
         InsertConfigInteger(pCfg,  "FadeOut", fFadeOut ? 1: 0);
         ULONG logoDisplayTime;
-        hrc = biosSettings->COMGETTER(LogoDisplayTime)(&logoDisplayTime);                   H();
+        hrc = ptrBiosSettings->COMGETTER(LogoDisplayTime)(&logoDisplayTime);                H();
         InsertConfigInteger(pCfg,  "LogoTime", logoDisplayTime);
         Bstr logoImagePath;
-        hrc = biosSettings->COMGETTER(LogoImagePath)(logoImagePath.asOutParam());           H();
+        hrc = ptrBiosSettings->COMGETTER(LogoImagePath)(logoImagePath.asOutParam());        H();
         InsertConfigString(pCfg,   "LogoFile", Utf8Str(!logoImagePath.isEmpty() ? logoImagePath : "") );
 
@@ -3479 +3479 @@
         BIOSBootMenuMode_T eBootMenuMode;
         int iShowBootMenu;
-        biosSettings->COMGETTER(BootMenuMode)(&eBootMenuMode);
+        hrc = ptrBiosSettings->COMGETTER(BootMenuMode)(&eBootMenuMode);                     H();
         switch (eBootMenuMode)
         {