Changeset 18511 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Mar 29, 2009 3:09:25 AM (16 years ago)

Author:

vboxsync

Message:

vrdptext.c: size_t warning.

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Display/vrdptext.c (modified) (11 diffs)

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

@@ -78 +78 @@
  *
  */
- 
+
 static BOOL vboxReportGlyph (GLYPHPOS *pGlyphPos, uint8_t **ppu8Ptr, uint8_t *pu8End)
 {
     uint32_t cbOrder;
     uint32_t cbBitmap;
-    
+
     VRDPORDERGLYPH *pOrder = (VRDPORDERGLYPH *)*ppu8Ptr;
-    
+
     GLYPHBITS *pgb = pGlyphPos->pgdf->pgb;
-    
+
     /* BYTE-aligned 1BPP bitmap of the glyph. The array includes padding at the end to DWORD-align. */
     cbBitmap = (pgb->sizlBitmap.cx + 7) / 8; /* Line size in bytes. */
     cbBitmap *= pgb->sizlBitmap.cy;          /* Size of bitmap. */
     cbBitmap = (cbBitmap + 3) & ~3;          /* DWORD align. */
-    
-    cbOrder = (uint8_t *)&pOrder->au8Bitmap - (uint8_t *)pOrder;
-    
+
+    cbOrder = (uint32_t)((uint8_t *)&pOrder->au8Bitmap - (uint8_t *)pOrder);
+
     cbOrder += cbBitmap;
-    
+
     if (*ppu8Ptr + cbOrder > pu8End)
     {
         return FALSE;
     }
-    
+
     pOrder->o32NextGlyph = cbOrder;
-    
+
     pOrder->u64Handle = RTCrc64Start ();
     pOrder->u64Handle = RTCrc64Process(pOrder->u64Handle, pgb->aj, cbBitmap);
     pOrder->u64Handle = RTCrc64Process(pOrder->u64Handle, &pgb->ptlOrigin, sizeof (pgb->ptlOrigin));
     pOrder->u64Handle = RTCrc64Finish(pOrder->u64Handle);
-    
+
     pOrder->x = (int16_t)pGlyphPos->ptl.x;
     pOrder->y = (int16_t)pGlyphPos->ptl.y;
-    
+
     pOrder->w = (uint16_t)pgb->sizlBitmap.cx;
     pOrder->h = (uint16_t)pgb->sizlBitmap.cy;
@@ -117 +117 @@
     pOrder->xOrigin = (int16_t)pgb->ptlOrigin.x;
     pOrder->yOrigin = (int16_t)pgb->ptlOrigin.y;
-    
+
     /* 1BPP bitmap. Rows are byte aligned. Size is (((w + 7)/8) * h + 3) & ~3. */
     memcpy (pOrder->au8Bitmap, pgb->aj, cbBitmap);
-    
+
     *ppu8Ptr += cbOrder;
-    
+
     return TRUE;
 }
@@ -129 +129 @@
 {
     uint32_t cb = sizeof (VRDPORDERTEXT);
-    
+
     cb += cGlyphs * (sizeof (VRDPORDERGLYPH) + cbMaxGlyph);
-    
+
     return cb;
 }
@@ -150 +150 @@
     uint8_t *pu8GlyphPtr;
     uint8_t *pu8GlyphEnd;
-    
+
     DISPDBG((1, "VRDP::vrdpReportText: ppdev %p, pClipRects %p, pstro %p, pfo %p, prclOpaque %p, ulForeRGB %x, ulBackRGB %x\n",
                 ppdev, pClipRects, pstro, pfo, prclOpaque, ulForeRGB, ulBackRGB));
-    
+
     if (pstro->ulCharInc > 0xFF)
     {
@@ -169 +169 @@
 
     memset (&fi, 0, sizeof (fi));
-    
+
     FONTOBJ_vGetInfo (pfo, sizeof (fi), &fi);
-    
+
     if (   fi.cjMaxGlyph1 == 0
         || fi.cjMaxGlyph1 > VRDP_TEXT_MAX_GLYPH_SIZE)
@@ -179 +179 @@
         return FALSE;
     }
-    
+
     cbOrderMax = vboxSizeofTextOrder (pstro->cGlyphs, fi.cjMaxGlyph1);
-    
+
     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);
-    
+
     if (!pOrder)
     {
@@ -191 +191 @@
         return FALSE;
     }
-    
+
     pu8GlyphPtr = (uint8_t *)&pOrder[1]; /* Follows the order header. */
     pu8GlyphEnd = (uint8_t *)pOrder + cbOrderMax;
-    
+
     pOrder->xBkGround = (int16_t)pstro->rclBkGround.left;
     pOrder->yBkGround = (int16_t)pstro->rclBkGround.top;
@@ -214 +214 @@
         pOrder->hOpaque = 0;
     }
-    
+
     pOrder->u16MaxGlyph = (uint16_t)fi.cjMaxGlyph1;
-    
+
     pOrder->u8Glyphs = (uint8_t)pstro->cGlyphs;
-    
+
     pOrder->u8Flags = (uint8_t)pstro->flAccel;
-    
+
     pOrder->u8CharInc = (uint8_t)pstro->ulCharInc;
-    
+
     pOrder->u32FgRGB = ulForeRGB;
     pOrder->u32BgRGB = ulBackRGB;
-    
+
     DISPDBG((1, "VRDP::vrdpReportText: pstro->pgp %p.\n", pstro->pgp));
-    
+
     /* Enumerate glyphs. */
     STROBJ_vEnumStart (pstro);
-    
+
     fResult = TRUE;
-    
+
     for (;;)
     {
@@ -238 +238 @@
         ULONG cGlyphs = 0;
         GLYPHPOS *pGlyphPos = NULL;
-        
+
         BOOL fMore = STROBJ_bEnum (pstro, &cGlyphs, &pGlyphPos);
-        
+
         DISPDBG((1, "VRDP::vrdpReportText: cGlyphs %d.\n", cGlyphs));
-    
+
         for (i = 0; i < cGlyphs; i++)
         {
             fResult = vboxReportGlyph (&pGlyphPos[i], &pu8GlyphPtr, pu8GlyphEnd);
-            
+
             if (!fResult)
             {
@@ -252 +252 @@
             }
         }
-        
+
         if (!fMore || !fResult)
         {
@@ -260 +260 @@
 
     DISPDBG((1, "VRDP::vrdpReportText: fResult %d.\n", fResult));
-    
+
     if (fResult)
     {
-        pOrder->cbOrder = pu8GlyphPtr - (uint8_t *)pOrder;
+        pOrder->cbOrder = (uint32_t)(pu8GlyphPtr - (uint8_t *)pOrder);
 
         vrdpReportOrderGeneric (ppdev, pClipRects, pOrder, pOrder->cbOrder, VRDP_ORDER_TEXT);
     }
-    
+
     EngFreeMem (pOrder);
-    
+
     return fResult;
 }