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

Timestamp:

Oct 8, 2010 10:23:59 AM (14 years ago)

Author:

vboxsync

Message:

Renamed VBox-VRDP interface to VRDE.

Location:

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

Files:

• vrdp.c (modified) (38 diffs)
• vrdpbmp.c (modified) (2 diffs)
• vrdptext.c (modified) (7 diffs)

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

@@ -20 +20 @@
 #include "driver.h"
 #include "vrdpbmp.h"
-#include <VBox/VRDPOrders.h>
+#include <VBox/RemoteDesktop/VRDEOrders.h>
 
 #define VRDP_MAKE_OP(__c) (__c)
@@ -372 +372 @@
     BOOL bRc = FALSE;
 
-    VRDPDATABITS bits;
+    VRDEDATABITS bits;
 
     bits.cb      = cHeight * cWidth * bytesPerPixel;
@@ -436 +436 @@
     if (bytesPerPixel > 0)
     {
-        bRc = vrdpWriteHdr (ppdev, VRDP_MAKE_OP(VRDP_ORDER_DIRTY_RECT));
+        bRc = vrdpWriteHdr (ppdev, VRDP_MAKE_OP(VRDE_ORDER_DIRTY_RECT));
 
         if (bRc)
@@ -512 +512 @@
                               const RECTL *prcl)
 {
-    VRDPORDERBOUNDS bounds;
+    VRDEORDERBOUNDS bounds;
 
     bounds.pt1.x = (int16_t)(prcl->left);
@@ -519 +519 @@
     bounds.pt2.y = (int16_t)(prcl->bottom);
 
-    return vrdpReportOrder (ppdev, &bounds, sizeof (bounds), VRDP_ORDER_BOUNDS);
+    return vrdpReportOrder (ppdev, &bounds, sizeof (bounds), VRDE_ORDER_BOUNDS);
 }
 
@@ -535 +535 @@
         for (; i < pRects->c; i++, prcl++)
         {
-            VRDPORDERREPEAT repeat;
+            VRDEORDERREPEAT repeat;
 
             repeat.bounds.pt1.x = (int16_t)(prcl->left);
@@ -542 +542 @@
             repeat.bounds.pt2.y = (int16_t)(prcl->bottom);
 
-            bRc = vrdpReportOrder (ppdev, &repeat, sizeof (repeat), VRDP_ORDER_REPEAT);
+            bRc = vrdpReportOrder (ppdev, &repeat, sizeof (repeat), VRDE_ORDER_REPEAT);
 
             if (!bRc)
@@ -556 +556 @@
 static BOOL vrdpIntersectRectWithBounds (RECTL *prclIntersect,
                                          const RECTL *prcl,
-                                         const VRDPORDERBOUNDS *pBounds)
+                                         const VRDEORDERBOUNDS *pBounds)
 {
     if (   prcl->left   < pBounds->pt2.x     /* left < bounds_right */
@@ -582 +582 @@
 static BOOL vrdpGetIntersectingRects (CLIPRECTS *pRects,
                                       const VRDPCLIPRECTS *pClipRects,
-                                      const VRDPORDERBOUNDS *pBounds)
+                                      const VRDEORDERBOUNDS *pBounds)
 {
     BOOL fReportOrder = TRUE;
@@ -663 +663 @@
 static void vrdpReportOrderGenericBounds (PPDEV ppdev,
                                           const VRDPCLIPRECTS *pClipRects,
-                                          const VRDPORDERBOUNDS *pBounds,
+                                          const VRDEORDERBOUNDS *pBounds,
                                           const void *pvOrder,
                                           unsigned cbOrder,
@@ -681 +681 @@
                                  ULONG rgb)
 {
-    VRDPORDERSOLIDRECT order;
+    VRDEORDERSOLIDRECT order;
 
     order.x     = (int16_t)prclTrg->left;
@@ -689 +689 @@
     order.rgb   = rgb;
 
-    vrdpReportOrderGeneric (ppdev, pClipRects, &order, sizeof (order), VRDP_ORDER_SOLIDRECT);
+    vrdpReportOrderGeneric (ppdev, pClipRects, &order, sizeof (order), VRDE_ORDER_SOLIDRECT);
 }
 
@@ -698 +698 @@
                                 uint8_t rop3)
 {
-    VRDPORDERSOLIDBLT order;
+    VRDEORDERSOLIDBLT order;
 
     order.x     = (int16_t)prclTrg->left;
@@ -707 +707 @@
     order.rop   = rop3;
 
-    vrdpReportOrderGeneric (ppdev, pClipRects, &order, sizeof (order), VRDP_ORDER_SOLIDBLT);
+    vrdpReportOrderGeneric (ppdev, pClipRects, &order, sizeof (order), VRDE_ORDER_SOLIDBLT);
 }
 
@@ -717 +717 @@
                               uint8_t rop3)
 {
-    VRDPORDERPATBLTBRUSH order;
+    VRDEORDERPATBLTBRUSH order;
 
     int8_t xSrc = 0;
@@ -757 +757 @@
     memcpy (order.pattern, pBrush->u.pat.au8Pattern, sizeof (order.pattern));
 
-    vrdpReportOrderGeneric (ppdev, pClipRects, &order, sizeof (order), VRDP_ORDER_PATBLTBRUSH);
+    vrdpReportOrderGeneric (ppdev, pClipRects, &order, sizeof (order), VRDE_ORDER_PATBLTBRUSH);
 }
 
@@ -765 +765 @@
                               uint8_t rop3)
 {
-    VRDPORDERDSTBLT order;
+    VRDEORDERDSTBLT order;
 
     order.x     = (int16_t)prclTrg->left;
@@ -773 +773 @@
     order.rop   = rop3;
 
-    vrdpReportOrderGeneric (ppdev, pClipRects, &order, sizeof (order), VRDP_ORDER_DSTBLT);
+    vrdpReportOrderGeneric (ppdev, pClipRects, &order, sizeof (order), VRDE_ORDER_DSTBLT);
 }
 
@@ -782 +782 @@
                                  uint8_t rop3)
 {
-    VRDPORDERSCREENBLT order;
+    VRDEORDERSCREENBLT order;
 
     order.x     = (int16_t)prclTrg->left;
@@ -792 +792 @@
     order.rop   = rop3;
 
-    vrdpReportOrderGeneric (ppdev, pClipRects, &order, sizeof (order), VRDP_ORDER_SCREENBLT);
+    vrdpReportOrderGeneric (ppdev, pClipRects, &order, sizeof (order), VRDE_ORDER_SCREENBLT);
 }
 
@@ -802 +802 @@
                                   const VRDPBCHASH *phash)
 {
-    VRDPORDERMEMBLT order;
+    VRDEORDERMEMBLT order;
 
     order.x    = (int16_t)prcl->left;
@@ -815 +815 @@
     memcpy (order.hash, phash, sizeof (*phash));
 
-    vrdpReportOrder (ppdev, &order, sizeof (order), VRDP_ORDER_MEMBLT);
+    vrdpReportOrder (ppdev, &order, sizeof (order), VRDE_ORDER_MEMBLT);
 }
 
@@ -854 +854 @@
     BOOL bRc;
 
-    VRDPORDERCACHEDBITMAP order;
+    VRDEORDERCACHEDBITMAP order;
 
     VBVA_ASSERT(sizeof (*phash) == sizeof (order.hash));
     memcpy (order.hash, phash, sizeof (*phash));
 
-    bRc = vrdpReportOrder (ppdev, &order, sizeof (order), VRDP_ORDER_CACHED_BITMAP);
+    bRc = vrdpReportOrder (ppdev, &order, sizeof (order), VRDE_ORDER_CACHED_BITMAP);
 
     if (bRc)
@@ -879 +879 @@
                                      const VRDPBCHASH *phash)
 {
-    VRDPORDERDELETEDBITMAP order;
+    VRDEORDERDELETEDBITMAP order;
 
     VBVA_ASSERT(sizeof (*phash) == sizeof (order.hash));
     memcpy (order.hash, phash, sizeof (*phash));
 
-    vrdpReportOrder (ppdev, &order, sizeof (order), VRDP_ORDER_DELETED_BITMAP);
+    vrdpReportOrder (ppdev, &order, sizeof (order), VRDE_ORDER_DELETED_BITMAP);
 }
 
@@ -1252 +1252 @@
     else
     {
-        VRDPORDERLINE order;
+        VRDEORDERLINE order;
 
         order.x1 = (int16_t)x1;
@@ -1271 +1271 @@
                     prclBounds->left, prclBounds->right, prclBounds->top, prclBounds->bottom, clipRects.rects.c));
 
-        vrdpReportOrderGeneric (ppdev, &clipRects, &order, sizeof (order), VRDP_ORDER_LINE);
+        vrdpReportOrderGeneric (ppdev, &clipRects, &order, sizeof (order), VRDE_ORDER_LINE);
     }
 }
@@ -1335 +1335 @@
 }
 
-static void vrdpPointFX2Point (const POINTFIX *pptfx, VRDPORDERPOINT *ppt)
+static void vrdpPointFX2Point (const POINTFIX *pptfx, VRDEORDERPOINT *ppt)
 {
     ppt->x = (int16_t)FXTOLROUND(pptfx->x);
@@ -1341 +1341 @@
 }
 
-static void vrdpPolyPointsAdd (VRDPORDERPOLYPOINTS *pPoints, const VRDPORDERPOINT *ppt)
+static void vrdpPolyPointsAdd (VRDEORDERPOLYPOINTS *pPoints, const VRDEORDERPOINT *ppt)
 {
     VBVA_ASSERT(pPoints->c < RT_ELEMENTS(pPoints->a));
@@ -1350 +1350 @@
 }
 
-static void vrdpExtendOrderBounds (VRDPORDERBOUNDS *pBounds, const VRDPORDERPOINT *ppt)
+static void vrdpExtendOrderBounds (VRDEORDERBOUNDS *pBounds, const VRDEORDERPOINT *ppt)
 {
     /* Bounds have inclusive pt1 and exclusive pt2. */
@@ -1434 +1434 @@
     else if (ppo->fl & PO_ELLIPSE)
     {
-        if (vboxOrderSupported (ppdev, VRDP_ORDER_ELLIPSE))
-        {
-            VRDPORDERELLIPSE order;
+        if (vboxOrderSupported (ppdev, VRDE_ORDER_ELLIPSE))
+        {
+            VRDEORDERELLIPSE order;
 
             order.pt1.x = (int16_t)FXTOLROUND(rcfxBounds.xLeft   + 4);
@@ -1447 +1447 @@
             order.rgb = vrdpColor2RGB (pso, pbo->iSolidColor);
 
-            vrdpReportOrderGeneric (ppdev, &clipRects, &order, sizeof (order), VRDP_ORDER_ELLIPSE);
+            vrdpReportOrderGeneric (ppdev, &clipRects, &order, sizeof (order), VRDE_ORDER_ELLIPSE);
         }
         else
@@ -1462 +1462 @@
         PATHDATA pd;
         BOOL bMore;
-        VRDPORDERPOLYLINE order;
-        VRDPORDERPOINT ptStart;
-        VRDPORDERBOUNDS bounds;
+        VRDEORDERPOLYLINE order;
+        VRDEORDERPOINT ptStart;
+        VRDEORDERBOUNDS bounds;
 
         order.rgb = vrdpColor2RGB (pso, pbo->iSolidColor);
@@ -1475 +1475 @@
         do {
             POINTFIX *pptfx;
-            VRDPORDERPOINT pt;
+            VRDEORDERPOINT pt;
 
             bMore = PATHOBJ_bEnum (ppo, &pd);
@@ -1520 +1520 @@
                     DISPDBG((1, "vrdpStrokePath: Report order, points overflow.\n"));
 
-                    vrdpReportOrderGenericBounds (ppdev, &clipRects, &bounds, &order, sizeof (order), VRDP_ORDER_POLYLINE);
+                    vrdpReportOrderGenericBounds (ppdev, &clipRects, &bounds, &order, sizeof (order), VRDE_ORDER_POLYLINE);
 
                     order.points.c = 0;
@@ -1550 +1550 @@
                 if (order.points.c > 0)
                 {
-                    vrdpReportOrderGenericBounds (ppdev, &clipRects, &bounds, &order, sizeof (order), VRDP_ORDER_POLYLINE);
+                    vrdpReportOrderGenericBounds (ppdev, &clipRects, &bounds, &order, sizeof (order), VRDE_ORDER_POLYLINE);
                 }
 
@@ -1727 +1727 @@
         case SS_SAVE:
         {
-            VRDPORDERSAVESCREEN order;
+            VRDEORDERSAVESCREEN order;
 
             order.pt1.x = (int16_t)prcl->left;
@@ -1737 +1737 @@
             order.restore = 0;
 
-            vrdpReportOrderGeneric (ppdev, NULL, &order, sizeof (order), VRDP_ORDER_SAVESCREEN);
+            vrdpReportOrderGeneric (ppdev, NULL, &order, sizeof (order), VRDE_ORDER_SAVESCREEN);
         } break;
 
         case SS_RESTORE:
         {
-            VRDPORDERSAVESCREEN order;
+            VRDEORDERSAVESCREEN order;
 
             order.pt1.x = (int16_t)prcl->left;
@@ -1752 +1752 @@
             order.restore = 1;
 
-            if (vrdpReportOrderGeneric (ppdev, NULL, &order, sizeof (order), VRDP_ORDER_SAVESCREEN))
+            if (vrdpReportOrderGeneric (ppdev, NULL, &order, sizeof (order), VRDE_ORDER_SAVESCREEN))
             {
                 uint8_t *pu8Bits;

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

@@ -22 +22 @@
 #include "vrdpbmp.h"
 #include <iprt/crc.h>
-#include <VBox/VRDPOrders.h>
+#include <VBox/RemoteDesktop/VRDEOrders.h>
 
 /*
@@ -211 +211 @@
     int i;
 
-    VBVA_ASSERT(sizeof (VRDPBCHASH) == sizeof (VRDPBITMAPHASH));
+    VBVA_ASSERT(sizeof (VRDPBCHASH) == sizeof (VRDEBITMAPHASH));
 
     /* Reinitialize the cache structure. */

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

@@ -19 +19 @@
 
 #include "driver.h"
-#include <VBox/VRDPOrders.h>
+#include <VBox/RemoteDesktop/VRDEOrders.h>
 #include <iprt/crc.h>
 
@@ -71 +71 @@
  *       represents a 'space' character might allow some optimizations.
  *
- * The VRDPORDERTEXT consists of the string info and glyph infos.
+ * The VRDEORDERTEXT consists of the string info and glyph infos.
  *
  */
@@ -80 +80 @@
     uint32_t cbBitmap;
 
-    VRDPORDERGLYPH *pOrder = (VRDPORDERGLYPH *)*ppu8Ptr;
+    VRDEORDERGLYPH *pOrder = (VRDEORDERGLYPH *)*ppu8Ptr;
 
     GLYPHBITS *pgb = pGlyphPos->pgdf->pgb;
@@ -124 +124 @@
 static uint32_t vboxSizeofTextOrder (ULONG cGlyphs, ULONG cbMaxGlyph)
 {
-    uint32_t cb = sizeof (VRDPORDERTEXT);
-
-    cb += cGlyphs * (sizeof (VRDPORDERGLYPH) + cbMaxGlyph);
+    uint32_t cb = sizeof (VRDEORDERTEXT);
+
+    cb += cGlyphs * (sizeof (VRDEORDERGLYPH) + cbMaxGlyph);
 
     return cb;
@@ -142 +142 @@
     FONTINFO fi;
     uint32_t cbOrderMax;
-    VRDPORDERTEXT *pOrder;
+    VRDEORDERTEXT *pOrder;
     BOOL fResult;
     uint8_t *pu8GlyphPtr;
@@ -180 +180 @@
     DISPDBG((1, "VRDP::vrdpReportText: pstro->cGlyphs = %d, fi.cjMaxGlyph1 = 0x%x, cbOrderMax = 0x%x.\n", pstro->cGlyphs, fi.cjMaxGlyph1, cbOrderMax));
 
-    pOrder = (VRDPORDERTEXT *)EngAllocMem (0, cbOrderMax, ALLOC_TAG);
+    pOrder = (VRDEORDERTEXT *)EngAllocMem (0, cbOrderMax, ALLOC_TAG);
 
     if (!pOrder)
@@ -261 +261 @@
         pOrder->cbOrder = (uint32_t)(pu8GlyphPtr - (uint8_t *)pOrder);
 
-        vrdpReportOrderGeneric (ppdev, pClipRects, pOrder, pOrder->cbOrder, VRDP_ORDER_TEXT);
+        vrdpReportOrderGeneric (ppdev, pClipRects, pOrder, pOrder->cbOrder, VRDE_ORDER_TEXT);
     }