96eafa3d4f
xkb: when copying sections, make sure num_rows is set too.
...
(cherry picked from commit 41991fb991
2008-02-07 21:24:38 +10:30
e5e531ce96
Merge branch 'master' into mpx
...
Conflicts:
dix/events.c
2008-01-31 16:36:17 +10:30
6c38682084
kdrive: AddInputClient takes a ClientPtr.
2008-01-31 15:51:32 +10:30
1692dcf197
dix: print out event type if a bogus pointer event occurs.
2008-01-30 13:04:58 +10:30
d954f9c803
xkb: don't update LEDs if they don't exist. (Bug #13961 )
...
In some weird cases we call this function when there is no SrvLedInfo on the
device. And it turns out null-pointer dereferences are bad.
X.Org Bug 13961 <http://bugs.freedesktop.org/show_bug.cgi?id=13961 >
2008-01-30 10:39:54 +10:30
df325be394
Bug 13101: xorg-server has a typo in hw/xfree86/os-support/bsd/i386_video.c
...
X.Org Bug #13101 <https://bugs.freedesktop.org/show_bug.cgi?id=13101 >
Patch #12360 <https://bugs.freedesktop.org/attachment.cgi?id=12360 >
2008-01-29 09:48:00 -08:00
94f412cb7e
Loader: Fix verbosity confusion
...
'Loading foo' is verbosity 3, whereas 'already built-in' is verbosity 0.
This means that gdm's log would just be full of bare 'module already
built-in' messages.
2008-01-29 14:46:15 +11:00
442838fcb3
xorg.conf.man: Fix monitor/output confusion in monitor positioning
...
On the Intel driver at least, LeftOf/RightOf/Above/Below in xorg.conf refers
to output names, not monitor names. Fix nomenclature in xorg.conf.man.
2008-01-29 14:46:15 +11:00
5b8641a5fd
xfree86: fix AlwaysCore handling. (Bug #14256 )
...
Assume AlwaysCore being set by default, just like the other options.
X.Org Bug 14256 <http://bugs.freedesktop.org/show_bug.cgi?id=14256 >
2008-01-29 10:01:42 +10:30
975ab11799
config: don't reset connection info on disconnect.
...
If dbus is restarted, we try to connect again and this is difficult if the
busname and/or busobject is not set.
(cherry picked from commit 210eeef495
2008-01-29 09:13:25 +10:30
7dde5a694a
config: check connection != NULL before getting dbus' dispatch status.
...
(cherry picked from commit d232665223
2008-01-29 09:13:25 +10:30
f0ba770716
config: only shutdown libhal if the connection is valid.
...
Thanks to libdbus' extensive use of assert we won't just get an error, it'll
bring the whole server down for us.
(cherry picked from commit fb07fab2c0
2008-01-29 09:13:25 +10:30
2cb0ebec2b
config: add a debug message, fix a whitespace error.
...
(cherry picked from commit 7732898aaa
2008-01-29 09:13:25 +10:30
4fc2d3cef8
Rootless: RootlessEnsureFrame: Added check for !IsRoot
...
This was causing an issue with Apple-DRI and was reported here:
http://trac.macosforge.org/projects/xquartz/ticket/51
(cherry picked from commit 116800279d2ec783c63f43d3902627edde6a4cff)
2008-01-28 12:25:29 -08:00
16b0614c8c
Merge commit 'upstream/master'
2008-01-26 16:13:25 -05:00
0ac1755977
Merge branch 'master' into mpx
...
Conflicts:
Xext/sampleEVI.c
2008-01-26 13:55:07 +10:30
e915a26397
xselinux: Move the extension to extmod instead of being built-in.
2008-01-25 19:22:19 -05:00
210eeef495
config: don't reset connection info on disconnect.
...
If dbus is restarted, we try to connect again and this is difficult if the
busname and/or busobject is not set.
2008-01-26 09:39:54 +10:30
f6a78ee143
XACE: Remove the extension code entirely, XACE is completely static now.
2008-01-25 18:04:10 -05:00
7724c30a75
XACE: Stop using fake requestVectors in favor of a simple hook call.
2008-01-25 17:28:17 -05:00
f82329b081
XACE: Don't need to actually register a protocol extension.
2008-01-25 16:20:46 -05:00
d232665223
config: check connection != NULL before getting dbus' dispatch status.
2008-01-25 13:54:47 +10:30
fb07fab2c0
config: only shutdown libhal if the connection is valid.
...
Thanks to libdbus' extensive use of assert we won't just get an error, it'll
bring the whole server down for us.
2008-01-25 13:45:22 +10:30
7732898aaa
config: add a debug message, fix a whitespace error.
2008-01-25 11:50:07 +10:30
46794d0c96
xselinux: Rename SelectionManager to more generic SecurityManager.
2008-01-24 19:49:13 -05:00
466f655219
Xi: if deviceid is > 127 assume GE mask is for all devices (XiSelectEvent).
2008-01-25 10:27:30 +10:30
379f057646
Xext: add GEDeviceMaskIsSet (GE mask checking per device)
...
If a mask was set for the NULL device, then we pretend the mask is set for all
devices.
2008-01-25 10:27:26 +10:30
91dc8c43d2
Xi: Change window access right check to RecieveAccess in XiSelectEvent.
2008-01-25 10:27:21 +10:30
94a6a65ae7
Xext: allow per-device GE masks.
...
Instead of a single mask per client we allow the storage of a mask per client
per device.
2008-01-25 10:26:41 +10:30
6ffeecabb7
xselinux: Use a privileged bit in the state instead of passing an index
...
to the permission checking function.
2008-01-24 18:11:49 -05:00
7ba8e97cba
xselinux: Implement "get context" protocol requests.
2008-01-24 19:09:58 -05:00
f0bf9a5231
xselinux: Whitespace fixups.
2008-01-24 19:02:35 -05:00
734e115871
Bug #12439 : add a quirk to use +hsync +vsync for the probed detailed mode.
...
Samsung 205BW quirk is somehow reworked.
2008-01-23 21:24:09 +08:00
cc22b05ea0
There is no such thing as /dev/cpu/mtrr.
2008-01-22 18:57:11 -05:00
1a88aed5c8
Add tags/TAGS to .gitignore for ctags usage
2008-01-21 21:16:13 -05:00
be6c17fcf9
CVE-2007-6429: Always test for size+offset wrapping.
2008-01-21 16:13:21 +01:00
ba315ae5dd
Xi: add XACE hooks for device creation (ChangeDeviceHierarchy)
...
AddInputDevice checks for permissions already, so all we do is modify a few
callers to let AID sort it out.
2008-01-21 23:44:07 +10:30
94a21d757c
AIGLX: Fix GLX_EXT_texture_from_pixmap fallback with EXA.
...
Use pScreen->GetImage to obtain the pixmap contents instead of dereferencing
pPixmap->devPrivate.ptr directly.
2008-01-19 13:25:02 +01:00
e9fa7c1c88
CVE-2007-6429: Don't spuriously reject <8bpp shm pixmaps.
...
Move size validation after depth validation, and only validate size if
the bpp of the pixmap format is > 8. If bpp < 8 then we're already
protected from overflow by the width and height checks.
2008-01-18 14:41:20 -05:00
6492d513c0
dix: if a client has a core grab, return the grab device on QueryPointer.
...
The correct thing would be to return the ClientPointer. However, if the client
for some reason has a core grab on another device (e.g. as result of a passive
grab), return the coordinates of the grabbed device instead.
This makes the use of nautilus a bit saner.
2008-01-18 21:44:22 +10:30
cd2ad4c2ed
dix: remove some superfluous lines in ProcChangeActivePointerGrab.
2008-01-18 20:11:55 +10:30
8a925d201e
dix: free the genericMasks when ungrabbing.
...
This finally plugs a memory hole created by grabs registering for generic
events.
2008-01-18 20:07:20 +10:30
8949d81a3c
include: mark CoreProcessPointerEvent, CoreProcessKeyboardEvent as deprecated.
...
ProcessOtherEvent does all the work now.
2008-01-18 19:45:54 +10:30
d323fd6420
dix: remove inputInfo.pointer refernce in EventSelectForWindow
...
If the window being changed is set as the motion hint window for any device,
the device's motion hint window is set to NULL. Which is kinda what the old
code did, except that it did it with only the VCP.
2008-01-18 19:18:07 +10:30
883811c2be
dix: remove inputInfo.pointer reference in TryClientEvents.
...
Unfortunately, this requires a change in the TCE API, and thus a change in all
callers. Tough luck.
2008-01-18 18:48:46 +10:30
6e17184486
Xi: Check for DestroyAccess when trying to delete a master device.
2008-01-18 17:52:38 +10:30
23f3f0e27d
XQuartz: Moved SetFrontProcess haco to set_front_process
...
So it is done by the other thread...
(cherry picked from commit 7429379eb1001ee3dc769daa8fe6b3aef1b9cc8a)
2008-01-17 09:49:25 -08:00
8e133d9674
Fix for CVE-2008-0006 - PCF Font parser buffer overflow.
2008-01-17 15:29:06 +01:00
6de61f8272
Fix for CVE-2007-6429 - MIT-SHM and EVI extensions integer overflows.
2008-01-17 15:28:42 +01:00
7dc1717ff0
Fix for CVE-2007-6428 - TOG-cup extension memory corruption.
2008-01-17 15:28:03 +01:00
Peter Hutterer
Benjamin Tissoires
Coleman Kane
Julien Goodwin
Jeremy Huddleston
David Nusinow
Eamon Walsh
Hong Liu
Adam Jackson
Matthias Hopf
Michel Dänzer
Jeremy Huddleston
Matthieu Herrb