qxl abi: parse QXLCopy + QXLBlend.

Also adapt to tyops fix (s/rop_decriptor/rop_descriptor/).

2 files changed, 27 insertions, 7 deletions

diff --git a/server/red_parse_qxl.c b/server/red_parse_qxl.c
index 8590ec74..efe624e5 100644
--- a/server/red_parse_qxl.c
+++ b/server/red_parse_qxl.c
@@ -39,6 +39,26 @@ static void red_get_opaque_ptr(RedMemSlotInfo *slots, int group_id,
    red->mask           = qxl->mask;
 }
 
+static void red_get_copy_ptr(RedMemSlotInfo *slots, int group_id,
+                             SpiceCopy *red, QXLCopy *qxl)
+{
+   red->src_bitmap      = qxl->src_bitmap;
+   red->src_area        = qxl->src_area;
+   red->rop_descriptor  = qxl->rop_descriptor;
+   red->scale_mode      = qxl->scale_mode;
+   red->mask            = qxl->mask;
+}
+
+static void red_get_blend_ptr(RedMemSlotInfo *slots, int group_id,
+                             SpiceBlend *red, QXLBlend *qxl)
+{
+   red->src_bitmap      = qxl->src_bitmap;
+   red->src_area        = qxl->src_area;
+   red->rop_descriptor  = qxl->rop_descriptor;
+   red->scale_mode      = qxl->scale_mode;
+   red->mask            = qxl->mask;
+}
+
 static void red_get_alpha_blend_ptr(RedMemSlotInfo *slots, int group_id,
                                     SpiceAlphaBlnd *red, QXLAlphaBlnd *qxl)
 {
@@ -88,10 +108,10 @@ void red_get_drawable(RedMemSlotInfo *slots, int group_id,
         red->u.blackness = qxl->u.blackness;
         break;
     case QXL_DRAW_BLEND:
-        red->u.blend = qxl->u.blend;
+        red_get_blend_ptr(slots, group_id, &red->u.blend, &qxl->u.blend);
         break;
     case QXL_DRAW_COPY:
-        red->u.copy = qxl->u.copy;
+        red_get_copy_ptr(slots, group_id, &red->u.copy, &qxl->u.copy);
         break;
     case QXL_COPY_BITS:
         red->u.copy_bits = qxl->u.copy_bits;
@@ -151,10 +171,10 @@ void red_get_compat_drawable(RedMemSlotInfo *slots, int group_id,
         red->u.blackness = qxl->u.blackness;
         break;
     case QXL_DRAW_BLEND:
-        red->u.blend = qxl->u.blend;
+        red_get_blend_ptr(slots, group_id, &red->u.blend, &qxl->u.blend);
         break;
     case QXL_DRAW_COPY:
-        red->u.copy = qxl->u.copy;
+        red_get_copy_ptr(slots, group_id, &red->u.copy, &qxl->u.copy);
         break;
     case QXL_COPY_BITS:
         red->u.copy_bits = qxl->u.copy_bits;
diff --git a/server/red_worker.c b/server/red_worker.c
index e253c508..72eba108 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -3550,7 +3550,7 @@ static inline void red_update_streamable(RedWorker *worker, Drawable *drawable,
 
     if (drawable->tree_item.effect != QXL_EFFECT_OPAQUE ||
                                         red_drawable->type != QXL_DRAW_COPY ||
-                                        red_drawable->u.copy.rop_decriptor != SPICE_ROPD_OP_PUT) {
+                                        red_drawable->u.copy.rop_descriptor != SPICE_ROPD_OP_PUT) {
         return;
     }
 
@@ -9118,7 +9118,7 @@ static void red_send_image(DisplayChannel *display_channel, ImageItem *item)
     copy.base.box.bottom = item->pos.y + bitmap.y;
     copy.base.clip.type = SPICE_CLIP_TYPE_NONE;
     copy.base.clip.data = 0;
-    copy.data.rop_decriptor = SPICE_ROPD_OP_PUT;
+    copy.data.rop_descriptor = SPICE_ROPD_OP_PUT;
     copy.data.src_area.left = 0;
     copy.data.src_area.top = 0;
     copy.data.src_area.right = bitmap.x;
@@ -9222,7 +9222,7 @@ static void red_display_send_upgrade(DisplayChannel *display_channel, UpgradeIte
 
     red_drawable = item->drawable->red_drawable;
     ASSERT(red_drawable->type == QXL_DRAW_COPY);
-    ASSERT(red_drawable->u.copy.rop_decriptor == SPICE_ROPD_OP_PUT);
+    ASSERT(red_drawable->u.copy.rop_descriptor == SPICE_ROPD_OP_PUT);
     ASSERT(red_drawable->u.copy.mask.bitmap == 0);
 
     copy.base.surface_id = 0;