Changeset 13836 in vbox for trunk/src/VBox/Additions/WINNT/Graphics

Timestamp:

Nov 5, 2008 2:42:54 AM (16 years ago)

Author:

vboxsync

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

38827

Message:

s/ELEMENTS/RT_ELEMENTS/g - retiring ELEMENTS (finally).

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Display

Files:

• drv.c (modified) (4 diffs)
• vrdp.c (modified) (5 diffs)
• vrdpbmp.c (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Display/drv.c

@@ -87 +87 @@
     {
         PPDEV ppdev = (PPDEV)pso->dhpdev;
-        
-        /* The screen surface has the 'pso->dhpdev' field, 
+
+        /* The screen surface has the 'pso->dhpdev' field,
          * and is either the screen device surface with handle = hsurfScreen,
          * or a surface derived from DDRAW with address equal to the framebuffer.
@@ -302 +302 @@
 
     STATPRINT;
-    
+
 #ifdef VBOX_VBVA_ADJUST_RECT
-    /* Experimental fix for too large bitmap updates. 
+    /* Experimental fix for too large bitmap updates.
      *
      * Some application do a large bitmap update event if only
@@ -312 +312 @@
      * the current framebuffer content with the source bitmap.
      *
-     * The optimization is only active when: 
+     * The optimization is only active when:
      *  - the VBVA extension is enabled;
      *  - the source bitmap is not cacheable;
@@ -597 +597 @@
             DISPDBG((1, "DrvSaveScreenBits: SS_SAVE %d\n", ppdev->cSSB));
 
-            if (ppdev->cSSB >= ELEMENTS(ppdev->aSSB))
+            if (ppdev->cSSB >= RT_ELEMENTS(ppdev->aSSB))
             {
                 /* All slots are already in use. Fail. */

trunk/src/VBox/Additions/WINNT/Graphics/Display/vrdp.c

@@ -231 +231 @@
     prcl->right  = x + w;
     prcl->bottom = y + h;
-    
+
     DISPDBG((1, "vrdpAdjustRect: result %d-%d %d-%d\n", prcl->left, prcl->right, prcl->top, prcl->bottom));
 }
@@ -1194 +1194 @@
         ULONG ulForeRGB = pboFore? vrdpColor2RGB (pso, pboFore->iSolidColor): 0;
         ULONG ulBackRGB = pboOpaque? vrdpColor2RGB (pso, pboOpaque->iSolidColor): 0;
-        
+
         DISPDBG((1, "VRDP::vrdpTextOut: calling vboxReportText fg %x bg %x\n",
                     ulForeRGB, ulBackRGB));
-                    
+
         if (!vboxReportText (ppdev, &clipRects, pstro, pfo, prclOpaque, ulForeRGB, ulBackRGB))
         {
@@ -1345 +1345 @@
 static void vrdpPolyPointsAdd (VRDPORDERPOLYPOINTS *pPoints, const VRDPORDERPOINT *ppt)
 {
-    VBVA_ASSERT(pPoints->c < ELEMENTS(pPoints->a));
+    VBVA_ASSERT(pPoints->c < RT_ELEMENTS(pPoints->a));
 
     pPoints->a[pPoints->c] = *ppt;
@@ -1517 +1517 @@
                 vrdpExtendOrderBounds (&bounds, &pt);
 
-                if (order.points.c == ELEMENTS(order.points.a))
+                if (order.points.c == RT_ELEMENTS(order.points.a))
                 {
                     /* Flush the order and start a new order. */
@@ -1538 +1538 @@
                     || ptStart.y != pt.y)
                 {
-                    VBVA_ASSERT(order.points.c < ELEMENTS(order.points.a));
+                    VBVA_ASSERT(order.points.c < RT_ELEMENTS(order.points.a));
 
                     vrdpPolyPointsAdd     (&order.points, &ptStart);

trunk/src/VBox/Additions/WINNT/Graphics/Display/vrdpbmp.c

@@ -144 +144 @@
     /* Get the free entry to be used. Try tail, that should be */
     pEntry = pCache->tail;
-    
+
     if (pEntry == NULL)
     {
@@ -221 +221 @@
 
     pCache->head = &pCache->aEntries[0];
-    pCache->tail = &pCache->aEntries[ELEMENTS(pCache->aEntries) - 1];
-
-    for (i = 0; i < ELEMENTS(pCache->aEntries); i++)
+    pCache->tail = &pCache->aEntries[RT_ELEMENTS(pCache->aEntries) - 1];
+
+    for (i = 0; i < RT_ELEMENTS(pCache->aEntries); i++)
     {
         VRDPBCENTRY *pEntry = &pCache->aEntries[i];