儲存庫 vbox 的更動 34490

時間撮記:

2010-11-29 下午09:55:17 (14 年 以前)

作者:

vboxsync

訊息:

VBoxVideo: remove leading underscore from structure names and make VBoxVideoGuest.h C-friendly

位置:

trunk

檔案:

• include/VBox/VBoxVideo.h (修改) (46 筆差異)
• include/VBox/VBoxVideoGuest.h (修改) (3 筆差異)
• include/VBox/pdmifs.h (修改) (1 筆差異)
• src/VBox/Devices/Graphics/DevVGA_VBVA.cpp (修改) (3 筆差異)
• src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp (修改) (22 筆差異)
• src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h (修改) (11 筆差異)

trunk/include/VBox/VBoxVideo.h

@@ -131 +131 @@
 
 #pragma pack(1)
-typedef struct _VBOXVIDEOINFOHDR
+typedef struct VBOXVIDEOINFOHDR
 {
     uint8_t u8Type;
@@ -139 +139 @@
 
 
-typedef struct _VBOXVIDEOINFOLINK
+typedef struct VBOXVIDEOINFOLINK
 {
     /* Relative offset in VRAM */
@@ -147 +147 @@
 
 /* Resides in adapter info memory. Describes a display VRAM chunk. */
-typedef struct _VBOXVIDEOINFODISPLAY
+typedef struct VBOXVIDEOINFODISPLAY
 {
     /* Index of the framebuffer assigned by guest. */
@@ -170 +170 @@
 #define VBOX_VIDEO_INFO_SCREEN_F_ACTIVE 0x01
 
-typedef struct _VBOXVIDEOINFOSCREEN
+typedef struct VBOXVIDEOINFOSCREEN
 {
     /* Physical X origin relative to the primary screen. */
@@ -201 +201 @@
 #define VBOX_VIDEO_INFO_HOST_EVENTS_F_VRDP_RESET  0x00000080
 
-typedef struct _VBOXVIDEOINFOHOSTEVENTS
+typedef struct VBOXVIDEOINFOHOSTEVENTS
 {
     /* Host events. */
@@ -208 +208 @@
 
 /* Resides in adapter info memory. Describes the non-volatile VRAM heap. */
-typedef struct _VBOXVIDEOINFONVHEAP
+typedef struct VBOXVIDEOINFONVHEAP
 {
     /* Absolute offset in VRAM of the start of the heap. */
@@ -219 +219 @@
 
 /* Display information area. */
-typedef struct _VBOXVIDEOINFOVBVASTATUS
+typedef struct VBOXVIDEOINFOVBVASTATUS
 {
     /* Absolute offset in VRAM of the start of the VBVA QUEUE. 0 to disable VBVA. */
@@ -229 +229 @@
 } VBOXVIDEOINFOVBVASTATUS;
 
-typedef struct _VBOXVIDEOINFOVBVAFLUSH
+typedef struct VBOXVIDEOINFOVBVAFLUSH
 {
     uint32_t u32DataStart;
@@ -240 +240 @@
 #define VBOX_VIDEO_QCI32_OFFSCREEN_HEAP_SIZE 1
 
-typedef struct _VBOXVIDEOINFOQUERYCONF32
+typedef struct VBOXVIDEOINFOQUERYCONF32
 {
     uint32_t u32Index;
@@ -303 +303 @@
 #define VBOXVHWACMD_FLAG_HH_CMD                  0x10000000
 
-typedef struct _VBOXVHWACMD
+typedef struct VBOXVHWACMD
 {
     VBOXVHWACMD_TYPE enmCmd; /* command type */
@@ -315 +315 @@
     union
     {
-        struct _VBOXVHWACMD *pNext;
+        struct VBOXVHWACMD *pNext;
         uint32_t             offNext;
         uint64_t Data; /* the body is 64-bit aligned */
@@ -331 +331 @@
 #define VBOXVHWACMD_HEAD(_pb) ((VBOXVHWACMD*)((uint8_t *)(_pb) - RT_OFFSETOF(VBOXVHWACMD, body)))
 
-typedef struct _VBOXVHWA_RECTL
+typedef struct VBOXVHWA_RECTL
 {
     int32_t left;
@@ -339 +339 @@
 } VBOXVHWA_RECTL;
 
-typedef struct _VBOXVHWA_COLORKEY
+typedef struct VBOXVHWA_COLORKEY
 {
     uint32_t low;
@@ -345 +345 @@
 } VBOXVHWA_COLORKEY;
 
-typedef struct _VBOXVHWA_PIXELFORMAT
+typedef struct VBOXVHWA_PIXELFORMAT
 {
     uint32_t flags;
@@ -381 +381 @@
 } VBOXVHWA_PIXELFORMAT;
 
-typedef struct _VBOXVHWA_SURFACEDESC
+typedef struct VBOXVHWA_SURFACEDESC
 {
     uint32_t flags;
@@ -402 +402 @@
 } VBOXVHWA_SURFACEDESC;
 
-typedef struct _VBOXVHWA_BLTFX
+typedef struct VBOXVHWA_BLTFX
 {
     uint32_t flags;
@@ -414 +414 @@
 } VBOXVHWA_BLTFX;
 
-typedef struct _VBOXVHWA_OVERLAYFX
+typedef struct VBOXVHWA_OVERLAYFX
 {
     uint32_t flags;
@@ -535 +535 @@
 #define VBOXVHWA_OFFSET64_VOID        (UINT64_MAX)
 
-typedef struct _VBOXVHWA_VERSION
+typedef struct VBOXVHWA_VERSION
 {
     uint32_t maj;
@@ -550 +550 @@
         } while(0)
 
-typedef struct _VBOXVHWACMD_QUERYINFO1
+typedef struct VBOXVHWACMD_QUERYINFO1
 {
     union
@@ -579 +579 @@
 } VBOXVHWACMD_QUERYINFO1;
 
-typedef struct _VBOXVHWACMD_QUERYINFO2
+typedef struct VBOXVHWACMD_QUERYINFO2
 {
     uint32_t numFourCC;
@@ -587 +587 @@
 #define VBOXVHWAINFO2_SIZE(_cFourCC) RT_OFFSETOF(VBOXVHWACMD_QUERYINFO2, FourCC[_cFourCC])
 
-typedef struct _VBOXVHWACMD_SURF_CANCREATE
+typedef struct VBOXVHWACMD_SURF_CANCREATE
 {
     VBOXVHWA_SURFACEDESC SurfInfo;
@@ -605 +605 @@
 } VBOXVHWACMD_SURF_CANCREATE;
 
-typedef struct _VBOXVHWACMD_SURF_CREATE
+typedef struct VBOXVHWACMD_SURF_CREATE
 {
     VBOXVHWA_SURFACEDESC SurfInfo;
@@ -611 +611 @@
 
 #ifdef VBOX_WITH_WDDM
-typedef struct _VBOXVHWACMD_SURF_GETINFO
+typedef struct VBOXVHWACMD_SURF_GETINFO
 {
     VBOXVHWA_SURFACEDESC SurfInfo;
@@ -617 +617 @@
 #endif
 
-typedef struct _VBOXVHWACMD_SURF_DESTROY
+typedef struct VBOXVHWACMD_SURF_DESTROY
 {
     union
@@ -628 +628 @@
 } VBOXVHWACMD_SURF_DESTROY;
 
-typedef struct _VBOXVHWACMD_SURF_LOCK
+typedef struct VBOXVHWACMD_SURF_LOCK
 {
     union
@@ -643 +643 @@
 } VBOXVHWACMD_SURF_LOCK;
 
-typedef struct _VBOXVHWACMD_SURF_UNLOCK
+typedef struct VBOXVHWACMD_SURF_UNLOCK
 {
     union
@@ -657 +657 @@
 } VBOXVHWACMD_SURF_UNLOCK;
 
-typedef struct _VBOXVHWACMD_SURF_BLT
+typedef struct VBOXVHWACMD_SURF_BLT
 {
     uint64_t DstGuestSurfInfo;
@@ -680 +680 @@
 
 #ifdef VBOX_WITH_WDDM
-typedef struct _VBOXVHWACMD_SURF_COLORFILL
+typedef struct VBOXVHWACMD_SURF_COLORFILL
 {
     union
@@ -696 +696 @@
 #endif
 
-typedef struct _VBOXVHWACMD_SURF_FLIP
+typedef struct VBOXVHWACMD_SURF_FLIP
 {
     uint64_t TargGuestSurfInfo;
@@ -715 +715 @@
 } VBOXVHWACMD_SURF_FLIP;
 
-typedef struct _VBOXVHWACMD_SURF_COLORKEY_SET
+typedef struct VBOXVHWACMD_SURF_COLORKEY_SET
 {
     union
@@ -733 +733 @@
 #define VBOXVHWACMD_SURF_OVERLAY_UPDATE_F_DSTMEMRECT 0x00000002
 
-typedef struct _VBOXVHWACMD_SURF_OVERLAY_UPDATE
+typedef struct VBOXVHWACMD_SURF_OVERLAY_UPDATE
 {
     union
@@ -754 +754 @@
 }VBOXVHWACMD_SURF_OVERLAY_UPDATE;
 
-typedef struct _VBOXVHWACMD_SURF_OVERLAY_SETPOSITION
+typedef struct VBOXVHWACMD_SURF_OVERLAY_SETPOSITION
 {
     union
@@ -772 +772 @@
 } VBOXVHWACMD_SURF_OVERLAY_SETPOSITION;
 
-typedef struct _VBOXVHWACMD_HH_CONSTRUCT
+typedef struct VBOXVHWACMD_HH_CONSTRUCT
 {
     void    *pVM;
@@ -780 +780 @@
 } VBOXVHWACMD_HH_CONSTRUCT;
 
-typedef struct _VBOXVHWACMD_HH_SAVESTATE_SAVEPERFORM
+typedef struct VBOXVHWACMD_HH_SAVESTATE_SAVEPERFORM
 {
     struct SSMHANDLE * pSSM;
 } VBOXVHWACMD_HH_SAVESTATE_SAVEPERFORM;
 
-typedef struct _VBOXVHWACMD_HH_SAVESTATE_LOADPERFORM
+typedef struct VBOXVHWACMD_HH_SAVESTATE_LOADPERFORM
 {
     struct SSMHANDLE * pSSM;
@@ -814 +814 @@
 } VBVAHOSTFLAGS;
 
-typedef struct _VBVABUFFER
+typedef struct VBVABUFFER
 {
     VBVAHOSTFLAGS hostFlags;
@@ -863 +863 @@
 #define VBVAHG_DCUSTOM_VHWA_CMDCOMPLETE 1
 #pragma pack(1)
-typedef struct _VBVAHOSTCMDVHWACMDCOMPLETE
+typedef struct VBVAHOSTCMDVHWACMDCOMPLETE
 {
     uint32_t offCmd;
@@ -877 +877 @@
 }VBVAHOSTCMD_OP_TYPE;
 
-typedef struct _VBVAHOSTCMDEVENT
+typedef struct VBVAHOSTCMDEVENT
 {
     uint64_t pEvent;
@@ -883 +883 @@
 
 
-typedef struct _VBVAHOSTCMD
+typedef struct VBVAHOSTCMD
 {
     /* destination ID if >=0 specifies display index, otherwize the command is directed to the miniport */
@@ -890 +890 @@
     union
     {
-        struct _VBVAHOSTCMD *pNext;
+        struct VBVAHOSTCMD *pNext;
         uint32_t             offNext;
         uint64_t Data; /* the body is 64-bit aligned */
@@ -908 +908 @@
 #define VBOX_VBVA_CONF32_HOST_HEAP_SIZE 1
 
-typedef struct _VBVACONF32
+typedef struct VBVACONF32
 {
     uint32_t u32Index;
@@ -929 +929 @@
 } VBVAINFOVIEW;
 
-typedef struct _VBVAINFOHEAP
+typedef struct VBVAINFOHEAP
 {
     /* Absolute offset in VRAM of the start of the heap. */
@@ -939 +939 @@
 } VBVAINFOHEAP;
 
-typedef struct _VBVAFLUSH
+typedef struct VBVAFLUSH
 {
     uint32_t u32Reserved;
@@ -991 +991 @@
 #endif
 
-typedef struct _VBVAENABLE
+typedef struct VBVAENABLE
 {
     uint32_t u32Flags;
@@ -999 +999 @@
 
 #ifdef VBOXWDDM_WITH_VBVA
-typedef struct _VBVAENABLE_EX
+typedef struct VBVAENABLE_EX
 {
     VBVAENABLE Base;
@@ -1007 +1007 @@
 
 
-typedef struct _VBVAMOUSEPOINTERSHAPE
+typedef struct VBVAMOUSEPOINTERSHAPE
 {
     /* The host result. */
@@ -1060 +1060 @@
 /* the guest driver can handle video adapter IRQs */
 #define VBVACAPS_IRQ                    0x00000002
-typedef struct _VBVACAPS
+typedef struct VBVACAPS
 {
     int32_t rc;

trunk/include/VBox/VBoxVideoGuest.h

@@ -87 +87 @@
 
 
-typedef struct VBVARECORD VBVARECORD, *PVBVARECORD;
-typedef struct _VBVABUFFER VBVABUFFER, *PVBVABUFFER;
-
 /**
  * Structure grouping the context needed for sending graphics acceleration
@@ -105 +102 @@
     /** The VBVA record that we are currently preparing for the host, NULL if
      * none. */
-    VBVARECORD *pRecord;
+    struct VBVARECORD *pRecord;
     /** Pointer to the VBVA buffer mapped into the current address space.  Will
      * be NULL if VBVA is not enabled. */
-    VBVABUFFER *pVBVA;
+    struct VBVABUFFER *pVBVA;
 } VBVABUFFERCONTEXT, *PVBVABUFFERCONTEXT;
 
@@ -260 +257 @@
 RTDECL(bool) VBoxVBVAEnable(PVBVABUFFERCONTEXT pCtx,
                             PHGSMIGUESTCOMMANDCONTEXT pHGSMICtx,
-                            VBVABUFFER *pVBVA);
+                            struct VBVABUFFER *pVBVA);
 RTDECL(void) VBoxVBVADisable(PVBVABUFFERCONTEXT pCtx,
                              PHGSMIGUESTCOMMANDCONTEXT pHGSMICtx);

trunk/include/VBox/pdmifs.h

@@ -590 +590 @@
 
 
-typedef struct _VBOXVHWACMD *PVBOXVHWACMD; /**< @todo r=bird: _VBOXVHWACMD -> VBOXVHWACMD; avoid using 1 or 2 leading underscores. Also, a line what it is to make doxygen happy. */
+typedef struct VBOXVHWACMD *PVBOXVHWACMD; /**< @todo r=bird: A line what it is to make doxygen happy. */
 typedef struct VBVACMDHDR *PVBVACMDHDR;
 typedef struct VBVAINFOSCREEN *PVBVAINFOSCREEN;

trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

@@ -40 +40 @@
 #endif
 
-typedef struct _VBVAPARTIALRECORD
+typedef struct VBVAPARTIALRECORD
 {
     uint8_t *pu8;
@@ -46 +46 @@
 } VBVAPARTIALRECORD;
 
-typedef struct _VBVAVIEW
+typedef struct VBVAVIEW
 {
     VBVAINFOVIEW    view;
@@ -70 +70 @@
 
 /* @todo saved state: save and restore VBVACONTEXT */
-typedef struct _VBVACONTEXT
+typedef struct VBVACONTEXT
 {
     uint32_t cViews;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -168 +168 @@
 static bool g_bVBoxVHWASupported = false;
 
-static struct _VBOXVHWACMD * vhwaHHCmdCreate(VBOXVHWACMD_TYPE type, size_t size)
+static struct VBOXVHWACMD * vhwaHHCmdCreate(VBOXVHWACMD_TYPE type, size_t size)
 {
     char *buf = (char*)malloc(VBOXVHWACMD_SIZE_FROMBODYSIZE(size));
@@ -2130 +2130 @@
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
-int VBoxVHWAImage::vhwaSurfaceCanCreate(struct _VBOXVHWACMD_SURF_CANCREATE *pCmd)
+int VBoxVHWAImage::vhwaSurfaceCanCreate(struct VBOXVHWACMD_SURF_CANCREATE *pCmd)
 {
     VBOXQGLLOG_ENTER(("\n"));
@@ -2228 +2228 @@
 }
 
-int VBoxVHWAImage::vhwaSurfaceCreate (struct _VBOXVHWACMD_SURF_CREATE *pCmd)
+int VBoxVHWAImage::vhwaSurfaceCreate (struct VBOXVHWACMD_SURF_CREATE *pCmd)
 {
     VBOXQGLLOG_ENTER (("\n"));
@@ -2476 +2476 @@
 
 #ifdef VBOX_WITH_WDDM
-int VBoxVHWAImage::vhwaSurfaceGetInfo(struct _VBOXVHWACMD_SURF_GETINFO *pCmd)
+int VBoxVHWAImage::vhwaSurfaceGetInfo(struct VBOXVHWACMD_SURF_GETINFO *pCmd)
 {
     VBoxVHWAColorFormat format;
@@ -2504 +2504 @@
 }
 #endif
-int VBoxVHWAImage::vhwaSurfaceDestroy(struct _VBOXVHWACMD_SURF_DESTROY *pCmd)
+int VBoxVHWAImage::vhwaSurfaceDestroy(struct VBOXVHWACMD_SURF_DESTROY *pCmd)
 {
     VBoxVHWASurfaceBase *pSurf = handle2Surface(pCmd->u.in.hSurf);
@@ -2581 +2581 @@
                  (_pr)->bottom - (_pr)->top)
 
-int VBoxVHWAImage::vhwaSurfaceLock(struct _VBOXVHWACMD_SURF_LOCK *pCmd)
+int VBoxVHWAImage::vhwaSurfaceLock(struct VBOXVHWACMD_SURF_LOCK *pCmd)
 {
     VBoxVHWASurfaceBase *pSurf = handle2Surface(pCmd->u.in.hSurf);
@@ -2594 +2594 @@
 }
 
-int VBoxVHWAImage::vhwaSurfaceUnlock(struct _VBOXVHWACMD_SURF_UNLOCK *pCmd)
+int VBoxVHWAImage::vhwaSurfaceUnlock(struct VBOXVHWACMD_SURF_UNLOCK *pCmd)
 {
     VBoxVHWASurfaceBase *pSurf = handle2Surface(pCmd->u.in.hSurf);
@@ -2635 +2635 @@
 }
 
-int VBoxVHWAImage::vhwaSurfaceBlt(struct _VBOXVHWACMD_SURF_BLT *pCmd)
+int VBoxVHWAImage::vhwaSurfaceBlt(struct VBOXVHWACMD_SURF_BLT *pCmd)
 {
     Q_UNUSED(pCmd);
@@ -2641 +2641 @@
 }
 
-int VBoxVHWAImage::vhwaSurfaceFlip(struct _VBOXVHWACMD_SURF_FLIP *pCmd)
+int VBoxVHWAImage::vhwaSurfaceFlip(struct VBOXVHWACMD_SURF_FLIP *pCmd)
 {
     VBoxVHWASurfaceBase *pTargSurf = handle2Surface(pCmd->u.in.hTargSurf);
@@ -2665 +2665 @@
 }
 
-int VBoxVHWAImage::vhwaSurfaceColorFill(struct _VBOXVHWACMD_SURF_COLORFILL *pCmd)
+int VBoxVHWAImage::vhwaSurfaceColorFill(struct VBOXVHWACMD_SURF_COLORFILL *pCmd)
 {
     NOREF(pCmd);
@@ -2671 +2671 @@
 }
 
-void VBoxVHWAImage::vhwaDoSurfaceOverlayUpdate(VBoxVHWASurfaceBase *pDstSurf, VBoxVHWASurfaceBase *pSrcSurf, struct _VBOXVHWACMD_SURF_OVERLAY_UPDATE *pCmd)
+void VBoxVHWAImage::vhwaDoSurfaceOverlayUpdate(VBoxVHWASurfaceBase *pDstSurf, VBoxVHWASurfaceBase *pSrcSurf, struct VBOXVHWACMD_SURF_OVERLAY_UPDATE *pCmd)
 {
     if(pCmd->u.in.flags & VBOXVHWA_OVER_KEYDEST)
@@ -2751 +2751 @@
 }
 
-int VBoxVHWAImage::vhwaSurfaceOverlayUpdate(struct _VBOXVHWACMD_SURF_OVERLAY_UPDATE *pCmd)
+int VBoxVHWAImage::vhwaSurfaceOverlayUpdate(struct VBOXVHWACMD_SURF_OVERLAY_UPDATE *pCmd)
 {
     VBoxVHWASurfaceBase *pSrcSurf = handle2Surface(pCmd->u.in.hSrcSurf);
@@ -2818 +2818 @@
 }
 
-int VBoxVHWAImage::vhwaSurfaceOverlaySetPosition(struct _VBOXVHWACMD_SURF_OVERLAY_SETPOSITION *pCmd)
+int VBoxVHWAImage::vhwaSurfaceOverlaySetPosition(struct VBOXVHWACMD_SURF_OVERLAY_SETPOSITION *pCmd)
 {
     VBoxVHWASurfaceBase *pDstSurf = handle2Surface(pCmd->u.in.hDstSurf);
@@ -2859 +2859 @@
 }
 
-int VBoxVHWAImage::vhwaSurfaceColorkeySet(struct _VBOXVHWACMD_SURF_COLORKEY_SET *pCmd)
+int VBoxVHWAImage::vhwaSurfaceColorkeySet(struct VBOXVHWACMD_SURF_COLORKEY_SET *pCmd)
 {
     VBoxVHWASurfaceBase *pSurf = handle2Surface(pCmd->u.in.hSurf);
@@ -2894 +2894 @@
 }
 
-int VBoxVHWAImage::vhwaQueryInfo1(struct _VBOXVHWACMD_QUERYINFO1 *pCmd)
+int VBoxVHWAImage::vhwaQueryInfo1(struct VBOXVHWACMD_QUERYINFO1 *pCmd)
 {
     VBOXQGLLOG_ENTER(("\n"));
@@ -2997 +2997 @@
 }
 
-int VBoxVHWAImage::vhwaQueryInfo2(struct _VBOXVHWACMD_QUERYINFO2 *pCmd)
+int VBoxVHWAImage::vhwaQueryInfo2(struct VBOXVHWACMD_QUERYINFO2 *pCmd)
 {
     VBOXQGLLOG_ENTER(("\n"));
@@ -3507 +3507 @@
 }
 
-int VBoxVHWAImage::vhwaConstruct(struct _VBOXVHWACMD_HH_CONSTRUCT *pCmd)
+int VBoxVHWAImage::vhwaConstruct(struct VBOXVHWACMD_HH_CONSTRUCT *pCmd)
 {
 //    PVM pVM = (PVM)pCmd->pVM;
@@ -4234 +4234 @@
             case VBOXVHWA_PIPECMD_VHWA:
                 {
-                    struct _VBOXVHWACMD * pCmd = pCur->vhwaCmd();
+                    struct VBOXVHWACMD * pCmd = pCur->vhwaCmd();
                     pCmd->rc = VERR_INVALID_STATE;
                     display.CompleteVHWACommand((BYTE*)pCmd);
@@ -4286 +4286 @@
 }
 
-int VBoxQGLOverlay::onVHWACommand(struct _VBOXVHWACMD * pCmd)
+int VBoxQGLOverlay::onVHWACommand(struct VBOXVHWACMD * pCmd)
 {
     uint32_t flags = 0;
@@ -4612 +4612 @@
 }
 
-int VBoxQGLOverlay::vhwaSurfaceUnlock(struct _VBOXVHWACMD_SURF_UNLOCK *pCmd)
+int VBoxQGLOverlay::vhwaSurfaceUnlock(struct VBOXVHWACMD_SURF_UNLOCK *pCmd)
 {
     int rc = mOverlayImage.vhwaSurfaceUnlock(pCmd);
@@ -4627 +4627 @@
 void VBoxQGLOverlay::vboxDoVHWACmdExec(void *cmd)
 {
-    struct _VBOXVHWACMD * pCmd = (struct _VBOXVHWACMD *)cmd;
+    struct VBOXVHWACMD * pCmd = (struct VBOXVHWACMD *)cmd;
     switch(pCmd->enmCmd)
     {
@@ -4831 +4831 @@
 }
 
-int VBoxQGLOverlay::vhwaConstruct(struct _VBOXVHWACMD_HH_CONSTRUCT *pCmd)
+int VBoxQGLOverlay::vhwaConstruct(struct VBOXVHWACMD_HH_CONSTRUCT *pCmd)
 {
     PVM pVM = (PVM)pCmd->pVM;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h

@@ -993 +993 @@
 typedef std::list <VBoxVHWASurfaceBase*> SurfList;
 typedef std::list <VBoxVHWASurfList*> OverlayList;
-typedef std::list <struct _VBOXVHWACMD *> VHWACommandList;
+typedef std::list <struct VBOXVHWACMD *> VHWACommandList;
 
 class VBoxVHWASurfList
@@ -1184 +1184 @@
     {}
 
-    void setVHWACmd(struct _VBOXVHWACMD * pCmd)
+    void setVHWACmd(struct VBOXVHWACMD * pCmd)
     {
         mType = VBOXVHWA_PIPECMD_VHWA;
@@ -1210 +1210 @@
             break;
         case VBOXVHWA_PIPECMD_VHWA:
-            setVHWACmd((struct _VBOXVHWACMD *)pvData);
+            setVHWACmd((struct VBOXVHWACMD *)pvData);
             break;
         case VBOXVHWA_PIPECMD_FUNC:
@@ -1226 +1226 @@
     VBOXVHWA_PIPECMD_TYPE type() const {return mType;}
     const QRect & rect() const {return mRect;}
-    struct _VBOXVHWACMD * vhwaCmd() const {return u.mpCmd;}
+    struct VBOXVHWACMD * vhwaCmd() const {return u.mpCmd;}
     const VBOXVHWAFUNCCALLBACKINFO & func() const {return u.mFuncCallback; }
 
@@ -1234 +1234 @@
     union
     {
-        struct _VBOXVHWACMD * mpCmd;
+        struct VBOXVHWACMD * mpCmd;
         VBOXVHWAFUNCCALLBACKINFO mFuncCallback;
     }u;
@@ -1503 +1503 @@
     static int vhwaLoadExec(VHWACommandList * pCmdList, struct SSMHANDLE * pSSM, uint32_t u32Version);
 
-    int vhwaSurfaceCanCreate(struct _VBOXVHWACMD_SURF_CANCREATE *pCmd);
-    int vhwaSurfaceCreate(struct _VBOXVHWACMD_SURF_CREATE *pCmd);
+    int vhwaSurfaceCanCreate(struct VBOXVHWACMD_SURF_CANCREATE *pCmd);
+    int vhwaSurfaceCreate(struct VBOXVHWACMD_SURF_CREATE *pCmd);
 #ifdef VBOX_WITH_WDDM
-    int vhwaSurfaceGetInfo(struct _VBOXVHWACMD_SURF_GETINFO *pCmd);
+    int vhwaSurfaceGetInfo(struct VBOXVHWACMD_SURF_GETINFO *pCmd);
 #endif
-    int vhwaSurfaceDestroy(struct _VBOXVHWACMD_SURF_DESTROY *pCmd);
-    int vhwaSurfaceLock(struct _VBOXVHWACMD_SURF_LOCK *pCmd);
-    int vhwaSurfaceUnlock(struct _VBOXVHWACMD_SURF_UNLOCK *pCmd);
-    int vhwaSurfaceBlt(struct _VBOXVHWACMD_SURF_BLT *pCmd);
-    int vhwaSurfaceFlip(struct _VBOXVHWACMD_SURF_FLIP *pCmd);
-    int vhwaSurfaceColorFill(struct _VBOXVHWACMD_SURF_COLORFILL *pCmd);
-    int vhwaSurfaceOverlayUpdate(struct _VBOXVHWACMD_SURF_OVERLAY_UPDATE *pCmf);
-    int vhwaSurfaceOverlaySetPosition(struct _VBOXVHWACMD_SURF_OVERLAY_SETPOSITION *pCmd);
-    int vhwaSurfaceColorkeySet(struct _VBOXVHWACMD_SURF_COLORKEY_SET *pCmd);
-    int vhwaQueryInfo1(struct _VBOXVHWACMD_QUERYINFO1 *pCmd);
-    int vhwaQueryInfo2(struct _VBOXVHWACMD_QUERYINFO2 *pCmd);
-    int vhwaConstruct(struct _VBOXVHWACMD_HH_CONSTRUCT *pCmd);
+    int vhwaSurfaceDestroy(struct VBOXVHWACMD_SURF_DESTROY *pCmd);
+    int vhwaSurfaceLock(struct VBOXVHWACMD_SURF_LOCK *pCmd);
+    int vhwaSurfaceUnlock(struct VBOXVHWACMD_SURF_UNLOCK *pCmd);
+    int vhwaSurfaceBlt(struct VBOXVHWACMD_SURF_BLT *pCmd);
+    int vhwaSurfaceFlip(struct VBOXVHWACMD_SURF_FLIP *pCmd);
+    int vhwaSurfaceColorFill(struct VBOXVHWACMD_SURF_COLORFILL *pCmd);
+    int vhwaSurfaceOverlayUpdate(struct VBOXVHWACMD_SURF_OVERLAY_UPDATE *pCmf);
+    int vhwaSurfaceOverlaySetPosition(struct VBOXVHWACMD_SURF_OVERLAY_SETPOSITION *pCmd);
+    int vhwaSurfaceColorkeySet(struct VBOXVHWACMD_SURF_COLORKEY_SET *pCmd);
+    int vhwaQueryInfo1(struct VBOXVHWACMD_QUERYINFO1 *pCmd);
+    int vhwaQueryInfo2(struct VBOXVHWACMD_QUERYINFO2 *pCmd);
+    int vhwaConstruct(struct VBOXVHWACMD_HH_CONSTRUCT *pCmd);
 
     void *vramBase() { return mpvVRAM; }
@@ -1622 +1622 @@
     static int vhwaLoadVHWAEnable(VHWACommandList * pCmdList);
 
-    void vhwaDoSurfaceOverlayUpdate(VBoxVHWASurfaceBase *pDstSurf, VBoxVHWASurfaceBase *pSrcSurf, struct _VBOXVHWACMD_SURF_OVERLAY_UPDATE *pCmd);
+    void vhwaDoSurfaceOverlayUpdate(VBoxVHWASurfaceBase *pDstSurf, VBoxVHWASurfaceBase *pSrcSurf, struct VBOXVHWACMD_SURF_OVERLAY_UPDATE *pCmd);
 #endif
 
@@ -1799 +1799 @@
     void updateAttachment(QWidget *pViewport, QObject *pPostEventObject);
 
-    int onVHWACommand (struct _VBOXVHWACMD * pCommand);
+    int onVHWACommand (struct VBOXVHWACMD * pCommand);
 
     void onVHWACommandEvent (QEvent * pEvent);
@@ -1863 +1863 @@
     void vhwaSaveExec (struct SSMHANDLE * pSSM);
 private:
-    int vhwaSurfaceUnlock (struct _VBOXVHWACMD_SURF_UNLOCK *pCmd);
+    int vhwaSurfaceUnlock (struct VBOXVHWACMD_SURF_UNLOCK *pCmd);
 
     void repaintMain();
@@ -1915 +1915 @@
     VBoxVHWACommandElement * processCmdList (VBoxVHWACommandElement * pCmd, bool bFirst);
 
-    int vhwaConstruct (struct _VBOXVHWACMD_HH_CONSTRUCT *pCmd);
+    int vhwaConstruct (struct VBOXVHWACMD_HH_CONSTRUCT *pCmd);
 
     int reset();
@@ -1971 +1971 @@
     STDMETHOD(ProcessVHWACommand)(BYTE *pCommand)
     {
-        return mOverlay.onVHWACommand ((struct _VBOXVHWACMD*)pCommand);
+        return mOverlay.onVHWACommand ((struct VBOXVHWACMD*)pCommand);
     }