Changeset 53851 in vbox

Timestamp:

Jan 16, 2015 10:03:25 AM (10 years ago)

Author:

vboxsync

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

97669

Message:

Host 3D & Main: coding style update.

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (1 diff)
• include/DisplayImpl.h (modified) (2 diffs)
• src-client/DisplayImpl.cpp (modified) (2 diffs)

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

@@ -16116 +16116 @@
     <method name="notifyScaleFactorChange">
       <desc>
-         Obtains the guest screen bitmap parameters.
+         Notify OpenGL HGCM host service about graphics content scaling factor change.
       </desc>
       <param name="screenId" type="unsigned long" dir="in"/>

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

@@ -170 +170 @@
     void i_handleCrVRecScreenshotEnd(uint32_t uScreen, uint64_t u64TimeStamp);
     void i_handleVRecCompletion();
-    virtual HRESULT notifyScaleFactorChange(ULONG uScreen, ULONG u32ScaleFactorWMultiplied, ULONG u32ScaleFactorHMultiplied);
 #endif
 
@@ -255 +254 @@
     virtual HRESULT querySourceBitmap(ULONG aScreenId,
                                       ComPtr<IDisplaySourceBitmap> &aDisplaySourceBitmap);
+    virtual HRESULT notifyScaleFactorChange(ULONG aScreenId,
+                                            ULONG aScaleFactorWMultiplied,
+                                            ULONG aScaleFactorHMultiplied);
 
     // Wrapped IEventListener properties

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

@@ -3400 +3400 @@
 }
 
-HRESULT Display::notifyScaleFactorChange(ULONG uScreen, ULONG u32ScaleFactorWMultiplied, ULONG u32ScaleFactorHMultiplied)
+HRESULT Display::notifyScaleFactorChange(ULONG aScreenId, ULONG aScaleFactorWMultiplied, ULONG aScaleFactorHMultiplied)
 {
 #if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
     HRESULT hr = E_UNEXPECTED;
 
-    if (uScreen >= mcMonitors)
+    if (aScreenId >= mcMonitors)
         return E_INVALIDARG;
 
@@ -3424 +3424 @@
                     int rc;
 
-                    pData->u32Screen                 = (uint32_t)uScreen;
-                    pData->u32ScaleFactorWMultiplied = (uint32_t)u32ScaleFactorWMultiplied;
-                    pData->u32ScaleFactorHMultiplied = (uint32_t)u32ScaleFactorHMultiplied;
+                    pData->u32Screen                 = aScreenId;
+                    pData->u32ScaleFactorWMultiplied = aScaleFactorWMultiplied;
+                    pData->u32ScaleFactorHMultiplied = aScaleFactorHMultiplied;
 
                     pCtl->Hdr.enmType              = VBOXCRCMDCTL_TYPE_HGCM;