Changeset 63273 in vbox for trunk/src/VBox/Additions

Timestamp:

Aug 10, 2016 2:15:31 PM (8 years ago)

Author:

vboxsync

Message:

Additions/common/VBoxGuestVideo: fix a friendly todo request, part 2.

Location:

trunk/src/VBox/Additions/common/VBoxVideo

Files:

• HGSMIBase.cpp (modified) (17 diffs)
• Modesetting.cpp (modified) (11 diffs)
• VBVABase.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp

@@ -42 +42 @@
  *                be completed
  */
-RTDECL(void) VBoxHGSMIHostCmdComplete(PHGSMIHOSTCOMMANDCONTEXT pCtx,
-                                      void *pvMem)
+DECLHIDDEN(void) VBoxHGSMIHostCmdComplete(PHGSMIHOSTCOMMANDCONTEXT pCtx,
+                                          void *pvMem)
 {
     HGSMIBUFFERHEADER *pHdr = HGSMIBufferHeaderFromData(pvMem);
@@ -87 +87 @@
 
 /** Drain the host command queue. */
-RTDECL(void) VBoxHGSMIProcessHostQueue(PHGSMIHOSTCOMMANDCONTEXT pCtx)
+DECLHIDDEN(void) VBoxHGSMIProcessHostQueue(PHGSMIHOSTCOMMANDCONTEXT pCtx)
 {
     while (pCtx->pfHostFlags->u32HostFlags & HGSMIHOSTFLAGS_COMMANDS_PENDING)
@@ -100 +100 @@
 
 /** Detect whether HGSMI is supported by the host. */
-RTDECL(bool) VBoxHGSMIIsSupported(void)
+DECLHIDDEN(bool) VBoxHGSMIIsSupported(void)
 {
     uint16_t DispiId;
@@ -123 +123 @@
  * @param  u16Op    the HGSMI command to be sent, set to the descriptor
  */
-RTDECL(void *) VBoxHGSMIBufferAlloc(PHGSMIGUESTCOMMANDCONTEXT pCtx,
-                                    HGSMISIZE cbData,
-                                    uint8_t u8Ch,
-                                    uint16_t u16Op)
+DECLHIDDEN(void *) VBoxHGSMIBufferAlloc(PHGSMIGUESTCOMMANDCONTEXT pCtx,
+                                        HGSMISIZE cbData,
+                                        uint8_t u8Ch,
+                                        uint16_t u16Op)
 {
 #ifdef VBOX_WDDM_MINIPORT
@@ -142 +142 @@
  * @param  pvBuffer  the pointer returned by @a VBoxHGSMIBufferAlloc
  */
-RTDECL(void) VBoxHGSMIBufferFree(PHGSMIGUESTCOMMANDCONTEXT pCtx,
-                                 void *pvBuffer)
+DECLHIDDEN(void) VBoxHGSMIBufferFree(PHGSMIGUESTCOMMANDCONTEXT pCtx,
+                                     void *pvBuffer)
 {
 #ifdef VBOX_WDDM_MINIPORT
@@ -159 +159 @@
  * @param  pvBuffer  the pointer returned by @a VBoxHGSMIBufferAlloc
  */
-RTDECL(int) VBoxHGSMIBufferSubmit(PHGSMIGUESTCOMMANDCONTEXT pCtx,
-                                  void *pvBuffer)
+DECLHIDDEN(int) VBoxHGSMIBufferSubmit(PHGSMIGUESTCOMMANDCONTEXT pCtx,
+                                      void *pvBuffer)
 {
     /* Initialize the buffer and get the offset for port IO. */
@@ -217 +217 @@
  *                                 VRAM.
  */
-RTDECL(int) VBoxHGSMIReportFlagsLocation(PHGSMIGUESTCOMMANDCONTEXT pCtx,
-                                         HGSMIOFFSET offLocation)
+DECLHIDDEN(int) VBoxHGSMIReportFlagsLocation(PHGSMIGUESTCOMMANDCONTEXT pCtx,
+                                             HGSMIOFFSET offLocation)
 {
     return vboxHGSMIReportFlagsLocation(pCtx, offLocation);
@@ -265 +265 @@
  * @param    fCaps                 the capabilities to report, see VBVACAPS.
  */
-RTDECL(int) VBoxHGSMISendCapsInfo(PHGSMIGUESTCOMMANDCONTEXT pCtx,
-                                  uint32_t fCaps)
+DECLHIDDEN(int) VBoxHGSMISendCapsInfo(PHGSMIGUESTCOMMANDCONTEXT pCtx,
+                                      uint32_t fCaps)
 {
     return vboxHGSMISendCapsInfo(pCtx, fCaps);
@@ -314 +314 @@
  *                              of the host flags
  */
-RTDECL(void) VBoxHGSMIGetBaseMappingInfo(uint32_t cbVRAM,
-                                         uint32_t *poffVRAMBaseMapping,
-                                         uint32_t *pcbMapping,
-                                         uint32_t *poffGuestHeapMemory,
-                                         uint32_t *pcbGuestHeapMemory,
-                                         uint32_t *poffHostFlags)
+DECLHIDDEN(void) VBoxHGSMIGetBaseMappingInfo(uint32_t cbVRAM,
+                                             uint32_t *poffVRAMBaseMapping,
+                                             uint32_t *pcbMapping,
+                                             uint32_t *poffGuestHeapMemory,
+                                             uint32_t *pcbGuestHeapMemory,
+                                             uint32_t *poffHostFlags)
 {
     AssertPtrNullReturnVoid(poffVRAMBaseMapping);
@@ -351 +351 @@
  *                                 @a pvGuestHeapMemory within the video RAM
  */
-RTDECL(int) VBoxHGSMISetupGuestContext(PHGSMIGUESTCOMMANDCONTEXT pCtx,
-                                       void *pvGuestHeapMemory,
-                                       uint32_t cbGuestHeapMemory,
-                                       uint32_t offVRAMGuestHeapMemory,
-                                       const HGSMIENV *pEnv)
+DECLHIDDEN(int) VBoxHGSMISetupGuestContext(PHGSMIGUESTCOMMANDCONTEXT pCtx,
+                                           void *pvGuestHeapMemory,
+                                           uint32_t cbGuestHeapMemory,
+                                           uint32_t offVRAMGuestHeapMemory,
+                                           const HGSMIENV *pEnv)
 {
     /** @todo should we be using a fixed ISA port value here? */
@@ -381 +381 @@
  * @param  pcbHostArea         where to store the size of the host heap area
  */
-RTDECL(void) VBoxHGSMIGetHostAreaMapping(PHGSMIGUESTCOMMANDCONTEXT pCtx,
-                                         uint32_t cbVRAM,
-                                         uint32_t offVRAMBaseMapping,
-                                         uint32_t *poffVRAMHostArea,
-                                         uint32_t *pcbHostArea)
+DECLHIDDEN(void) VBoxHGSMIGetHostAreaMapping(PHGSMIGUESTCOMMANDCONTEXT pCtx,
+                                             uint32_t cbVRAM,
+                                             uint32_t offVRAMBaseMapping,
+                                             uint32_t *poffVRAMHostArea,
+                                             uint32_t *pcbHostArea)
 {
     uint32_t offVRAMHostArea = offVRAMBaseMapping, cbHostArea = 0;
@@ -427 +427 @@
  * @param  cbHostArea         size in bytes of the host heap area
  */
-RTDECL(void) VBoxHGSMISetupHostContext(PHGSMIHOSTCOMMANDCONTEXT pCtx,
-                                       void *pvBaseMapping,
-                                       uint32_t offHostFlags,
-                                       void *pvHostAreaMapping,
-                                       uint32_t offVRAMHostArea,
-                                       uint32_t cbHostArea)
+DECLHIDDEN(void) VBoxHGSMISetupHostContext(PHGSMIHOSTCOMMANDCONTEXT pCtx,
+                                           void *pvBaseMapping,
+                                           uint32_t offHostFlags,
+                                           void *pvHostAreaMapping,
+                                           uint32_t offVRAMHostArea,
+                                           uint32_t cbHostArea)
 {
     uint8_t *pu8HostFlags = ((uint8_t *)pvBaseMapping) + offHostFlags;
@@ -456 +456 @@
  * @param  cbHostArea            size in bytes of the host heap area
  */
-RTDECL(int) VBoxHGSMISendHostCtxInfo(PHGSMIGUESTCOMMANDCONTEXT pCtx,
-                                     HGSMIOFFSET offVRAMFlagsLocation,
-                                     uint32_t fCaps,
-                                     uint32_t offVRAMHostArea,
-                                     uint32_t cbHostArea)
+DECLHIDDEN(int) VBoxHGSMISendHostCtxInfo(PHGSMIGUESTCOMMANDCONTEXT pCtx,
+                                         HGSMIOFFSET offVRAMFlagsLocation,
+                                         uint32_t fCaps,
+                                         uint32_t offVRAMHostArea,
+                                         uint32_t cbHostArea)
 {
     Log(("VBoxVideo::vboxSetupAdapterInfo\n"));
@@ -514 +514 @@
  * @param  pulValue  where to store the value of the parameter on success
  */
-RTDECL(int) VBoxQueryConfHGSMIDef(PHGSMIGUESTCOMMANDCONTEXT pCtx,
-                                  uint32_t u32Index, uint32_t u32DefValue, uint32_t *pulValue)
+DECLHIDDEN(int) VBoxQueryConfHGSMIDef(PHGSMIGUESTCOMMANDCONTEXT pCtx,
+                                      uint32_t u32Index, uint32_t u32DefValue, uint32_t *pulValue)
 {
     int rc = VINF_SUCCESS;
@@ -548 +548 @@
 }
 
-RTDECL(int) VBoxQueryConfHGSMI(PHGSMIGUESTCOMMANDCONTEXT pCtx,
-                               uint32_t u32Index, uint32_t *pulValue)
+DECLHIDDEN(int) VBoxQueryConfHGSMI(PHGSMIGUESTCOMMANDCONTEXT pCtx,
+                                   uint32_t u32Index, uint32_t *pulValue)
 {
     return VBoxQueryConfHGSMIDef(pCtx, u32Index, UINT32_MAX, pulValue);
@@ -566 +566 @@
  * @param  cbLength  size in bytes of the pixel data
  */
-RTDECL(int)  VBoxHGSMIUpdatePointerShape(PHGSMIGUESTCOMMANDCONTEXT pCtx,
-                                         uint32_t fFlags,
-                                         uint32_t cHotX,
-                                         uint32_t cHotY,
-                                         uint32_t cWidth,
-                                         uint32_t cHeight,
-                                         uint8_t *pPixels,
-                                         uint32_t cbLength)
+DECLHIDDEN(int)  VBoxHGSMIUpdatePointerShape(PHGSMIGUESTCOMMANDCONTEXT pCtx,
+                                             uint32_t fFlags,
+                                             uint32_t cHotX,
+                                             uint32_t cHotY,
+                                             uint32_t cWidth,
+                                             uint32_t cHeight,
+                                             uint8_t *pPixels,
+                                             uint32_t cbLength)
 {
     VBVAMOUSEPOINTERSHAPE *p;
@@ -642 +642 @@
  * @returns  VERR_NO_MEMORY      HGSMI heap allocation failed.
  */
-RTDECL(int) VBoxHGSMICursorPosition(PHGSMIGUESTCOMMANDCONTEXT pCtx, bool fReportPosition, uint32_t x, uint32_t y,
-                                    uint32_t *pxHost, uint32_t *pyHost)
+DECLHIDDEN(int) VBoxHGSMICursorPosition(PHGSMIGUESTCOMMANDCONTEXT pCtx, bool fReportPosition, uint32_t x, uint32_t y,
+                                        uint32_t *pxHost, uint32_t *pyHost)
 {
     int rc = VINF_SUCCESS;

trunk/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp

@@ -37 +37 @@
  * @param  pCtx  the context containing the heap to use
  */
-RTDECL(uint32_t) VBoxHGSMIGetMonitorCount(PHGSMIGUESTCOMMANDCONTEXT pCtx)
+DECLHIDDEN(uint32_t) VBoxHGSMIGetMonitorCount(PHGSMIGUESTCOMMANDCONTEXT pCtx)
 {
     /* Query the configured number of displays. */
@@ -55 +55 @@
  * @returns the size
  */
-RTDECL(uint32_t) VBoxVideoGetVRAMSize(void)
+DECLHIDDEN(uint32_t) VBoxVideoGetVRAMSize(void)
 {
     /** @note A 32bit read on this port returns the VRAM size. */
@@ -68 +68 @@
  * @returns true if any width is allowed, false otherwise.
  */
-RTDECL(bool) VBoxVideoAnyWidthAllowed(void)
+DECLHIDDEN(bool) VBoxVideoAnyWidthAllowed(void)
 {
     unsigned DispiId;
@@ -94 +94 @@
  * @param  pvData    context data for @a pfnFill
  */
-RTDECL(int) VBoxHGSMISendViewInfo(PHGSMIGUESTCOMMANDCONTEXT pCtx,
-                                  uint32_t u32Count,
-                                  PFNHGSMIFILLVIEWINFO pfnFill,
-                                  void *pvData)
+DECLHIDDEN(int) VBoxHGSMISendViewInfo(PHGSMIGUESTCOMMANDCONTEXT pCtx,
+                                      uint32_t u32Count,
+                                      PFNHGSMIFILLVIEWINFO pfnFill,
+                                      void *pvData)
 {
     int rc;
@@ -131 +131 @@
  * @param  cy          the vertical panning offset
  */
-RTDECL(void) VBoxVideoSetModeRegisters(uint16_t cWidth, uint16_t cHeight,
-                                       uint16_t cVirtWidth, uint16_t cBPP,
-                                       uint16_t fFlags, uint16_t cx,
-                                       uint16_t cy)
+DECLHIDDEN(void) VBoxVideoSetModeRegisters(uint16_t cWidth, uint16_t cHeight,
+                                           uint16_t cVirtWidth, uint16_t cBPP,
+                                           uint16_t fFlags, uint16_t cx,
+                                           uint16_t cy)
 {
     /* set the mode characteristics */
@@ -175 +175 @@
  * @param  pfFlags      where to store the flags for the mode
  */
-RTDECL(bool) VBoxVideoGetModeRegisters(uint16_t *pcWidth, uint16_t *pcHeight,
-                                       uint16_t *pcVirtWidth, uint16_t *pcBPP,
-                                       uint16_t *pfFlags)
+DECLHIDDEN(bool) VBoxVideoGetModeRegisters(uint16_t *pcWidth, uint16_t *pcHeight,
+                                           uint16_t *pcVirtWidth, uint16_t *pcBPP,
+                                           uint16_t *pfFlags)
 {
     uint16_t fFlags;
@@ -217 +217 @@
  * Disable our extended graphics mode and go back to VGA mode.
  */
-RTDECL(void) VBoxVideoDisableVBE(void)
+DECLHIDDEN(void) VBoxVideoDisableVBE(void)
 {
     VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX,
@@ -240 +240 @@
  * @param  cBPP      the colour depth of the mode
  */
-RTDECL(void) VBoxHGSMIProcessDisplayInfo(PHGSMIGUESTCOMMANDCONTEXT pCtx,
-                                         uint32_t cDisplay,
-                                         int32_t  cOriginX,
-                                         int32_t  cOriginY,
-                                         uint32_t offStart,
-                                         uint32_t cbPitch,
-                                         uint32_t cWidth,
-                                         uint32_t cHeight,
-                                         uint16_t cBPP,
-                                         uint16_t fFlags)
+DECLHIDDEN(void) VBoxHGSMIProcessDisplayInfo(PHGSMIGUESTCOMMANDCONTEXT pCtx,
+                                             uint32_t cDisplay,
+                                             int32_t  cOriginX,
+                                             int32_t  cOriginY,
+                                             uint32_t offStart,
+                                             uint32_t cbPitch,
+                                             uint32_t cWidth,
+                                             uint32_t cHeight,
+                                             uint16_t cBPP,
+                                             uint16_t fFlags)
 {
     /* Issue the screen info command. */
@@ -293 +293 @@
  * @returns  VERR_NO_MEMORY      HGSMI heap allocation failed.
  */
-RTDECL(int)      VBoxHGSMIUpdateInputMapping(PHGSMIGUESTCOMMANDCONTEXT pCtx, int32_t  cOriginX, int32_t  cOriginY,
-                                             uint32_t cWidth, uint32_t cHeight)
+DECLHIDDEN(int)      VBoxHGSMIUpdateInputMapping(PHGSMIGUESTCOMMANDCONTEXT pCtx, int32_t  cOriginX, int32_t  cOriginY,
+                                                 uint32_t cWidth, uint32_t cHeight)
 {
     int rc = VINF_SUCCESS;
@@ -331 +331 @@
  * @returns  VERR_NOT_SUPPORTED  Host does not support this command.
  */
-RTDECL(int) VBoxHGSMIGetModeHints(PHGSMIGUESTCOMMANDCONTEXT pCtx,
-                                  unsigned cScreens, VBVAMODEHINT *paHints)
+DECLHIDDEN(int) VBoxHGSMIGetModeHints(PHGSMIGUESTCOMMANDCONTEXT pCtx,
+                                      unsigned cScreens, VBVAMODEHINT *paHints)
 {
     int rc;
@@ -370 +370 @@
  * @param  pCtx  the context containing the heap to use
  */
-RTDECL(uint16_t) VBoxHGSMIGetScreenFlags(PHGSMIGUESTCOMMANDCONTEXT pCtx)
+DECLHIDDEN(uint16_t) VBoxHGSMIGetScreenFlags(PHGSMIGUESTCOMMANDCONTEXT pCtx)
 {
     uint32_t u32Flags = 0;

trunk/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp

@@ -98 +98 @@
  * Public hardware buffer methods.
  */
-RTDECL(bool) VBoxVBVAEnable(PVBVABUFFERCONTEXT pCtx,
-                            PHGSMIGUESTCOMMANDCONTEXT pHGSMICtx,
-                            VBVABUFFER *pVBVA, int32_t cScreen)
+DECLHIDDEN(bool) VBoxVBVAEnable(PVBVABUFFERCONTEXT pCtx,
+                                PHGSMIGUESTCOMMANDCONTEXT pHGSMICtx,
+                                VBVABUFFER *pVBVA, int32_t cScreen)
 {
     bool bRc = false;
@@ -137 +137 @@
 }
 
-RTDECL(void) VBoxVBVADisable(PVBVABUFFERCONTEXT pCtx,
-                             PHGSMIGUESTCOMMANDCONTEXT pHGSMICtx,
-                             int32_t cScreen)
+DECLHIDDEN(void) VBoxVBVADisable(PVBVABUFFERCONTEXT pCtx,
+                                 PHGSMIGUESTCOMMANDCONTEXT pHGSMICtx,
+                                 int32_t cScreen)
 {
     LogFlowFunc(("\n"));
@@ -152 +152 @@
 }
 
-RTDECL(bool) VBoxVBVABufferBeginUpdate(PVBVABUFFERCONTEXT pCtx,
-                                       PHGSMIGUESTCOMMANDCONTEXT pHGSMICtx)
+DECLHIDDEN(bool) VBoxVBVABufferBeginUpdate(PVBVABUFFERCONTEXT pCtx,
+                                           PHGSMIGUESTCOMMANDCONTEXT pHGSMICtx)
 {
     bool bRc = false;
@@ -202 +202 @@
 }
 
-RTDECL(void) VBoxVBVABufferEndUpdate(PVBVABUFFERCONTEXT pCtx)
+DECLHIDDEN(void) VBoxVBVABufferEndUpdate(PVBVABUFFERCONTEXT pCtx)
 {
     VBVARECORD *pRecord;
@@ -357 +357 @@
  * Public writer to the hardware buffer.
  */
-RTDECL(bool) VBoxVBVAWrite(PVBVABUFFERCONTEXT pCtx,
-                           PHGSMIGUESTCOMMANDCONTEXT pHGSMICtx,
-                           const void *pv, uint32_t cb)
+DECLHIDDEN(bool) VBoxVBVAWrite(PVBVABUFFERCONTEXT pCtx,
+                               PHGSMIGUESTCOMMANDCONTEXT pHGSMICtx,
+                               const void *pv, uint32_t cb)
 {
     return vboxHwBufferWrite (pCtx, pHGSMICtx, pv, cb);
 }
 
-RTDECL(bool) VBoxVBVAOrderSupported(PVBVABUFFERCONTEXT pCtx, unsigned code)
+DECLHIDDEN(bool) VBoxVBVAOrderSupported(PVBVABUFFERCONTEXT pCtx, unsigned code)
 {
     VBVABUFFER *pVBVA = pCtx->pVBVA;
@@ -381 +381 @@
 }
 
-RTDECL(void) VBoxVBVASetupBufferContext(PVBVABUFFERCONTEXT pCtx,
-                                        uint32_t offVRAMBuffer,
-                                        uint32_t cbBuffer)
+DECLHIDDEN(void) VBoxVBVASetupBufferContext(PVBVABUFFERCONTEXT pCtx,
+                                            uint32_t offVRAMBuffer,
+                                            uint32_t cbBuffer)
 {
     pCtx->offVRAMBuffer = offVRAMBuffer;