Changeset 54828 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 18, 2015 11:43:37 AM (10 years ago)

Author:

vboxsync

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

99030

Message:

Main,Frontends: use BitmapFormat in API.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

@@ -181 +181 @@
     STDMETHOD(COMGETTER(BitsPerPixel))(ULONG *puBitsPerPixel);
     STDMETHOD(COMGETTER(BytesPerLine))(ULONG *puBytesPerLine);
-    STDMETHOD(COMGETTER(PixelFormat))(ULONG *puPixelFormat);
+    STDMETHOD(COMGETTER(PixelFormat))(BitmapFormat_T *puPixelFormat);
     STDMETHOD(COMGETTER(HeightReduction))(ULONG *puHeightReduction);
     STDMETHOD(COMGETTER(Overlay))(IFramebufferOverlay **ppOverlay);
@@ -658 +658 @@
 }
 
-STDMETHODIMP UIFrameBufferPrivate::COMGETTER(PixelFormat)(ULONG *puPixelFormat)
+STDMETHODIMP UIFrameBufferPrivate::COMGETTER(PixelFormat)(BitmapFormat_T *puPixelFormat)
 {
     if (!puPixelFormat)
         return E_POINTER;
-    *puPixelFormat = pixelFormat();
+    *puPixelFormat = (BitmapFormat_T)pixelFormat();
     return S_OK;
 }
@@ -1181 +1181 @@
         ULONG ulBitsPerPixel = 0;
         ULONG ulBytesPerLine = 0;
-        ULONG ulPixelFormat = 0;
+        KBitmapFormat bitmapFormat = KBitmapFormat_Opaque;
         m_sourceBitmap.QueryBitmapInfo(pAddress,
                                        ulWidth,
@@ -1187 +1187 @@
                                        ulBitsPerPixel,
                                        ulBytesPerLine,
-                                       ulPixelFormat);
+                                       bitmapFormat);
         Assert(ulBitsPerPixel == 32);