Update to use the new QXL type instead of the Spice ones

7 files changed, 50 insertions, 50 deletions

diff --git a/display/brush.c b/display/brush.c
index d69cb76..df881f2 100644
--- a/display/brush.c
+++ b/display/brush.c
@@ -316,11 +316,11 @@ BOOL APIENTRY DrvRealizeBrush(BRUSHOBJ *brush, SURFOBJ *target, SURFOBJ *pattern
 
 static _inline BOOL GetPattern(PDev *pdev, QXLDrawable *drawable, QXLPHYSICAL *pattern,
                                InternalBrush *brush, INT32 *surface_dest,
-                               SpiceRect *surface_rect)
+                               QXLRect *surface_rect)
 {
     HSURF hsurf;
     SURFOBJ *surf_obj;
-    SpiceRect area;
+    QXLRect area;
     UINT32 key;
 
     DEBUG_PRINT((pdev, 12, "%s\n", __FUNCTION__));
@@ -363,9 +363,9 @@ error_1:
 }
 
 
-BOOL QXLGetBrush(PDev *pdev, QXLDrawable *drawable, SpiceBrush *qxl_brush,
+BOOL QXLGetBrush(PDev *pdev, QXLDrawable *drawable, QXLBrush *qxl_brush,
                  BRUSHOBJ *brush, POINTL *brush_pos, INT32 *surface_dest,
-                 SpiceRect *surface_rect)
+                 QXLRect *surface_rect)
 {
     DEBUG_PRINT((pdev, 9, "%s\n", __FUNCTION__));
     ASSERT(pdev, brush);
diff --git a/display/driver.c b/display/driver.c
index 89814e5..6adee0b 100644
--- a/display/driver.c
+++ b/display/driver.c
@@ -1120,7 +1120,7 @@ FIX FlotaToFixed(FLOATL val, FLOATL scale)
     return ret;
 }
 
-static BOOL GetGeometricAttr(PDev *pdev, QXLDrawable *drawable, SpiceLineAttr *q_line_attr,
+static BOOL GetGeometricAttr(PDev *pdev, QXLDrawable *drawable, QXLLineAttr *q_line_attr,
                             LINEATTRS *line_attr, XFORMOBJ *width_transform)
 {
     ULONG save_buf_size;
@@ -1213,7 +1213,7 @@ err1:
     return FALSE;
 }
 
-static BOOL GetCosmeticAttr(PDev *pdev, QXLDrawable *drawable, SpiceLineAttr *q_line_attr,
+static BOOL GetCosmeticAttr(PDev *pdev, QXLDrawable *drawable, QXLLineAttr *q_line_attr,
                             LINEATTRS *line_attr)
 {
     ASSERT(pdev, LINE_CAP_ROUND == ENDCAP_ROUND && LINE_CAP_SQUARE == ENDCAP_SQUARE &&
diff --git a/display/qxldd.h b/display/qxldd.h
index f1623d1..3ac3139 100644
--- a/display/qxldd.h
+++ b/display/qxldd.h
@@ -270,7 +270,7 @@ typedef struct PDev {
     UINT32 *dev_update_id;
 
     UINT32 update_area_port;
-    SpiceRect *update_area;
+    QXLRect *update_area;
     UINT32 *update_surface;
 
     UINT32 *mm_clock;
diff --git a/display/res.c b/display/res.c
index 8c0f39d..8a23f70 100644
--- a/display/res.c
+++ b/display/res.c
@@ -697,7 +697,7 @@ static void FreePath(PDev *pdev, Resource *res)
 
 #define PATH_PREALLOC_PONTS 20
 #define PATH_MAX_ALLOC_PONTS 128
-#define PATH_ALLOC_SIZE (sizeof(Resource) + sizeof(QXLPath) + sizeof(SpicePathSeg) +\
+#define PATH_ALLOC_SIZE (sizeof(Resource) + sizeof(QXLPath) + sizeof(QXLPathSeg) +\
                          sizeof(POINTFIX) * PATH_PREALLOC_PONTS)
 
 
@@ -716,22 +716,22 @@ static void __GetPathCommon(PDev *pdev, PATHOBJ *path, QXLDataChunk **chunk_ptr,
     do {
         int pt_buf_size;
         UINT8 *pt_buf;
-        SpicePathSeg *seg;
+        QXLPathSeg *seg;
 
         more = PATHOBJ_bEnum(path, &data);
         if (data.count == 0) {
             break;
         }
 
-        if (end - now < sizeof(SpicePathSeg)) {
+        if (end - now < sizeof(QXLPathSeg)) {
             size_t alloc_size = MIN(data.count << 3, sizeof(POINTFIX) * PATH_MAX_ALLOC_PONTS);
-            alloc_size += sizeof(SpicePathSeg);
+            alloc_size += sizeof(QXLPathSeg);
             NEW_DATA_CHUNK(page_counter, alloc_size);
         }
-        seg = (SpicePathSeg*)now;
+        seg = (QXLPathSeg*)now;
         seg->flags = data.flags;
         seg->count = data.count;
-        now = seg->data;
+        now = (UINT8 *)seg->points;
         chunk->data_size += sizeof(*seg);
         *data_size +=  sizeof(*seg);
         pt_buf_size = data.count << 3;
@@ -832,17 +832,17 @@ static void FreeClipRects(PDev *pdev, Resource *res)
 
 #define RECTS_NUM_PREALLOC 8
 #define RECTS_ALLOC_SIZE (sizeof(Resource) + sizeof(QXLClipRects) + \
-                          sizeof(SpiceRect) * RECTS_NUM_PREALLOC)
+                          sizeof(QXLRect) * RECTS_NUM_PREALLOC)
 #define RECTS_NUM_ALLOC 20
-#define RECTS_CHUNK_ALLOC_SIZE (sizeof(QXLDataChunk) + sizeof(SpiceRect) * RECTS_NUM_ALLOC)
+#define RECTS_CHUNK_ALLOC_SIZE (sizeof(QXLDataChunk) + sizeof(QXLRect) * RECTS_NUM_ALLOC)
 
 static Resource *GetClipRects(PDev *pdev, CLIPOBJ *clip)
 {
     Resource *res;
     QXLClipRects *rects;
     QXLDataChunk *chunk;
-    SpiceRect *dest;
-    SpiceRect *dest_end;
+    QXLRect *dest;
+    QXLRect *dest_end;
     int more;
 
     DEBUG_PRINT((pdev, 12, "%s\n", __FUNCTION__));
@@ -858,7 +858,7 @@ static Resource *GetClipRects(PDev *pdev, CLIPOBJ *clip)
     chunk->prev_chunk = 0;
     chunk->next_chunk = 0;
 
-    dest = (SpiceRect *)chunk->data;
+    dest = (QXLRect *)chunk->data;
     dest_end = dest + ((RECTS_ALLOC_SIZE - sizeof(Resource) - sizeof(QXLClipRects)) >> 4);
 
     CLIPOBJ_cEnumStart(clip, TRUE, CT_RECTANGLES, CD_RIGHTDOWN, 0);
@@ -881,11 +881,11 @@ static Resource *GetClipRects(PDev *pdev, CLIPOBJ *clip)
                 chunk = (QXLDataChunk *)page;
                 chunk->data_size = 0;
                 chunk->next_chunk = 0;
-                dest = (SpiceRect *)chunk->data;
+                dest = (QXLRect *)chunk->data;
                 dest_end = dest + RECTS_NUM_ALLOC;
             }
             CopyRect(dest, now);
-            chunk->data_size += sizeof(SpiceRect);
+            chunk->data_size += sizeof(QXLRect);
         }
     } while (more);
     DEBUG_PRINT((pdev, 13, "%s: done, num_rects %d\n", __FUNCTION__, rects->num_rects));
@@ -907,15 +907,15 @@ static BOOL SetClip(PDev *pdev, CLIPOBJ *clip, QXLDrawable *drawable)
     if (clip->iDComplexity == DC_RECT) {
         QXLClipRects *rects;
         rects_res = (Resource *)AllocMem(pdev, sizeof(Resource) + sizeof(QXLClipRects) +
-                                         sizeof(SpiceRect));
+                                         sizeof(QXLRect));
         rects_res->refs = 1;
         rects_res->free = FreeClipRects;
         rects = (QXLClipRects *)rects_res->res;
         rects->num_rects = 1;
-        rects->chunk.data_size = sizeof(SpiceRect);
+        rects->chunk.data_size = sizeof(QXLRect);
         rects->chunk.prev_chunk = 0;
         rects->chunk.next_chunk = 0;
-        CopyRect((SpiceRect *)rects->chunk.data, &clip->rclBounds);
+        CopyRect((QXLRect *)rects->chunk.data, &clip->rclBounds);
     } else {
       rects_res = GetClipRects(pdev, clip);
     }
@@ -1978,7 +1978,7 @@ static int rgb32_data_has_alpha(int width, int height, int stride,
 }
 
 BOOL QXLGetBitmap(PDev *pdev, QXLDrawable *drawable, QXLPHYSICAL *image_phys, SURFOBJ *surf,
-                  SpiceRect *area, XLATEOBJ *color_trans, UINT32 *hash_key, BOOL use_cache,
+                  QXLRect *area, XLATEOBJ *color_trans, UINT32 *hash_key, BOOL use_cache,
                   INT32 *surface_dest)
 {
     Resource *image_res;
@@ -2137,7 +2137,7 @@ BOOL QXLGetBitmap(PDev *pdev, QXLDrawable *drawable, QXLPHYSICAL *image_phys, SU
 }
 
 BOOL QXLGetAlphaBitmap(PDev *pdev, QXLDrawable *drawable, QXLPHYSICAL *image_phys,
-                       SURFOBJ *surf, SpiceRect *area, INT32 *surface_dest)
+                       SURFOBJ *surf, QXLRect *area, INT32 *surface_dest)
 {
     Resource *image_res;
     InternalImage *internal;
@@ -2276,10 +2276,10 @@ BOOL QXLGetBitsFromCache(PDev *pdev, QXLDrawable *drawable, UINT32 hash_key, QXL
     return FALSE;
 }
 
-BOOL QXLGetMask(PDev *pdev, QXLDrawable *drawable, SpiceQMask *qxl_mask, SURFOBJ *mask, POINTL *pos,
+BOOL QXLGetMask(PDev *pdev, QXLDrawable *drawable, QXLQMask *qxl_mask, SURFOBJ *mask, POINTL *pos,
                 BOOL invers, LONG width, LONG height, INT32 *surface_dest)
 {
-    SpiceRect area;
+    QXLRect area;
 
     if (!mask) {
         qxl_mask->bitmap = 0;
@@ -2398,7 +2398,7 @@ void UpdateArea(PDev *pdev, RECTL *area, UINT32 surface_id)
 
 static _inline void add_rast_glyphs(PDev *pdev, QXLString *str, ULONG count, GLYPHPOS *glyps,
                                     QXLDataChunk **chunk_ptr, UINT8 **now_ptr,
-                                    UINT8 **end_ptr, int bpp, POINTL *delta, SpicePoint **str_pos)
+                                    UINT8 **end_ptr, int bpp, POINTL *delta, QXLPoint **str_pos)
 {
     GLYPHPOS *glyps_end = glyps + count;
     QXLDataChunk *chunk = *chunk_ptr;
@@ -2425,7 +2425,7 @@ static _inline void add_rast_glyphs(PDev *pdev, QXLString *str, ULONG count, GLY
                 glyph->render_pos.x = glyps->ptl.x;
                 glyph->render_pos.y = glyps->ptl.y;
             }
-            *str_pos = &glyph->render_pos;
+            *str_pos = (QXLPoint *)&glyph->render_pos;
         } else {
             glyph->render_pos.x = glyps->ptl.x;
             glyph->render_pos.y = glyps->ptl.y;
@@ -2470,7 +2470,7 @@ static _inline void add_rast_glyphs(PDev *pdev, QXLString *str, ULONG count, GLY
 
 static _inline void add_vec_glyphs(PDev *pdev, QXLString *str, ULONG count, GLYPHPOS *glyps,
                                    QXLDataChunk **chunk_ptr, UINT8 **now_ptr, UINT8 **end_ptr,
-                                   POINTL *delta, SpicePoint  **str_pos)
+                                   POINTL *delta, QXLPoint  **str_pos)
 {
     GLYPHPOS *glyps_end = glyps + count;
     QXLDataChunk *chunk = *chunk_ptr;
@@ -2498,7 +2498,7 @@ static _inline void add_vec_glyphs(PDev *pdev, QXLString *str, ULONG count, GLYP
                 glyph->render_pos.x = glyps->ptl.x;
                 glyph->render_pos.y = glyps->ptl.y;
             }
-            *str_pos = &glyph->render_pos;
+            *str_pos = (QXLPoint *)&glyph->render_pos;
         } else {
             glyph->render_pos.x = glyps->ptl.x;
             glyph->render_pos.y = glyps->ptl.y;
@@ -2517,7 +2517,7 @@ static _inline void add_vec_glyphs(PDev *pdev, QXLString *str, ULONG count, GLYP
 
 static _inline BOOL add_glyphs(PDev *pdev, QXLString *str, ULONG count, GLYPHPOS *glyps,
                                QXLDataChunk **chunk, UINT8 **now, UINT8 **end, POINTL *delta,
-                               SpicePoint  **str_pos)
+                               QXLPoint  **str_pos)
 {
     if (str->flags & SPICE_STRING_FLAGS_RASTER_A1) {
         add_rast_glyphs(pdev, str, count, glyps, chunk, now, end, 1, delta, str_pos);
@@ -2564,7 +2564,7 @@ BOOL QXLGetStr(PDev *pdev, QXLDrawable *drawable, QXLPHYSICAL *str_phys, FONTOBJ
     static int id_QXLGetStr = 0;
     POINTL  delta;
     POINTL  *delta_ptr;
-    SpicePoint  *str_pos;
+    QXLPoint  *str_pos;
 
     DEBUG_PRINT((pdev, 9, "%s\n", __FUNCTION__));
 
diff --git a/display/res.h b/display/res.h
index 90223ae..3bfb0c7 100644
--- a/display/res.h
+++ b/display/res.h
@@ -32,17 +32,17 @@ void QXLGetSurface(PDev *pdev, QXLPHYSICAL *surface_phys, UINT32 x, UINT32 y, UI
 void QXLGetDelSurface(PDev *pdev, QXLSurfaceCmd *surface, UINT32 surface_id, UINT8 allocation_type);
 void QXLDelSurface(PDev *pdev, UINT8 *base_mem, UINT8 allocation_type);
 BOOL QXLGetPath(PDev *pdev, QXLDrawable *drawable, QXLPHYSICAL *path_phys, PATHOBJ *path);
-BOOL QXLGetMask(PDev *pdev, QXLDrawable *drawable, SpiceQMask *qxl_mask, SURFOBJ *mask, POINTL *pos,
+BOOL QXLGetMask(PDev *pdev, QXLDrawable *drawable, QXLQMask *qxl_mask, SURFOBJ *mask, POINTL *pos,
                 BOOL invers, LONG width, LONG height, INT32 *surface_dest);
-BOOL QXLGetBrush(PDev *pdev, QXLDrawable *drawable, SpiceBrush *qxl_brush,
+BOOL QXLGetBrush(PDev *pdev, QXLDrawable *drawable, QXLBrush *qxl_brush,
                             BRUSHOBJ *brush, POINTL *brush_pos, INT32 *surface_dest,
-                            SpiceRect *surface_rect);
+                            QXLRect *surface_rect);
 BOOL QXLGetBitmap(PDev *pdev, QXLDrawable *drawable, QXLPHYSICAL *image_phys, SURFOBJ *surf,
-                  SpiceRect *area, XLATEOBJ *color_trans, UINT32 *hash_key, BOOL use_cache,
+                  QXLRect *area, XLATEOBJ *color_trans, UINT32 *hash_key, BOOL use_cache,
                   INT32 *surface_dest);
 BOOL QXLGetBitsFromCache(PDev *pdev, QXLDrawable *drawable, UINT32 hash_key, QXLPHYSICAL *image_phys);
 BOOL QXLGetAlphaBitmap(PDev *pdev, QXLDrawable *drawable, QXLPHYSICAL *image_phys, SURFOBJ *surf,
-                       SpiceRect *area, INT32 *surface_dest);
+                       QXLRect *area, INT32 *surface_dest);
 BOOL CheckIfCacheImage(PDev *pdev, SURFOBJ *surf, XLATEOBJ *color_trans);
 UINT8 *QXLGetBuf(PDev *pdev, QXLDrawable *drawable, QXLPHYSICAL *buf_phys, UINT32 size);
 BOOL QXLGetStr(PDev *pdev, QXLDrawable *drawable, QXLPHYSICAL *str_phys, FONTOBJ *font, STROBJ *str);
diff --git a/display/rop.c b/display/rop.c
index 524f80f..7160c32 100644
--- a/display/rop.c
+++ b/display/rop.c
@@ -409,7 +409,7 @@ static BOOL DoFill(PDev *pdev, UINT32 surface_id, RECTL *area, CLIPOBJ *clip, BR
         return FALSE;
     }
 
-    drawable->u.fill.rop_decriptor = rop_info->method_data;
+    drawable->u.fill.rop_descriptor = rop_info->method_data;
 
     drawable->effect = mask ? QXL_EFFECT_BLEND : rop_info->effect;
 
@@ -422,7 +422,7 @@ static BOOL DoFill(PDev *pdev, UINT32 surface_id, RECTL *area, CLIPOBJ *clip, BR
 }
 
 static BOOL GetBitmap(PDev *pdev, QXLDrawable *drawable, QXLPHYSICAL *bitmap_phys, SURFOBJ *surf,
-                      SpiceRect *area, XLATEOBJ *color_trans, BOOL use_cache, INT32 *surface_dest)
+                      QXLRect *area, XLATEOBJ *color_trans, BOOL use_cache, INT32 *surface_dest)
 {
     DEBUG_PRINT((pdev, 9, "%s\n", __FUNCTION__));
     if (surf->iType != STYPE_BITMAP) {
@@ -454,7 +454,7 @@ static _inline UINT8 GdiScaleModeToQxl(ULONG scale_mode)
 
 static BOOL DoOpaque(PDev *pdev, UINT32 surface_id, RECTL *area, CLIPOBJ *clip, SURFOBJ *src,
                      RECTL *src_rect, XLATEOBJ *color_trans, BRUSHOBJ *brush, POINTL *brush_pos,
-                     UINT16 rop_decriptor, SURFOBJ *mask, POINTL *mask_pos, BOOL invers_mask,
+                     UINT16 rop_descriptor, SURFOBJ *mask, POINTL *mask_pos, BOOL invers_mask,
                      ULONG scale_mode)
 {
     QXLDrawable *drawable;
@@ -490,7 +490,7 @@ static BOOL DoOpaque(PDev *pdev, UINT32 surface_id, RECTL *area, CLIPOBJ *clip,
     }
     CopyRect(&drawable->surfaces_rects[2], src_rect);
 
-    drawable->u.opaque.rop_decriptor = rop_decriptor;
+    drawable->u.opaque.rop_descriptor = rop_descriptor;
     drawable->effect = mask ? QXL_EFFECT_BLEND : QXL_EFFECT_OPAQUE;
     PushDrawable(pdev, drawable);
     return TRUE;
@@ -610,7 +610,7 @@ static BOOL TestSplitClips(PDev *pdev, SURFOBJ *src, RECTL *src_rect, CLIPOBJ *c
 
 static _inline BOOL DoPartialCopy(PDev *pdev, UINT32 surface_id, SURFOBJ *src, RECTL *src_rect,
                                   RECTL *area_rect, RECTL *clip_rect, XLATEOBJ *color_trans,
-                                  ULONG scale_mode, UINT16 rop_decriptor)
+                                  ULONG scale_mode, UINT16 rop_descriptor)
 {
     QXLDrawable *drawable;
     RECTL clip_area;
@@ -632,7 +632,7 @@ static _inline BOOL DoPartialCopy(PDev *pdev, UINT32 surface_id, SURFOBJ *src, R
     drawable->effect = QXL_EFFECT_OPAQUE;
     drawable->u.copy.scale_mode = GdiScaleModeToQxl(scale_mode);
     drawable->u.copy.mask.bitmap = 0;
-    drawable->u.copy.rop_decriptor = rop_decriptor;
+    drawable->u.copy.rop_descriptor = rop_descriptor;
 
     drawable->u.copy.src_area.top = src_rect->top + (clip_area.top - area_rect->top);
     drawable->u.copy.src_area.bottom = drawable->u.copy.src_area.top + clip_area.bottom -
@@ -652,7 +652,7 @@ static _inline BOOL DoPartialCopy(PDev *pdev, UINT32 surface_id, SURFOBJ *src, R
 }
 
 static BOOL DoCopy(PDev *pdev, UINT32 surface_id, RECTL *area, CLIPOBJ *clip, SURFOBJ *src,
-                   RECTL *src_rect, XLATEOBJ *color_trans, UINT16 rop_decriptor, SURFOBJ *mask,
+                   RECTL *src_rect, XLATEOBJ *color_trans, UINT16 rop_descriptor, SURFOBJ *mask,
                    POINTL *mask_pos, BOOL invers_mask, ULONG scale_mode)
 {
     QXLDrawable *drawable;
@@ -676,7 +676,7 @@ static BOOL DoCopy(PDev *pdev, UINT32 surface_id, RECTL *area, CLIPOBJ *clip, SU
         !CheckIfCacheImage(pdev, src, color_trans)) {
         if (clip->iDComplexity == DC_RECT) {
             if (!DoPartialCopy(pdev, surface_id, src, src_rect, area, &clip->rclBounds, color_trans,
-                               scale_mode, rop_decriptor)) {
+                               scale_mode, rop_descriptor)) {
                 return FALSE;
             }
         } else {
@@ -694,7 +694,7 @@ static BOOL DoCopy(PDev *pdev, UINT32 surface_id, RECTL *area, CLIPOBJ *clip, SU
                 more = CLIPOBJ_bEnum(clip, sizeof(buf), (ULONG *)&buf);
                 for(now = buf.rects, end = now + buf.count; now < end; now++) {
                     if (!DoPartialCopy(pdev, surface_id, src, src_rect, area, now, color_trans,
-                                       scale_mode, rop_decriptor)) {
+                                       scale_mode, rop_descriptor)) {
                         return FALSE;
                     }
                 }
@@ -728,7 +728,7 @@ static BOOL DoCopy(PDev *pdev, UINT32 surface_id, RECTL *area, CLIPOBJ *clip, SU
     }
     CopyRect(&drawable->surfaces_rects[1], src_rect);
 
-    drawable->u.copy.rop_decriptor = rop_decriptor;
+    drawable->u.copy.rop_descriptor = rop_descriptor;
     PushDrawable(pdev, drawable);
     DEBUG_PRINT((pdev, 7, "%s: done\n", __FUNCTION__));
     return TRUE;
@@ -797,7 +797,7 @@ static BOOL DoBlend(PDev *pdev, UINT32 surface_id, RECTL *area, CLIPOBJ *clip, S
     }
     CopyRect(&drawable->surfaces_rects[1], src_rect);
 
-    drawable->u.blend.rop_decriptor = rop_info->method_data;
+    drawable->u.blend.rop_descriptor = rop_info->method_data;
     drawable->effect = mask ? QXL_EFFECT_BLEND : rop_info->effect;
     PushDrawable(pdev, drawable);
     return TRUE;
diff --git a/include/qxl_driver.h b/include/qxl_driver.h
index 566648c..09856c4 100644
--- a/include/qxl_driver.h
+++ b/include/qxl_driver.h
@@ -65,7 +65,7 @@ typedef struct QXLDriverInfo {
     UINT32 *compression_level;
 
     UINT32 update_area_port;
-    SpiceRect *update_area;
+    QXLRect *update_area;
     UINT32 *update_surface;
 
     UINT32 *mm_clock;