shithub: rd

Info  •  Files  •  Log  •  Branches

add egdi_test.c with tests for getfupd parsers

Agent-Logs-Url: https://github.com/yrk-lab/rd/sessions/49c7f640-03ed-4516-a379-2106930bfa43

Co-authored-by: yrk-lab <11537279+yrk-lab@users.noreply.github.com>

--- a/efs_test.c

+++ b/efs_test.c

@@ -10,6 +10,7 @@

 void testsannrq(void);

 int audiotests(void);

+int egditests(void);

 int msgtests(void);

 int mppctests(void);

 int rletests(void);

@@ -128,6 +129,7 @@

 	testcann();

 	testcnrq();

 	audiotests();

+	egditests();

 	msgtests();

 	mppctests();

 	rletests();

--- /dev/null

+++ b/egdi_test.c

@@ -1,0 +1,346 @@

+#include "egdi.c"

+

+int egditests(void);

+

+static int

+testegdi_nonstd(void)

+{

+	/*

+	 * Non-standard order: Standard bit (bit 0) is not set.

+	 * getfupd should print a warning and return 0 bytes consumed.

+	 */

+	uchar pkt[] = {0x00};

+	Imgupd up;

+	int n;

+

+	memset(&up, 0, sizeof up);

+	n = getfupd(&up, pkt, sizeof pkt);

+	if(n != 0)

+		sysfatal("testegdi_nonstd: consumed: want 0, got %d", n);

+	return 0;

+}

+

+static int

+testegdi_scrblt(void)

+{

+	/*

+	 * ScrBlt primary order, NewOrder, SameClipping, all fields set.

+	 *   ctl = Standard|NewOrder|SameClipping (0x29)

+	 *   order = ScrBlt (2)

+	 *   fset = 0x7F: bits 0-6 (left, top, width, height, rop3, src.x, src.y)

+	 *   rect:  left=10, top=20, width=100, height=100 → r={(10,20),(110,120)}

+	 *   rop3 = 0xCC (Scopy, no warning)

+	 *   src:   (5, 15)

+	 * No Clipped bit set so rectclip is not called.

+	 */

+	uchar pkt[] = {

+		0x29,		/* ctl: Standard|NewOrder|SameClipping */

+		0x02,		/* order: ScrBlt */

+		0x7F,		/* fset: bits 0-6 */

+		0x0A, 0x00,	/* left  = 10 */

+		0x14, 0x00,	/* top   = 20 */

+		0x64, 0x00,	/* width = 100 */

+		0x64, 0x00,	/* height= 100 */

+		0xCC,		/* rop3 = Scopy */

+		0x05, 0x00,	/* src.x = 5 */

+		0x0F, 0x00,	/* src.y = 15 */

+	};

+	Imgupd up;

+	int n;

+

+	memset(&up, 0, sizeof up);

+	n = getfupd(&up, pkt, sizeof pkt);

+	if(n != (int)sizeof pkt)

+		sysfatal("testegdi_scrblt: consumed: want %d, got %d", (int)sizeof pkt, n);

+	if(up.type != Uscrblt)

+		sysfatal("testegdi_scrblt: type: want %d, got %d", Uscrblt, up.type);

+	if(up.x != 10 || up.y != 20)

+		sysfatal("testegdi_scrblt: pos: want (10,20), got (%d,%d)", up.x, up.y);

+	if(up.xsz != 100 || up.ysz != 100)

+		sysfatal("testegdi_scrblt: size: want (100,100), got (%d,%d)", up.xsz, up.ysz);

+	if(up.sx != 5 || up.sy != 15)

+		sysfatal("testegdi_scrblt: src: want (5,15), got (%d,%d)", up.sx, up.sy);

+	return 0;

+}

+

+static int

+testegdi_scrblt_clipped(void)

+{

+	/*

+	 * ScrBlt with Clipped flag set.

+	 *   ctl = Standard|NewOrder|Clipped (0x0D)

+	 *   cfclipr encodes clip rect (0,0)-(200,100) using bctl=0x0F (all absolute).

+	 *   rect: left=10, top=20, width=100, height=100 → wr={(10,20),(110,120)}.

+	 *   After rectclip(wr, clip): r={(10,20),(110,100)} → xsz=100, ysz=80.

+	 */

+	uchar pkt[] = {

+		0x0D,		/* ctl: Standard|NewOrder|Clipped */

+		0x02,		/* order: ScrBlt */

+		0x7F,		/* fset: bits 0-6 */

+		/* cfclipr: bctl=0x0F (bits 0-3 = all absolute coords) */

+		0x0F,

+		0x00, 0x00,	/* min.x = 0 */

+		0x00, 0x00,	/* min.y = 0 */

+		0xC7, 0x00,	/* max.x: stored 199, +1 → 200 */

+		0x63, 0x00,	/* max.y: stored 99,  +1 → 100 */

+		/* getscrblt data */

+		0x0A, 0x00,	/* left  = 10 */

+		0x14, 0x00,	/* top   = 20 */

+		0x64, 0x00,	/* width = 100 */

+		0x64, 0x00,	/* height= 100 */

+		0xCC,		/* rop3 = Scopy */

+		0x05, 0x00,	/* src.x = 5 */

+		0x0F, 0x00,	/* src.y = 15 */

+	};

+	Imgupd up;

+	int n;

+

+	memset(&up, 0, sizeof up);

+	n = getfupd(&up, pkt, sizeof pkt);

+	if(n != (int)sizeof pkt)

+		sysfatal("testegdi_scrblt_clipped: consumed: want %d, got %d", (int)sizeof pkt, n);

+	if(up.type != Uscrblt)

+		sysfatal("testegdi_scrblt_clipped: type: want %d, got %d", Uscrblt, up.type);

+	if(up.x != 10 || up.y != 20)

+		sysfatal("testegdi_scrblt_clipped: pos: want (10,20), got (%d,%d)", up.x, up.y);

+	if(up.xsz != 100 || up.ysz != 80)

+		sysfatal("testegdi_scrblt_clipped: size: want (100,80), got (%d,%d)", up.xsz, up.ysz);

+	if(up.sx != 5 || up.sy != 15)

+		sysfatal("testegdi_scrblt_clipped: src: want (5,15), got (%d,%d)", up.sx, up.sy);

+	return 0;

+}

+

+static int

+testegdi_memblt(void)

+{

+	/*

+	 * MemBlt primary order, NewOrder, SameClipping, all fields set.

+	 *   ctl = Standard|NewOrder|SameClipping (0x29)

+	 *   order = MemBlt (13)

+	 *   fset = 0x01FF (bits 0-8): cid, rect, rop3, src, coff

+	 *   cid=1, rect: left=50,top=60,width=100,height=100 → r={(50,60),(150,160)}

+	 *   rop3=0xCC, src=(10,20), coff=5

+	 */

+	uchar pkt[] = {

+		0x29,		/* ctl: Standard|NewOrder|SameClipping */

+		0x0D,		/* order: MemBlt (13) */

+		0xFF, 0x01,	/* fset = 0x01FF (little-endian) */

+		0x01, 0x00,	/* cid = 1 */

+		0x32, 0x00,	/* left  = 50 */

+		0x3C, 0x00,	/* top   = 60 */

+		0x64, 0x00,	/* width = 100 */

+		0x64, 0x00,	/* height= 100 */

+		0xCC,		/* rop3 = Scopy */

+		0x0A, 0x00,	/* src.x = 10 */

+		0x14, 0x00,	/* src.y = 20 */

+		0x05, 0x00,	/* coff = 5 */

+	};

+	Imgupd up;

+	int n;

+

+	memset(&up, 0, sizeof up);

+	n = getfupd(&up, pkt, sizeof pkt);

+	if(n != (int)sizeof pkt)

+		sysfatal("testegdi_memblt: consumed: want %d, got %d", (int)sizeof pkt, n);

+	if(up.type != Umemblt)

+		sysfatal("testegdi_memblt: type: want %d, got %d", Umemblt, up.type);

+	if(up.cid != 1)

+		sysfatal("testegdi_memblt: cid: want 1, got %d", up.cid);

+	if(up.coff != 5)

+		sysfatal("testegdi_memblt: coff: want 5, got %d", up.coff);

+	if(up.x != 50 || up.y != 60)

+		sysfatal("testegdi_memblt: pos: want (50,60), got (%d,%d)", up.x, up.y);

+	if(up.xm != 149 || up.ym != 159)

+		sysfatal("testegdi_memblt: max: want (149,159), got (%d,%d)", up.xm, up.ym);

+	if(up.xsz != 100 || up.ysz != 100)

+		sysfatal("testegdi_memblt: size: want (100,100), got (%d,%d)", up.xsz, up.ysz);

+	if(up.sx != 10 || up.sy != 20)

+		sysfatal("testegdi_memblt: src: want (10,20), got (%d,%d)", up.sx, up.sy);

+	if(up.clipped != 0)

+		sysfatal("testegdi_memblt: clipped: want 0, got %d", up.clipped);

+	return 0;

+}

+

+static int

+testegdi_memblt_clipped(void)

+{

+	/*

+	 * MemBlt with Clipped flag set.

+	 * Unlike ScrBlt, MemBlt does not call rectclip(); it stores the clip-rect

+	 * coordinates directly in Imgupd.{cx,cy,cxsz,cysz}.

+	 *   ctl = Standard|NewOrder|Clipped (0x0D)

+	 *   clip rect: (0,0)-(200,100) via cfclipr with bctl=0x0F

+	 *   rect: left=50,top=60,width=100,height=100 → r={(50,60),(150,160)}

+	 */

+	uchar pkt[] = {

+		0x0D,		/* ctl: Standard|NewOrder|Clipped */

+		0x0D,		/* order: MemBlt (13) */

+		0xFF, 0x01,	/* fset = 0x01FF (little-endian) */

+		/* cfclipr: bctl=0x0F (bits 0-3 = all absolute coords) */

+		0x0F,

+		0x00, 0x00,	/* min.x = 0 */

+		0x00, 0x00,	/* min.y = 0 */

+		0xC7, 0x00,	/* max.x: stored 199, +1 → 200 */

+		0x63, 0x00,	/* max.y: stored 99,  +1 → 100 */

+		/* getmemblt data */

+		0x01, 0x00,	/* cid = 1 */

+		0x32, 0x00,	/* left  = 50 */

+		0x3C, 0x00,	/* top   = 60 */

+		0x64, 0x00,	/* width = 100 */

+		0x64, 0x00,	/* height= 100 */

+		0xCC,		/* rop3 = Scopy */

+		0x0A, 0x00,	/* src.x = 10 */

+		0x14, 0x00,	/* src.y = 20 */

+		0x05, 0x00,	/* coff = 5 */

+	};

+	Imgupd up;

+	int n;

+

+	memset(&up, 0, sizeof up);

+	n = getfupd(&up, pkt, sizeof pkt);

+	if(n != (int)sizeof pkt)

+		sysfatal("testegdi_memblt_clipped: consumed: want %d, got %d", (int)sizeof pkt, n);

+	if(up.type != Umemblt)

+		sysfatal("testegdi_memblt_clipped: type: want %d, got %d", Umemblt, up.type);

+	if(up.clipped != 1)

+		sysfatal("testegdi_memblt_clipped: clipped: want 1, got %d", up.clipped);

+	if(up.cx != 0 || up.cy != 0)

+		sysfatal("testegdi_memblt_clipped: clip pos: want (0,0), got (%d,%d)", up.cx, up.cy);

+	if(up.cxsz != 200 || up.cysz != 100)

+		sysfatal("testegdi_memblt_clipped: clip size: want (200,100), got (%d,%d)", up.cxsz, up.cysz);

+	return 0;

+}

+

+static int

+testegdi_cmapcache(void)

+{

+	/*

+	 * CacheCmap secondary order: cache a 256-entry colour map.

+	 * Packet layout: 6-byte secondary header + 1-byte cid + 2-byte count + 1024-byte table.

+	 * Total size = 1033.  GSHORT(p+1) = 1033 - 13 = 1020 = 0x03FC.

+	 */

+	static uchar pkt[1033];

+	Imgupd up;

+	int n, i;

+

+	memset(pkt, 0, sizeof pkt);

+	pkt[0] = 0x03;		/* ctl: Standard|Secondary */

+	pkt[1] = 0xFC;		/* GSHORT(p+1) low  = 0xFC (1020 & 0xFF) */

+	pkt[2] = 0x03;		/* GSHORT(p+1) high = 0x03 → size-13=1020 → size=1033 */

+	pkt[3] = 0x00;		/* opt low */

+	pkt[4] = 0x00;		/* opt high */

+	pkt[5] = 0x01;		/* xorder: CacheCmap */

+	pkt[6] = 0x03;		/* cid = 3 */

+	pkt[7] = 0x00;		/* n = 256, low byte */

+	pkt[8] = 0x01;		/* n = 256, high byte (GSHORT = 0x0100 = 256) */

+	/* colour table at pkt[9..1032] */

+	for(i = 0; i < 1024; i++)

+		pkt[9+i] = (uchar)(i & 0xFF);

+

+	memset(&up, 0, sizeof up);

+	n = getfupd(&up, pkt, sizeof pkt);

+	if(n != 1033)

+		sysfatal("testegdi_cmapcache: consumed: want 1033, got %d", n);

+	if(up.type != Umcache)

+		sysfatal("testegdi_cmapcache: type: want %d, got %d", Umcache, up.type);

+	if(up.cid != 3)

+		sysfatal("testegdi_cmapcache: cid: want 3, got %d", up.cid);

+	if(up.nbytes != 1024)

+		sysfatal("testegdi_cmapcache: nbytes: want 1024, got %d", up.nbytes);

+	if(up.bytes != pkt+9)

+		sysfatal("testegdi_cmapcache: bytes ptr: want pkt+9, got something else");

+	return 0;

+}

+

+static int

+testegdi_imgcache2(void)

+{

+	/*

+	 * CacheImage2 secondary order (uncompressed, no persistent key).

+	 *   opt = 0 → cid=0, no persistent key, read ysz separately, no compr hdr skip.

+	 *   xsz = 8 (single byte, high bit clear).

+	 *   ysz = 8 (single byte, high bit clear).

+	 *   pixel-data size = 32 (encoded as single byte 0x20: n=bits[7:6]=0, g=bits[5:0]=32).

+	 *   coff = 2 (single byte, high bit clear).

+	 * Packet: 6-byte secondary header + 4-byte data header + 32-byte pixel data = 42 bytes.

+	 * GSHORT(p+1) = 42 - 13 = 29 = 0x1D.

+	 */

+	uchar pkt[42];

+	Imgupd up;

+	int n;

+

+	memset(pkt, 0xAA, sizeof pkt);	/* fill pixel region with known pattern */

+	pkt[0] = 0x03;		/* ctl: Standard|Secondary */

+	pkt[1] = 0x1D;		/* GSHORT(p+1) low  = 29 → size = 42 */

+	pkt[2] = 0x00;		/* GSHORT(p+1) high */

+	pkt[3] = 0x00;		/* opt low */

+	pkt[4] = 0x00;		/* opt high */

+	pkt[5] = 0x04;		/* xorder: CacheImage2 */

+	pkt[6] = 0x08;		/* xsz = 8 */

+	pkt[7] = 0x08;		/* ysz = 8 */

+	pkt[8] = 0x20;		/* size: n=0 (bits 7-6=00), g=32 (bits 5-0) */

+	pkt[9] = 0x02;		/* coff = 2 */

+	/* pkt[10..41]: pixel data (already 0xAA from memset) */

+

+	memset(&up, 0, sizeof up);

+	n = getfupd(&up, pkt, sizeof pkt);

+	if(n != (int)sizeof pkt)

+		sysfatal("testegdi_imgcache2: consumed: want %d, got %d", (int)sizeof pkt, n);

+	if(up.type != Uicache)

+		sysfatal("testegdi_imgcache2: type: want %d, got %d", Uicache, up.type);

+	if(up.cid != 0)

+		sysfatal("testegdi_imgcache2: cid: want 0, got %d", up.cid);

+	if(up.coff != 2)

+		sysfatal("testegdi_imgcache2: coff: want 2, got %d", up.coff);

+	if(up.xsz != 8 || up.ysz != 8)

+		sysfatal("testegdi_imgcache2: dim: want (8,8), got (%d,%d)", up.xsz, up.ysz);

+	if(up.nbytes != 32)

+		sysfatal("testegdi_imgcache2: nbytes: want 32, got %d", up.nbytes);

+	if(up.bytes != pkt+10)

+		sysfatal("testegdi_imgcache2: bytes ptr: want pkt+10, got something else");

+	if(up.iscompr != 0)

+		sysfatal("testegdi_imgcache2: iscompr: want 0, got %d", up.iscompr);

+	return 0;

+}

+

+static int

+testegdi_secondary_unsupported(void)

+{

+	/*

+	 * Secondary order with an xorder value not present in auxtab

+	 * (CacheImage=0, auxtab[0].get==nil).

+	 * getfupd should print a warning, skip the entire order, and return size.

+	 * size = 20, GSHORT(p+1) = 20 - 13 = 7.

+	 */

+	uchar pkt[20];

+	Imgupd up;

+	int n;

+

+	memset(pkt, 0, sizeof pkt);

+	pkt[0] = 0x03;		/* ctl: Standard|Secondary */

+	pkt[1] = 0x07;		/* GSHORT(p+1) = 7 → size = 20 */

+	pkt[2] = 0x00;

+	pkt[3] = 0x00;		/* opt */

+	pkt[4] = 0x00;

+	pkt[5] = 0x00;		/* xorder: CacheImage (0), not handled in auxtab */

+

+	memset(&up, 0, sizeof up);

+	n = getfupd(&up, pkt, sizeof pkt);

+	if(n != 20)

+		sysfatal("testegdi_secondary_unsupported: consumed: want 20, got %d", n);

+	return 0;

+}

+

+int

+egditests(void)

+{

+	testegdi_nonstd();

+	testegdi_scrblt();

+	testegdi_scrblt_clipped();

+	testegdi_memblt();

+	testegdi_memblt_clipped();

+	testegdi_cmapcache();

+	testegdi_imgcache2();

+	testegdi_secondary_unsupported();

+	return 0;

+}

--- a/mkfile

+++ b/mkfile

@@ -35,11 +35,11 @@

 THREADOFILES=${OFILES:rd.$O=rd-thread.$O}

 CLEANFILES=$O.thread $O.test

-TESTHFILES=audio.c mppc.c rle.c

+TESTHFILES=audio.c mppc.c rle.c egdi.c

 TESTOFILES=\

 	efs_test.$O	errs.$O efs.$O utf16.$O \

 	aud_test.$O	\

-	msg_test.$O	x224.$O mcs.$O ele.$O mpas.$O alloc.$O cap.$O egdi.$O \

+	msg_test.$O	x224.$O mcs.$O ele.$O mpas.$O alloc.$O cap.$O egdi_test.$O \

 	mppc_test.$O	\

 	rle_test.$O	\

 	utf16_test.$O	\

-- 

⑨