Relay-Version: version B 2.10 5/3/83; site utzoo.UUCP Path: utzoo!mnetor!uunet!husc6!mit-eddie!ll-xn!ames!ucbcad!ucbvax!ZERMATT.LCS.MIT.EDU!RWS From: RWS@ZERMATT.LCS.MIT.EDU (Robert Scheifler) Newsgroups: comp.windows.x Subject: V11 server gc bug fix (#21) Message-ID: <871014103939.0.RWS@KILLINGTON.LCS.MIT.EDU> Date: Wed, 14-Oct-87 10:39:00 EDT Article-I.D.: KILLINGT.871014103939.0.RWS Posted: Wed Oct 14 10:39:00 1987 Date-Received: Fri, 16-Oct-87 04:52:37 EDT References: <6098.560539813@hpcvxrc> Sender: daemon@ucbvax.BERKELEY.EDU Organization: The ARPA Internet Lines: 74 Date: Mon, 05 Oct 87 18:02:11 PDT From: Bob Leichner VERSION: X11 rel1 SYNOPSIS: Server died during initialization due to improper parameter types. DESCRIPTION: Several locations in gc.c call QueryBestSize procedures using integer parameters. Xproto.h specifies the use of shorts. REPEAT-BY: Eyeball the code. FIX: (Actually, if the ddx QueryBestSize leaves zero as zero, as the routines for the supplied ports do, then the server shouldn't have died, although the 16x16 values certainly wouldn't have been updated. But a bug is a bug.) The change is to server/dix/gc.c: *** /tmp/,RCSt1025717 Wed Oct 14 10:30:13 1987 --- gc.c Tue Oct 13 19:20:16 1987 *************** *** 22,28 **** ******************************************************************/ ! /* $Header: gc.c,v 1.96 87/10/03 14:33:48 rws Exp $ */ #include "X.h" #include "Xmd.h" --- 22,28 ---- ******************************************************************/ ! /* $Header: gc.c,v 1.97 87/10/13 19:19:39 rws Exp $ */ #include "X.h" #include "Xmd.h" *************** *** 432,438 **** */ if (!pGC->tile) { ! int w, h; w = 16; h = 16; --- 432,438 ---- */ if (!pGC->tile) { ! short w, h; w = 16; h = 16; *************** *** 773,779 **** register ScreenPtr pScreen; int tmpval[3]; xRectangle rect; ! int w, h; GCPtr pgcScratch; pScreen = &screenInfo.screen[screenNum]; --- 773,779 ---- register ScreenPtr pScreen; int tmpval[3]; xRectangle rect; ! short w, h; GCPtr pgcScratch; pScreen = &screenInfo.screen[screenNum];