Attachment #3295 for bug #9164

View | Details | Raw Unified | Return to bug 9164
Collapse All | Expand All




# New ports collection makefile for:	vnc
# Version required:     3.3.2r3
# Date created:		24 February 1998
# Whom:			msmith
#
# $Id: Makefile,v 1.7 1998/11/21 07:27:39 steve Exp $
#

DISTNAME=       	vnc-3.3.2r3_unixsrc
PKGNAME=        	vnc-3.3.2r3
CATEGORIES=		net
MASTER_SITES=   	http://www.orl.co.uk/vnc/dist/
DISTFILES=		vnc-3.3.2r3_unixsrc.tgz \
			vnc-3.3.2_doc.tgz

MAINTAINER=	 	bmah@ca.sandia.gov

USE_PERL5=		YES

EXTRACT_ONLY=		vnc-3.3.2r3_unixsrc.tgz
IGNOREFILES=		${DISTFILES}

NO_WRKSUBDIR=		YES

Lines 1-2 Link Here

(-)vnc/files/md5 (-1 / +1 lines)
1	MD5 (vnc-3.3.2r2_unixsrc.tgz) = IGNORE	1	MD5 (vnc-3.3.2r3_unixsrc.tgz) = IGNORE
2	MD5 (vnc-3.3.2_doc.tgz) = IGNORE	2	MD5 (vnc-3.3.2_doc.tgz) = IGNORE




--- Xvnc/programs/Xserver/hw/vnc/rfbserver.c.orig	Mon Jul 13 09:01:52 1998
+++ Xvnc/programs/Xserver/hw/vnc/rfbserver.c	Tue Sep 22 07:44:25 1998
@@ -816,10 +816,15 @@
     ublen = sz_rfbFramebufferUpdateMsg;
 
     if (REGION_NOTEMPTY(pScreen,&updateCopyRegion)) {
-	if (!rfbSendCopyRegion(cl,&updateCopyRegion,dx,dy))
+	if (!rfbSendCopyRegion(cl,&updateCopyRegion,dx,dy)) {
+	    REGION_UNINIT(pScreen,&updateRegion);
+	    REGION_UNINIT(pScreen,&updateCopyRegion);
 	    return FALSE;
+	}
     }
 
+    REGION_UNINIT(pScreen,&updateCopyRegion);
+
     for (i = 0; i < REGION_NUM_RECTS(&updateRegion); i++) {
 	int x = REGION_RECTS(&updateRegion)[i].x1;
 	int y = REGION_RECTS(&updateRegion)[i].y1;
@@ -831,24 +836,34 @@
 
 	switch (cl->preferredEncoding) {
 	case rfbEncodingRaw:
-	    if (!rfbSendRectEncodingRaw(cl, x, y, w, h))
+	    if (!rfbSendRectEncodingRaw(cl, x, y, w, h)) {
+		REGION_UNINIT(pScreen,&updateRegion);
 		return FALSE;
+	    }
 	    break;
 	case rfbEncodingRRE:
-	    if (!rfbSendRectEncodingRRE(cl, x, y, w, h))
+	    if (!rfbSendRectEncodingRRE(cl, x, y, w, h)) {
+		REGION_UNINIT(pScreen,&updateRegion);
 		return FALSE;
+	    }
 	    break;
 	case rfbEncodingCoRRE:
-	    if (!rfbSendRectEncodingCoRRE(cl, x, y, w, h))
+	    if (!rfbSendRectEncodingCoRRE(cl, x, y, w, h)) {
+		REGION_UNINIT(pScreen,&updateRegion);
 		return FALSE;
+	    }
 	    break;
 	case rfbEncodingHextile:
-	    if (!rfbSendRectEncodingHextile(cl, x, y, w, h))
+	    if (!rfbSendRectEncodingHextile(cl, x, y, w, h)) {
+		REGION_UNINIT(pScreen,&updateRegion);
 		return FALSE;
+	    }
 	    break;
 	}
     }
 
+    REGION_UNINIT(pScreen,&updateRegion);
+
     if (!rfbSendUpdateBuf(cl))
 	return FALSE;
 
@@ -896,9 +911,9 @@
 	firstInNextBand = thisRect;
 	nrectsInBand = 0;
 
-	while ((REGION_RECTS(reg)[firstInNextBand].y1
-		== REGION_RECTS(reg)[thisRect].y1) &&
-	       (nrects > 0))
+	while ((nrects > 0) &&
+	       (REGION_RECTS(reg)[firstInNextBand].y1
+		== REGION_RECTS(reg)[thisRect].y1))
 	{
 	    firstInNextBand += y_inc;
 	    nrects--;

Return to bug 9164

Lines 1-23 Link Here

(-)vnc/Makefile (-5 / +5 lines)
1	# New ports collection makefile for: vnc	1	# New ports collection makefile for: vnc
2	# Version required: 3.3.1	2	# Version required: 3.3.2r3
3	# Date created: 24 February 1998	3	# Date created: 24 February 1998
4	# Whom: msmith	4	# Whom: msmith
5	#	5	#
6	# $Id: Makefile,v 1.7 1998/11/21 07:27:39 steve Exp $	6	# $Id: Makefile,v 1.7 1998/11/21 07:27:39 steve Exp $
7	#	7	#
8		8
9	DISTNAME= vnc-3.3.2r2_unixsrc	9	DISTNAME= vnc-3.3.2r3_unixsrc
10	PKGNAME= vnc-3.3.2r2	10	PKGNAME= vnc-3.3.2r3
11	CATEGORIES= net	11	CATEGORIES= net
12	MASTER_SITES= http://www.orl.co.uk/vnc/dist/	12	MASTER_SITES= http://www.orl.co.uk/vnc/dist/
13	DISTFILES= vnc-3.3.2r2_unixsrc.tgz \	13	DISTFILES= vnc-3.3.2r3_unixsrc.tgz \
14	vnc-3.3.2_doc.tgz	14	vnc-3.3.2_doc.tgz
15		15
16	MAINTAINER= bmah@ca.sandia.gov	16	MAINTAINER= bmah@ca.sandia.gov
17		17
18	USE_PERL5= YES	18	USE_PERL5= YES
19		19
20	EXTRACT_ONLY= vnc-3.3.2r2_unixsrc.tgz	20	EXTRACT_ONLY= vnc-3.3.2r3_unixsrc.tgz
21	IGNOREFILES= ${DISTFILES}	21	IGNOREFILES= ${DISTFILES}
22		22
23	NO_WRKSUBDIR= YES	23	NO_WRKSUBDIR= YES

Lines 1-71 Link Here

(-)vnc/patches/patch-ac (-71 lines)
1	--- Xvnc/programs/Xserver/hw/vnc/rfbserver.c.orig Mon Jul 13 09:01:52 1998
2	+++ Xvnc/programs/Xserver/hw/vnc/rfbserver.c Tue Sep 22 07:44:25 1998
3	@@ -816,10 +816,15 @@
4	ublen = sz_rfbFramebufferUpdateMsg;
5
6	if (REGION_NOTEMPTY(pScreen,&updateCopyRegion)) {
7	- if (!rfbSendCopyRegion(cl,&updateCopyRegion,dx,dy))
8	+ if (!rfbSendCopyRegion(cl,&updateCopyRegion,dx,dy)) {
9	+ REGION_UNINIT(pScreen,&updateRegion);
10	+ REGION_UNINIT(pScreen,&updateCopyRegion);
11	return FALSE;
12	+ }
13	}
14
15	+ REGION_UNINIT(pScreen,&updateCopyRegion);
16	+
17	for (i = 0; i < REGION_NUM_RECTS(&updateRegion); i++) {
18	int x = REGION_RECTS(&updateRegion)[i].x1;
19	int y = REGION_RECTS(&updateRegion)[i].y1;
20	@@ -831,24 +836,34 @@
21
22	switch (cl->preferredEncoding) {
23	case rfbEncodingRaw:
24	- if (!rfbSendRectEncodingRaw(cl, x, y, w, h))
25	+ if (!rfbSendRectEncodingRaw(cl, x, y, w, h)) {
26	+ REGION_UNINIT(pScreen,&updateRegion);
27	return FALSE;
28	+ }
29	break;
30	case rfbEncodingRRE:
31	- if (!rfbSendRectEncodingRRE(cl, x, y, w, h))
32	+ if (!rfbSendRectEncodingRRE(cl, x, y, w, h)) {
33	+ REGION_UNINIT(pScreen,&updateRegion);
34	return FALSE;
35	+ }
36	break;
37	case rfbEncodingCoRRE:
38	- if (!rfbSendRectEncodingCoRRE(cl, x, y, w, h))
39	+ if (!rfbSendRectEncodingCoRRE(cl, x, y, w, h)) {
40	+ REGION_UNINIT(pScreen,&updateRegion);
41	return FALSE;
42	+ }
43	break;
44	case rfbEncodingHextile:
45	- if (!rfbSendRectEncodingHextile(cl, x, y, w, h))
46	+ if (!rfbSendRectEncodingHextile(cl, x, y, w, h)) {
47	+ REGION_UNINIT(pScreen,&updateRegion);
48	return FALSE;
49	+ }
50	break;
51	}
52	}
53
54	+ REGION_UNINIT(pScreen,&updateRegion);
55	+
56	if (!rfbSendUpdateBuf(cl))
57	return FALSE;
58
59	@@ -896,9 +911,9 @@
60	firstInNextBand = thisRect;
61	nrectsInBand = 0;
62
63	- while ((REGION_RECTS(reg)[firstInNextBand].y1
64	- == REGION_RECTS(reg)[thisRect].y1) &&
65	- (nrects > 0))
66	+ while ((nrects > 0) &&
67	+ (REGION_RECTS(reg)[firstInNextBand].y1
68	+ == REGION_RECTS(reg)[thisRect].y1))
69	{
70	firstInNextBand += y_inc;
71	nrects--;