hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-11-01 03:03:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into XACE-SELINUX

Browse source 
Conflicts:

	dix/dispatch.c
	dix/property.c
	hw/xfree86/common/xf86VidMode.c
	include/xkbsrv.h
	render/glyph.c
	xkb/xkbActions.c
This commit is contained in:
Eamon Walsh 2007-11-05 19:08:36 -05:00 • committed by Eamon Walsh
commit a52c9b2a59
270 changed files with 1593 additions and 1827 deletions
Download patch file Download diff file Expand all files Collapse all files

14
hw/xfree86/dixmods/extmod/Makefile.am
View file

@ -11,6 +11,14 @@ if XV
XV_SRCS = xvmod.c xvmodproc.h
endif
if XF86MISC
XF86MISC_SRCS = xf86misc.c xf86miscproc.h
endif
if XF86VIDMODE
XF86VMODE_SRCS = xf86vmode.c vidmodeproc.h
endif
AM_CFLAGS = @DIX_CFLAGS@ @XORG_CFLAGS@
INCLUDES = @XORG_INCS@ \
-I$(top_srcdir)/afb \
@ -24,9 +32,7 @@ libextmod_la_LDFLAGS = -avoid-version
libextmod_la_SOURCES = modinit.c \
modinit.h \
$(DGA_SRCS) \
xf86misc.c \
xf86miscproc.h \
xf86vmode.c \
vidmodeproc.h \
$(XF86MISC_SRCS) \
$(XF86VMODE_SRCS) \
$(XV_SRCS)
libextmod_la_LIBADD = $(top_builddir)/Xext/libXextmodule.la

16
hw/xfree86/dixmods/extmod/xf86vmode.c
View file

@ -1373,14 +1373,14 @@ ProcXF86VidModeGetMonitor(ClientPtr client)
rep.sequenceNumber = client->sequence;
rep.nhsync = nHsync;
rep.nvsync = nVrefresh;
hsyncdata = ALLOCATE_LOCAL(nHsync * sizeof(CARD32));
hsyncdata = xalloc(nHsync * sizeof(CARD32));
if (!hsyncdata) {
return BadAlloc;
}
vsyncdata = ALLOCATE_LOCAL(nVrefresh * sizeof(CARD32));
vsyncdata = xalloc(nVrefresh * sizeof(CARD32));
if (!vsyncdata) {
DEALLOCATE_LOCAL(hsyncdata);
xfree(hsyncdata);
return BadAlloc;
}
@ -1413,8 +1413,8 @@ ProcXF86VidModeGetMonitor(ClientPtr client)
if (rep.modelLength)
WriteToClient(client, rep.modelLength, (char *)(VidModeGetMonitorValue(monitor, VIDMODE_MON_MODEL, 0)).ptr);
DEALLOCATE_LOCAL(hsyncdata);
DEALLOCATE_LOCAL(vsyncdata);
xfree(hsyncdata);
xfree(vsyncdata);
return (client->noClientException);
}
@ -1498,11 +1498,11 @@ ProcXF86VidModeGetDotClocks(ClientPtr client)
rep.flags = 0;
if (!ClockProg) {
Clocks = ALLOCATE_LOCAL(numClocks * sizeof(int));
Clocks = xalloc(numClocks * sizeof(int));
if (!Clocks)
return BadValue;
if (!VidModeGetClocks(stuff->screen, Clocks)) {
DEALLOCATE_LOCAL(Clocks);
xfree(Clocks);
return BadValue;
}
}
@ -1529,7 +1529,7 @@ ProcXF86VidModeGetDotClocks(ClientPtr client)
}
}
DEALLOCATE_LOCAL(Clocks);
xfree(Clocks);
return (client->noClientException);
}