Hello community,
here is the log from the commit of package xorg-x11-server for openSUSE:Factory
checked in at Mon Aug 3 18:37:33 CEST 2009.
--------
--- xorg-x11-server/xorg-x11-server.changes 2009-07-08 03:00:55.000000000 +0200
+++ xorg-x11-server/xorg-x11-server.changes 2009-08-01 11:08:34.000000000 +0200
@@ -1,0 +2,15 @@
+Sat Aug 1 10:47:53 CEST 2009 - sndirsch@suse.de
+
+- xorg-server 1.6.3
+ * This mostly just collects a bunch of minor fixes since 1.6.2.
+ Two notable inclusions are:
+ - Replacing dixLookupResource with dixLookupResourceByType,
+ dixLookupResourceByClass. This returns us to having two
+ resource lookup functions, but this time we have a more
+ sensible name and argument set.
+ - Fixing RandR transforms for drivers providing set_mode_major.
+ These patches were originally slated to land in 1.6.2 but
+ I missed them somehow.
+- obsoletes commit-cadf65a.diff
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
commit-cadf65a.diff
xorg-server-1.6.2.tar.bz2
New:
----
xorg-server-1.6.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.bWXON7/_old 2009-08-03 18:36:46.000000000 +0200
+++ /var/tmp/diff_new_pack.bWXON7/_new 2009-08-03 18:36:46.000000000 +0200
@@ -20,7 +20,7 @@
%define moblin 0
Name: xorg-x11-server
-%define dirsuffix 1.6.2
+%define dirsuffix 1.6.3
%define fglrx_driver_hack 0
### FIXME
%define vnc 1
@@ -33,7 +33,7 @@
Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.4
-Release: 46
+Release: 47
License: GPL v2 or later ; MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -109,7 +109,6 @@
Patch127: dpms_screensaver.diff
Patch128: pci-legacy-mem-fallback.diff
Patch129: bug474071-fix1.diff
-Patch131: commit-cadf65a.diff
Patch132: fixed-SYNC-extension-trigger-BlockHandler-test.diff
Patch140: fbdev_fallback_fail_fix.diff
Patch142: bug-507190_xorg-x11-server-bnc381139-randr-reprobe-on-unsuspend.diff
@@ -238,7 +237,6 @@
pushd hw/xfree86/os-support/bus
%patch129 -p0
popd
-%patch131 -p1
%patch132 -p1
%patch140 -p1
%patch142 -p1
++++++ xorg-server-1.6.2.tar.bz2 -> xorg-server-1.6.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/ChangeLog new/xorg-server-1.6.3/ChangeLog
--- old/xorg-server-1.6.2/ChangeLog 2009-07-08 00:15:34.000000000 +0200
+++ new/xorg-server-1.6.3/ChangeLog 2009-08-01 08:34:30.000000000 +0200
@@ -1,3 +1,232 @@
+commit 55dcfdbbd6a2a4debb717b104c4b54f4a2c76fff
+Author: Alan Coopersmith
+Date: Tue Jul 28 15:02:37 2009 -0700
+
+ Remove hardcoded gcc -Wall option from configure.ac
+
+ Signed-off-by: Alan Coopersmith
+ (cherry picked from commit 442967c90dd9d8483a56bdc9237c49e33d619126)
+
+commit 4d349b6c333449517913a5e981b4fc3155da4855
+Author: Adam Jackson
+Date: Fri Mar 27 15:56:15 2009 -0400
+
+ selinux: Only activate if policy says to be an object manager
+ (cherry picked from commit 283a081572d8db787c77d09e5ba6bcadebf4f7fe)
+
+commit d0875154f4f4b751264a2f6781500e97409a499b
+Author: Ben Skeggs
+Date: Wed May 27 15:24:34 2009 +1000
+
+ quirk: use first detailed timing as preferred for PEA prod 9003 (rh#492359)
+
+ Signed-off-by: Peter Hutterer
+ (cherry picked from commit 048697ccfa31cf7f7a29afa90a2f702d43efb7d4)
+
+commit c941479ecc2dead9c3deaee2620c9b9518c3da9a
+Author: Rémi Cardona
+Date: Mon Jul 27 12:07:51 2009 +0200
+
+ config: add HAL error checks
+
+ This patch simplifies error handling in the HAL code and fixes a
+ segfault if libhal_find_device_by_capability() failed.
+
+ Fixes http://bugs.gentoo.org/278760
+
+ Based on a patch by Martin von Gagern
+
+ Signed-off-by: Rémi Cardona
+ Acked-by: Peter Hutterer
+ (cherry picked from commit b1c3dc6ae226db178420e3b5f297b94afc87c94c)
+
+commit 546f913ff5461dd93d4a0b29b24d2267557326c7
+Author: Alan Coopersmith
+Date: Fri May 8 21:31:01 2009 -0700
+
+ Don't printf NULL pointers on HAL connection error
+
+ Fixes Solaris bug 6801386 Xorg core dumps on startup if hald not running
+ http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6801386
+
+ Signed-off-by: Alan Coopersmith
+ (cherry picked from commit 1e816065e5ec3b9394dc1fa5815457a664e15fd9)
+
+commit 155cb2f9a376d40b699a72ac3bdede71af1b518f
+Author: Keith Packard
+Date: Sun Jul 26 14:22:35 2009 -0700
+
+ Bump to version 1.6.2.901 (1.6.3 RC1)
+
+ Signed-off-by: Keith Packard
+
+commit 87900645c22d6066fe70190ab838a687808db5c3
+Author: Dave Airlie
+Date: Thu Jun 11 14:21:53 2009 +1000
+
+ xfree86: move didLock assignment down to where the function pointer is valid.
+
+ crtc->funcs->lock is NULL, so it's no use calling it here. Move it down so
+ it's actually defined before we use it.
+
+ Introduced with 6f59a8160042ea145514fdcb410f17f33fd437c2.
+
+ Tested-by: Peter Hutterer
+ (cherry picked from commit 0de58c88aba7ddd69b04f24ab5b2967c359aa69e)
+
+ Signed-off-by: Keith Packard
+
+commit 72c9bc64ff86999a4643663e5699a6547a9e2997
+Author: Benjamin Defnet
+Date: Wed Jun 10 21:35:48 2009 -0700
+
+ randr: fix operation order so that rotation+transform works
+
+ The matrix multiply to combine rotation and projective transforms was being
+ done in the wrong order.
+
+ Signed-off-by: Keith Packard
+ (cherry picked from commit b2bf67b61c564a4b92a429ca9ad455403161f33a)
+
+ Signed-off-by: Keith Packard
+
+commit 7f95d18397757facafcba39e4613b2ed5047c5c4
+Author: Benjamin Defnet
+Date: Mon Jun 8 21:45:42 2009 -0700
+
+ hw/xf86/modes: Set crtc mode/rotation/transform before calling set_mode_major
+
+ This moves code out of each implementation of set_mode_major and back into
+ the X server. The real feature here is that the transform is now available
+ in the crtc for use by either xf86CrtcRotate or whatever the driver wants to
+ do. Without this change, the transform was lost for drivers providing the
+ set_mode_major interface.
+
+ Note that users of this API will want to stop smashing the transformPresent
+ field, and could also stop setting mode/x/y/rotation for new enough X servers,
+ but there's no reason to make that change as it will break things when
+ running against older X servers.
+
+ Signed-off-by: Keith Packard
+ Acked-by: Daniel Stone
+ (cherry picked from commit 6f59a8160042ea145514fdcb410f17f33fd437c2)
+
+ Signed-off-by: Keith Packard
+
+commit abc89e2c48a88c29f49fe44d03778deab4b1a3b9
+Author: Matthias Hopf
+Date: Tue Mar 10 15:49:49 2009 +0100
+
+ randr: Nuke broken set_origin shortcut
+
+ Shortcut is impossible to implement this way, because we don't know for sure
+ whether the crtc of an output has changed or not.
+ (cherry picked from commit cadf65a6e190a8952ad3cc216dc9ea55241de91a)
+
+ Signed-off-by: Keith Packard
+
+commit b1eed8970f7c5b07152dbc6b7dcc4c8504aeb67c
+Author: Julien Cristau
+Date: Fri May 22 09:54:38 2009 +0200
+
+ randr: fix server crash in RRGetScreenInfo
+
+ We don't return rates to randr < 1.1 clients, so don't allocate space
+ for them. This fixes a FatalError due to not all allocated space being
+ used.
+
+ X.Org bug#21861 http://bugs.freedesktop.org/show_bug.cgi?id=21861
+
+ Reported-by: Guillaume Quintin
+ Signed-off-by: Julien Cristau
+ (cherry picked from commit 12e725d08b4cf7dbb7f09b9ec09fa1b621156ea9)
+
+ Signed-off-by: Keith Packard
+
+commit 1addf6fe235f8537024140aff56dffb4738701a7
+Author: Keith Packard
+Date: Wed Aug 6 15:26:24 2008 -0700
+
+ Replace dixLookupResource by dixLookupResourceBy{Type,Class}
+
+ dixLookupResource attempted to automatically detect whether the caller
+ wanted a lookup by-type or by-class, unfortunately, it guessed wrong for
+ RT_NONE. Instead of trying to make the guess better, this patch just reverts
+ the unification and creates separate functions for each operation.
+ (cherry picked from commit f8dd80d13bb5313a11b38b280f8ad3e22f0a6300)
+
+ Signed-off-by: Keith Packard
+
+commit c838a03e891a6fcd2f7b71f727c1b93f7c26e7a7
+Author: Robert Noland
+Date: Wed Apr 15 12:06:19 2009 -0500
+
+ One = is more than adequate here. Make is sh safe.
+ (cherry picked from commit b3e3154cce47add97f5561088036ce3b9e7dc937)
+
+ Signed-off-by: Keith Packard
+
+commit 68cb38bed65c49716104eeb345c4b1b85a4b15bc
+Author: Rémi Cardona
+Date: Fri Jul 3 10:51:50 2009 +0200
+
+ configure: libXinerama isn't needed anymore
+
+ since libXinerama commit 90d4d23bf2e94721149ddc0a80093b10a82e8845 and
+ xineramaproto commit 21477147613c28c968b5e1eb9d8aea7017dd399d, the
+ server no longer needs libXinerama.
+
+ Signed-off-by: Rémi Cardona
+ (cherry picked from commit 2c69deb92e11542f615df0f24fdc03e3b4415475)
+
+ Signed-off-by: Keith Packard
+
+commit ec60f4ca65dbc25f9a40636f5280b1a1ec68407f
+Author: Michel Dänzer
+Date: Fri Jul 10 20:06:02 2009 +0200
+
+ EXA: Only pass CT_YXBANDED to RECTS_TO_REGION() if that is really true.
+
+ Fixes http://bugs.freedesktop.org/show_bug.cgi?id=22642 .
+ (cherry picked from commit 35758544813f156eaac28844e693b2a28f6de316)
+
+ Signed-off-by: Keith Packard
+
+commit b10c4fe343d2339bae4736793939e44a6befaf88
+Author: Kim Woelders
+Date: Sat Jul 11 18:55:17 2009 +0200
+
+ Fix key repeat problem.
+
+ Signed-off-by: Kim Woelders
+
+commit 606f6dba16d42e3546a82a386d5a01087467b511
+Author: Adam Jackson
+Date: Tue Apr 14 10:54:25 2009 -0400
+
+ xdmcp: Don't crash on X -query with more than 255 IP addresses. (#20675)
+
+ You could be more clever than this, but the wire protocol says this
+ really is an array of not more than 255 ARRAY8, so it's not just a
+ matter of changing the types.
+
+ (cherry picked from commit 0eb19f9437b7d8c19592e49eedb028771d300d80)
+
+commit 396d3a7762abd0dd84042833b75f2ebf9d100bb0
+Author: Alan Coopersmith
+Date: Wed Jul 8 11:26:46 2009 -0700
+
+ Fix build of drivers with 1.6.2 when not using --install-libxf86config
+
+ c859b736d1d23c5dc2f53958b1e76660e6d45018 removed duplicate entries for
+ these from the Makefile, but removed a different set than was done in
+ master branch, causing xf86Parser.h to not be installed, which in turn
+ breaks the build of drivers like -ati, -intel & -nv that use xf86Modes.h,
+ which includes xf86Parser.h
+
+ Signed-off-by: Alan Coopersmith
+ Signed-off-by: Keith Packard
+
commit 6f1aff5a2b45bc2985081abc240a8fed37170386
Author: Keith Packard
Date: Mon Jul 6 14:08:31 2009 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/Xext/saver.c new/xorg-server-1.6.3/Xext/saver.c
--- old/xorg-server-1.6.2/Xext/saver.c 2009-07-07 19:48:57.000000000 +0200
+++ new/xorg-server-1.6.3/Xext/saver.c 2009-07-26 22:56:57.000000000 +0200
@@ -1054,7 +1054,7 @@
}
else
{
- ret = dixLookupResource((pointer *)&pPixmap, pixID, RT_PIXMAP,
+ ret = dixLookupResourceByType((pointer *)&pPixmap, pixID, RT_PIXMAP,
client, DixReadAccess);
if (ret == Success)
{
@@ -1092,7 +1092,7 @@
}
else
{
- ret = dixLookupResource((pointer *)&pPixmap, pixID, RT_PIXMAP,
+ ret = dixLookupResourceByType((pointer *)&pPixmap, pixID, RT_PIXMAP,
client, DixReadAccess);
if (ret == Success)
{
@@ -1186,7 +1186,7 @@
break;
case CWColormap:
cmap = (Colormap) *pVlist;
- ret = dixLookupResource((pointer *)&pCmap, cmap, RT_COLORMAP,
+ ret = dixLookupResourceByType((pointer *)&pCmap, cmap, RT_COLORMAP,
client, DixUseAccess);
if (ret != Success)
{
@@ -1210,7 +1210,7 @@
}
else
{
- ret = dixLookupResource((pointer *)&pCursor, cursorID,
+ ret = dixLookupResourceByType((pointer *)&pCursor, cursorID,
RT_CURSOR, client, DixUseAccess);
if (ret != Success)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/Xext/security.c new/xorg-server-1.6.3/Xext/security.c
--- old/xorg-server-1.6.2/Xext/security.c 2009-07-07 19:48:57.000000000 +0200
+++ new/xorg-server-1.6.3/Xext/security.c 2009-07-26 22:56:57.000000000 +0200
@@ -1023,7 +1023,7 @@
case ClientStateRunning:
state->authId = AuthorizationIDOfClient(pci->client);
- rc = dixLookupResource((pointer *)&pAuth, state->authId,
+ rc = dixLookupResourceByType((pointer *)&pAuth, state->authId,
SecurityAuthorizationResType, serverClient,
DixGetAttrAccess);
if (rc == Success) {
@@ -1038,7 +1038,7 @@
case ClientStateGone:
case ClientStateRetained:
- rc = dixLookupResource((pointer *)&pAuth, state->authId,
+ rc = dixLookupResourceByType((pointer *)&pAuth, state->authId,
SecurityAuthorizationResType, serverClient,
DixGetAttrAccess);
if (rc == Success) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/Xext/shape.c new/xorg-server-1.6.3/Xext/shape.c
--- old/xorg-server-1.6.2/Xext/shape.c 2009-07-07 19:48:57.000000000 +0200
+++ new/xorg-server-1.6.3/Xext/shape.c 2009-07-26 22:56:57.000000000 +0200
@@ -428,7 +428,7 @@
if (stuff->src == None)
srcRgn = 0;
else {
- rc = dixLookupResource((pointer *)&pPixmap, stuff->src, RT_PIXMAP,
+ rc = dixLookupResourceByType((pointer *)&pPixmap, stuff->src, RT_PIXMAP,
client, DixReadAccess);
if (rc != Success)
return (rc == BadValue) ? BadPixmap : rc;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/Xext/sync.c new/xorg-server-1.6.3/Xext/sync.c
--- old/xorg-server-1.6.2/Xext/sync.c 2009-07-07 19:48:57.000000000 +0200
+++ new/xorg-server-1.6.3/Xext/sync.c 2009-07-26 22:56:57.000000000 +0200
@@ -440,7 +440,7 @@
{
if (counter == None)
pCounter = NULL;
- else if (Success != (rc = dixLookupResource((pointer *)&pCounter,
+ else if (Success != (rc = dixLookupResourceByType ((pointer *)&pCounter,
counter, RTCounter, client, DixReadAccess)))
{
client->errorValue = counter;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/Xext/xselinux.c new/xorg-server-1.6.3/Xext/xselinux.c
--- old/xorg-server-1.6.2/Xext/xselinux.c 2009-07-07 19:48:57.000000000 +0200
+++ new/xorg-server-1.6.3/Xext/xselinux.c 2009-07-30 00:50:06.000000000 +0200
@@ -557,7 +557,7 @@
SELinuxScreen(NULL, NULL, &srec);
/* Do the default colormap */
- dixLookupResource(&unused, screenInfo.screens[i]->defColormap,
+ dixLookupResourceByType(&unused, screenInfo.screens[i]->defColormap,
RT_COLORMAP, serverClient, DixCreateAccess);
}
}
@@ -1989,6 +1989,10 @@
return;
}
+ /* Don't init unless there's something to do */
+ if (!security_get_boolean_active("xserver_object_manager"))
+ return;
+
/* Check SELinux mode in configuration file */
switch(selinuxEnforcingState) {
case SELINUX_MODE_DISABLED:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/Xext/xtest.c new/xorg-server-1.6.3/Xext/xtest.c
--- old/xorg-server-1.6.2/Xext/xtest.c 2009-07-07 19:48:57.000000000 +0200
+++ new/xorg-server-1.6.3/Xext/xtest.c 2009-07-26 22:56:57.000000000 +0200
@@ -124,8 +124,8 @@
else if (stuff->cursor == XTestCurrentCursor)
pCursor = GetSpriteCursor(ptr);
else {
- rc = dixLookupResource((pointer *)&pCursor, stuff->cursor, RT_CURSOR,
- client, DixReadAccess);
+ rc = dixLookupResourceByType((pointer *)&pCursor, stuff->cursor, RT_CURSOR,
+ client, DixReadAccess);
if (rc != Success)
{
client->errorValue = stuff->cursor;
@@ -158,7 +158,7 @@
int numValuators = 0;
int firstValuator = 0;
EventListPtr events;
- int nevents;
+ int nevents = 0;
int i;
int base = 0;
int flags = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/Xi/exevents.c new/xorg-server-1.6.3/Xi/exevents.c
--- old/xorg-server-1.6.2/Xi/exevents.c 2009-07-07 19:48:57.000000000 +0200
+++ new/xorg-server-1.6.3/Xi/exevents.c 2009-07-26 22:56:57.000000000 +0200
@@ -1349,7 +1349,7 @@
if (rcursor == None)
cursor = NullCursor;
else {
- rc = dixLookupResource((pointer *)&cursor, rcursor, RT_CURSOR,
+ rc = dixLookupResourceByType((pointer *)&cursor, rcursor, RT_CURSOR,
client, DixUseAccess);
if (rc != Success)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/composite/compext.c new/xorg-server-1.6.3/composite/compext.c
--- old/xorg-server-1.6.2/composite/compext.c 2009-07-07 19:48:57.000000000 +0200
+++ new/xorg-server-1.6.3/composite/compext.c 2009-07-26 22:56:57.000000000 +0200
@@ -144,7 +144,7 @@
REQUEST(xCompositeRedirectWindowReq);
REQUEST_SIZE_MATCH(xCompositeRedirectWindowReq);
- rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW, client,
+ rc = dixLookupResourceByType((pointer *)&pWin, stuff->window, RT_WINDOW, client,
DixSetAttrAccess|DixManageAccess|DixBlendAccess);
if (rc != Success)
{
@@ -162,7 +162,7 @@
REQUEST(xCompositeRedirectSubwindowsReq);
REQUEST_SIZE_MATCH(xCompositeRedirectSubwindowsReq);
- rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW, client,
+ rc = dixLookupResourceByType((pointer *)&pWin, stuff->window, RT_WINDOW, client,
DixSetAttrAccess|DixManageAccess|DixBlendAccess);
if (rc != Success)
{
@@ -214,7 +214,7 @@
REQUEST(xCompositeCreateRegionFromBorderClipReq);
REQUEST_SIZE_MATCH(xCompositeCreateRegionFromBorderClipReq);
- rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW, client,
+ rc = dixLookupResourceByType((pointer *)&pWin, stuff->window, RT_WINDOW, client,
DixGetAttrAccess);
if (rc != Success)
{
@@ -250,7 +250,7 @@
REQUEST(xCompositeNameWindowPixmapReq);
REQUEST_SIZE_MATCH(xCompositeNameWindowPixmapReq);
- rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW, client,
+ rc = dixLookupResourceByType((pointer *)&pWin, stuff->window, RT_WINDOW, client,
DixGetAttrAccess);
if (rc != Success)
{
@@ -298,7 +298,7 @@
int rc;
REQUEST_SIZE_MATCH(xCompositeGetOverlayWindowReq);
- rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW, client,
+ rc = dixLookupResourceByType((pointer *)&pWin, stuff->window, RT_WINDOW, client,
DixGetAttrAccess);
if (rc != Success)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/config/hal.c new/xorg-server-1.6.3/config/hal.c
--- old/xorg-server-1.6.2/config/hal.c 2009-07-07 19:48:57.000000000 +0200
+++ new/xorg-server-1.6.3/config/hal.c 2009-07-30 00:49:36.000000000 +0200
@@ -474,13 +474,13 @@
char **devices;
int num_devices, i;
+ if (info->hal_ctx)
+ return TRUE; /* already registered, pretend we did something */
+
info->system_bus = connection;
dbus_error_init(&error);
- if (info->hal_ctx)
- return TRUE; /* already registered, pretend we did something */
-
info->hal_ctx = libhal_ctx_new();
if (!info->hal_ctx) {
LogMessage(X_ERROR, "config/hal: couldn't create HAL context\n");
@@ -493,13 +493,15 @@
}
if (!libhal_ctx_init(info->hal_ctx, &error)) {
LogMessage(X_ERROR, "config/hal: couldn't initialise context: %s (%s)\n",
- error.name, error.message);
+ error.name ? error.name : "unknown error",
+ error.message ? error.message : "null");
goto out_ctx;
}
if (!libhal_device_property_watch_all(info->hal_ctx, &error)) {
LogMessage(X_ERROR, "config/hal: couldn't watch all properties: %s (%s)\n",
- error.name, error.message);
- goto out_ctx2;
+ error.name ? error.name : "unknown error",
+ error.message ? error.message : "null");
+ goto out_ctx;
}
libhal_ctx_set_device_added(info->hal_ctx, device_added);
libhal_ctx_set_device_removed(info->hal_ctx, device_removed);
@@ -507,6 +509,12 @@
devices = libhal_find_device_by_capability(info->hal_ctx, "input",
&num_devices, &error);
/* FIXME: Get default devices if error is set. */
+ if (dbus_error_is_set(&error)) {
+ LogMessage(X_ERROR, "config/hal: couldn't find input device: %s (%s)\n",
+ error.name ? error.name : "unknown error",
+ error.message ? error.message : "null");
+ goto out_ctx;
+ }
for (i = 0; i < num_devices; i++)
device_added(info->hal_ctx, devices[i]);
libhal_free_string_array(devices);
@@ -515,12 +523,19 @@
return TRUE;
-out_ctx2:
- if (!libhal_ctx_shutdown(info->hal_ctx, &error))
- LogMessage(X_WARNING, "config/hal: couldn't shut down context: %s (%s)\n",
- error.name, error.message);
out_ctx:
- libhal_ctx_free(info->hal_ctx);
+ dbus_error_free(&error);
+
+ if (info->hal_ctx) {
+ if (!libhal_ctx_shutdown(info->hal_ctx, &error)) {
+ LogMessage(X_WARNING, "config/hal: couldn't shut down context: %s (%s)\n",
+ error.name ? error.name : "unknown error",
+ error.message ? error.message : "null");
+ dbus_error_free(&error);
+ }
+ libhal_ctx_free(info->hal_ctx);
+ }
+
out_err:
dbus_error_free(&error);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/configure new/xorg-server-1.6.3/configure
--- old/xorg-server-1.6.2/configure 2009-07-08 00:15:09.000000000 +0200
+++ new/xorg-server-1.6.3/configure 2009-08-01 08:34:08.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for xorg-server 1.6.2.
+# Generated by GNU Autoconf 2.63 for xorg-server 1.6.3.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -745,8 +745,8 @@
# Identity of this package.
PACKAGE_NAME='xorg-server'
PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='1.6.2'
-PACKAGE_STRING='xorg-server 1.6.2'
+PACKAGE_VERSION='1.6.3'
+PACKAGE_STRING='xorg-server 1.6.3'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1957,7 +1957,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xorg-server 1.6.2 to adapt to many kinds of systems.
+\`configure' configures xorg-server 1.6.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -2027,7 +2027,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xorg-server 1.6.2:";;
+ short | recursive ) echo "Configuration of xorg-server 1.6.3:";;
esac
cat <<\_ACEOF
@@ -2333,7 +2333,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xorg-server configure 1.6.2
+xorg-server configure 1.6.3
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -2347,7 +2347,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xorg-server $as_me 1.6.2, which was
+It was created by xorg-server $as_me 1.6.3, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -3064,7 +3064,7 @@
# Define the identity of the package.
PACKAGE='xorg-server'
- VERSION='1.6.2'
+ VERSION='1.6.3'
cat >>confdefs.h <<_ACEOF
@@ -3229,7 +3229,7 @@
-RELEASE_DATE="2009-7-7"
+RELEASE_DATE="2009-7-31"
ac_config_headers="$ac_config_headers include/do-not-use-config.h"
@@ -22497,7 +22497,7 @@
DRI2=yes
;;
esac
- if test "x$DRI2" == xyes; then
+ if test "x$DRI2" = xyes; then
DRI2_TRUE=
DRI2_FALSE='#'
else
@@ -22626,7 +22626,7 @@
if test "x$DRI2" = xyes; then
save_CFLAGS=$CFLAGS
- CFLAGS="$GL_CFLAGS $LIBDRM_CFLAGS -Wall"
+ CFLAGS="$GL_CFLAGS $LIBDRM_CFLAGS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -22680,7 +22680,7 @@
DRI2_AIGLX=no
fi
fi
- if test "x$DRI2_AIGLX" == xyes; then
+ if test "x$DRI2_AIGLX" = xyes; then
DRI2_AIGLX_TRUE=
DRI2_AIGLX_FALSE='#'
else
@@ -22709,7 +22709,7 @@
#define PANORAMIX 1
_ACEOF
- REQUIRED_MODULES="$REQUIRED_MODULES xineramaproto xinerama"
+ REQUIRED_MODULES="$REQUIRED_MODULES xineramaproto"
fi
if test "x$XACE" = xyes; then
@@ -30753,7 +30753,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xorg-server $as_me 1.6.2, which was
+This file was extended by xorg-server $as_me 1.6.3, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -30816,7 +30816,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-xorg-server config.status 1.6.2
+xorg-server config.status 1.6.3
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/configure.ac new/xorg-server-1.6.3/configure.ac
--- old/xorg-server-1.6.2/configure.ac 2009-07-08 00:14:36.000000000 +0200
+++ new/xorg-server-1.6.3/configure.ac 2009-08-01 08:33:54.000000000 +0200
@@ -26,12 +26,12 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.6.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.6.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
-RELEASE_DATE="2009-7-7"
+RELEASE_DATE="2009-7-31"
dnl this gets generated by autoheader, and thus contains all the defines. we
dnl don't ever actually use it, internally.
@@ -870,7 +870,7 @@
DRI2=yes
;;
esac
-AM_CONDITIONAL(DRI2, test "x$DRI2" == xyes)
+AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes)
if test "x$DRI" = xyes || test "x$DRI2" = xyes; then
PKG_CHECK_MODULES([LIBDRM], [libdrm >= 2.3.0])
@@ -880,7 +880,7 @@
if test "x$DRI2" = xyes; then
save_CFLAGS=$CFLAGS
- CFLAGS="$GL_CFLAGS $LIBDRM_CFLAGS -Wall"
+ CFLAGS="$GL_CFLAGS $LIBDRM_CFLAGS"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include
#include
#ifndef __DRI_DRI2
@@ -897,14 +897,14 @@
DRI2_AIGLX=no
fi
fi
-AM_CONDITIONAL(DRI2_AIGLX, test "x$DRI2_AIGLX" == xyes)
+AM_CONDITIONAL(DRI2_AIGLX, test "x$DRI2_AIGLX" = xyes)
AM_CONDITIONAL(XINERAMA, [test "x$XINERAMA" = xyes])
if test "x$XINERAMA" = xyes; then
AC_DEFINE(XINERAMA, 1, [Support Xinerama extension])
AC_DEFINE(PANORAMIX, 1, [Internal define for Xinerama])
- REQUIRED_MODULES="$REQUIRED_MODULES xineramaproto xinerama"
+ REQUIRED_MODULES="$REQUIRED_MODULES xineramaproto"
fi
AM_CONDITIONAL(XACE, [test "x$XACE" = xyes])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/dix/cursor.c new/xorg-server-1.6.3/dix/cursor.c
--- old/xorg-server-1.6.2/dix/cursor.c 2009-07-07 19:48:57.000000000 +0200
+++ new/xorg-server-1.6.3/dix/cursor.c 2009-07-26 22:56:57.000000000 +0200
@@ -298,15 +298,15 @@
GlyphSharePtr pShare;
DeviceIntPtr pDev;
- rc = dixLookupResource((pointer *)&sourcefont, source, RT_FONT, client,
- DixUseAccess);
+ rc = dixLookupResourceByType((pointer *)&sourcefont, source, RT_FONT, client,
+ DixUseAccess);
if (rc != Success)
{
client->errorValue = source;
return (rc == BadValue) ? BadFont : rc;
}
- rc = dixLookupResource((pointer *)&maskfont, mask, RT_FONT, client,
- DixUseAccess);
+ rc = dixLookupResourceByType((pointer *)&maskfont, mask, RT_FONT, client,
+ DixUseAccess);
if (rc != Success && mask != None)
{
client->errorValue = mask;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/dix/deprecated.c new/xorg-server-1.6.3/dix/deprecated.c
--- old/xorg-server-1.6.2/dix/deprecated.c 2009-07-07 19:48:57.000000000 +0200
+++ new/xorg-server-1.6.3/dix/deprecated.c 2009-07-26 22:56:57.000000000 +0200
@@ -115,48 +115,66 @@
return (i == Success) ? pClient : NULL;
}
-/* replaced by dixLookupResource */
+/* replaced by dixLookupResourceByType */
_X_EXPORT pointer
SecurityLookupIDByType(ClientPtr client, XID id, RESTYPE rtype,
Mask access_mode)
{
pointer retval;
- int i = dixLookupResource(&retval, id, rtype, client, access_mode);
+ int i = dixLookupResourceByType(&retval, id, rtype, client, access_mode);
static int warn = 1;
if (warn > 0 && --warn)
ErrorF("Warning: LookupIDByType()/SecurityLookupIDByType() "
"are deprecated. Please convert your driver/module "
- "to use dixLookupResource().\n");
+ "to use dixLookupResourceByType().\n");
return (i == Success) ? retval : NULL;
}
-/* replaced by dixLookupResource */
+/* replaced by dixLookupResourceByClass */
_X_EXPORT pointer
SecurityLookupIDByClass(ClientPtr client, XID id, RESTYPE classes,
Mask access_mode)
{
pointer retval;
- int i = dixLookupResource(&retval, id, classes, client, access_mode);
+ int i = dixLookupResourceByClass(&retval, id, classes, client, access_mode);
static int warn = 1;
if (warn > 0 && --warn)
ErrorF("Warning: LookupIDByClass()/SecurityLookupIDByClass() "
"are deprecated. Please convert your driver/module "
- "to use dixLookupResource().\n");
+ "to use dixLookupResourceByClass().\n");
return (i == Success) ? retval : NULL;
}
-/* replaced by dixLookupResource */
+/* replaced by dixLookupResourceByType */
_X_EXPORT pointer
LookupIDByType(XID id, RESTYPE rtype)
{
return SecurityLookupIDByType(NullClient, id, rtype, DixUnknownAccess);
}
-/* replaced by dixLookupResource */
+/* replaced by dixLookupResourceByClass */
_X_EXPORT pointer
LookupIDByClass(XID id, RESTYPE classes)
{
return SecurityLookupIDByClass(NullClient, id, classes, DixUnknownAccess);
}
+/* replaced by dixLookupResourceBy{Type,Class} */
+_X_EXPORT int
+dixLookupResource (pointer *result, XID id, RESTYPE rtype,
+ ClientPtr client, Mask mode)
+{
+ Bool istype = ((rtype & TypeMask) && (rtype != RC_ANY)) || (rtype == RT_NONE);
+
+ static int warn = 1;
+ if (warn > 0 && --warn)
+ ErrorF("Warning: dixLookupResource() "
+ "is deprecated. Please convert your driver/module "
+ "to use dixLookupResourceByType/dixLookupResourceByClass().\n");
+ if (istype)
+ return dixLookupResourceByType (result, id, rtype, client, mode);
+ else
+ return dixLookupResourceByClass (result, id, rtype, client, mode);
+}
+
/* end deprecated functions */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/dix/dispatch.c new/xorg-server-1.6.3/dix/dispatch.c
--- old/xorg-server-1.6.2/dix/dispatch.c 2009-07-07 19:48:57.000000000 +0200
+++ new/xorg-server-1.6.3/dix/dispatch.c 2009-07-26 22:56:57.000000000 +0200
@@ -1119,11 +1119,11 @@
REQUEST_SIZE_MATCH(xResourceReq);
client->errorValue = stuff->id; /* EITHER font or gc */
- rc = dixLookupResource((pointer *)&pFont, stuff->id, RT_FONT, client,
- DixGetAttrAccess);
+ rc = dixLookupResourceByType((pointer *)&pFont, stuff->id, RT_FONT, client,
+ DixGetAttrAccess);
if (rc == BadValue) {
- rc = dixLookupResource((pointer *)&pGC, stuff->id, RT_GC, client,
- DixGetAttrAccess);
+ rc = dixLookupResourceByType((pointer *)&pGC, stuff->id, RT_GC, client,
+ DixGetAttrAccess);
if (rc == Success)
pFont = pGC->font;
}
@@ -1177,10 +1177,10 @@
REQUEST_AT_LEAST_SIZE(xQueryTextExtentsReq);
client->errorValue = stuff->fid; /* EITHER font or gc */
- rc = dixLookupResource((pointer *)&pFont, stuff->fid, RT_FONT, client,
- DixGetAttrAccess);
+ rc = dixLookupResourceByType((pointer *)&pFont, stuff->fid, RT_FONT, client,
+ DixGetAttrAccess);
if (rc == BadValue) {
- rc = dixLookupResource((pointer *)&pGC, stuff->fid, RT_GC, client,
+ rc = dixLookupResourceByType((pointer *)&pGC, stuff->fid, RT_GC, client,
DixGetAttrAccess);
if (rc == Success)
pFont = pGC->font;
@@ -1325,7 +1325,7 @@
REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq);
- rc = dixLookupResource((pointer *)&pMap, stuff->id, RT_PIXMAP, client,
+ rc = dixLookupResourceByType((pointer *)&pMap, stuff->id, RT_PIXMAP, client,
DixDestroyAccess);
if (rc == Success)
{
@@ -2271,7 +2271,7 @@
REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq);
- rc = dixLookupResource((pointer *)&pmap, stuff->id, RT_COLORMAP, client,
+ rc = dixLookupResourceByType((pointer *)&pmap, stuff->id, RT_COLORMAP, client,
DixDestroyAccess);
if (rc == Success)
{
@@ -2299,7 +2299,7 @@
REQUEST_SIZE_MATCH(xCopyColormapAndFreeReq);
mid = stuff->mid;
LEGAL_NEW_RESOURCE(mid, client);
- rc = dixLookupResource((pointer *)&pSrcMap, stuff->srcCmap, RT_COLORMAP,
+ rc = dixLookupResourceByType((pointer *)&pSrcMap, stuff->srcCmap, RT_COLORMAP,
client, DixReadAccess|DixRemoveAccess);
if (rc == Success)
{
@@ -2324,7 +2324,7 @@
REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq);
- rc = dixLookupResource((pointer *)&pcmp, stuff->id, RT_COLORMAP, client,
+ rc = dixLookupResourceByType((pointer *)&pcmp, stuff->id, RT_COLORMAP, client,
DixInstallAccess);
if (rc != Success)
goto out;
@@ -2349,7 +2349,7 @@
REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq);
- rc = dixLookupResource((pointer *)&pcmp, stuff->id, RT_COLORMAP, client,
+ rc = dixLookupResourceByType((pointer *)&pcmp, stuff->id, RT_COLORMAP, client,
DixUninstallAccess);
if (rc != Success)
goto out;
@@ -2416,7 +2416,7 @@
REQUEST(xAllocColorReq);
REQUEST_SIZE_MATCH(xAllocColorReq);
- rc = dixLookupResource((pointer *)&pmap, stuff->cmap, RT_COLORMAP, client,
+ rc = dixLookupResourceByType((pointer *)&pmap, stuff->cmap, RT_COLORMAP, client,
DixAddAccess);
if (rc == Success)
{
@@ -2457,7 +2457,7 @@
REQUEST(xAllocNamedColorReq);
REQUEST_FIXED_SIZE(xAllocNamedColorReq, stuff->nbytes);
- rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
+ rc = dixLookupResourceByType((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
DixAddAccess);
if (rc == Success)
{
@@ -2508,7 +2508,7 @@
REQUEST(xAllocColorCellsReq);
REQUEST_SIZE_MATCH(xAllocColorCellsReq);
- rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
+ rc = dixLookupResourceByType((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
DixAddAccess);
if (rc == Success)
{
@@ -2575,7 +2575,7 @@
REQUEST(xAllocColorPlanesReq);
REQUEST_SIZE_MATCH(xAllocColorPlanesReq);
- rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
+ rc = dixLookupResourceByType((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
DixAddAccess);
if (rc == Success)
{
@@ -2640,7 +2640,7 @@
REQUEST(xFreeColorsReq);
REQUEST_AT_LEAST_SIZE(xFreeColorsReq);
- rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
+ rc = dixLookupResourceByType((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
DixRemoveAccess);
if (rc == Success)
{
@@ -2675,7 +2675,7 @@
REQUEST(xStoreColorsReq);
REQUEST_AT_LEAST_SIZE(xStoreColorsReq);
- rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
+ rc = dixLookupResourceByType((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
DixWriteAccess);
if (rc == Success)
{
@@ -2709,7 +2709,7 @@
REQUEST(xStoreNamedColorReq);
REQUEST_FIXED_SIZE(xStoreNamedColorReq, stuff->nbytes);
- rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
+ rc = dixLookupResourceByType((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
DixWriteAccess);
if (rc == Success)
{
@@ -2743,7 +2743,7 @@
REQUEST(xQueryColorsReq);
REQUEST_AT_LEAST_SIZE(xQueryColorsReq);
- rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
+ rc = dixLookupResourceByType((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
DixReadAccess);
if (rc == Success)
{
@@ -2795,7 +2795,7 @@
REQUEST(xLookupColorReq);
REQUEST_FIXED_SIZE(xLookupColorReq, stuff->nbytes);
- rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
+ rc = dixLookupResourceByType((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
DixReadAccess);
if (rc == Success)
{
@@ -2844,14 +2844,14 @@
REQUEST_SIZE_MATCH(xCreateCursorReq);
LEGAL_NEW_RESOURCE(stuff->cid, client);
- rc = dixLookupResource((pointer *)&src, stuff->source, RT_PIXMAP, client,
+ rc = dixLookupResourceByType((pointer *)&src, stuff->source, RT_PIXMAP, client,
DixReadAccess);
if (rc != Success) {
client->errorValue = stuff->source;
return (rc == BadValue) ? BadPixmap : rc;
}
- rc = dixLookupResource((pointer *)&msk, stuff->mask, RT_PIXMAP, client,
+ rc = dixLookupResourceByType((pointer *)&msk, stuff->mask, RT_PIXMAP, client,
DixReadAccess);
if (rc != Success)
{
@@ -2949,7 +2949,7 @@
REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq);
- rc = dixLookupResource((pointer *)&pCursor, stuff->id, RT_CURSOR, client,
+ rc = dixLookupResourceByType((pointer *)&pCursor, stuff->id, RT_CURSOR, client,
DixDestroyAccess);
if (rc == Success)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/dix/dixutils.c new/xorg-server-1.6.3/dix/dixutils.c
--- old/xorg-server-1.6.2/dix/dixutils.c 2009-07-07 19:48:57.000000000 +0200
+++ new/xorg-server-1.6.3/dix/dixutils.c 2009-07-26 22:56:57.000000000 +0200
@@ -216,7 +216,7 @@
if (id == INVALID)
return BadDrawable;
- rc = dixLookupResource((pointer *)&pTmp, id, RC_DRAWABLE, client, access);
+ rc = dixLookupResourceByClass((pointer *)&pTmp, id, RC_DRAWABLE, client, access);
if (rc == BadValue)
return BadDrawable;
@@ -259,7 +259,7 @@
if (!clientIndex || !clients[clientIndex] || (rid & SERVER_BIT))
goto bad;
- rc = dixLookupResource(&pRes, rid, RC_ANY, client, DixGetAttrAccess);
+ rc = dixLookupResourceByClass(&pRes, rid, RC_ANY, client, DixGetAttrAccess);
if (rc != Success)
goto bad;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/dix/events.c new/xorg-server-1.6.3/dix/events.c
--- old/xorg-server-1.6.2/dix/events.c 2009-07-07 19:48:57.000000000 +0200
+++ new/xorg-server-1.6.3/dix/events.c 2009-07-26 22:56:57.000000000 +0200
@@ -1161,7 +1161,7 @@
#ifdef XKB
/* Fix for key repeating bug. */
if (device->key != NULL && device->key->xkbInfo != NULL &&
- xE->u.u.type == KeyRelease)
+ (xE->u.u.type == KeyRelease || xE->u.u.type == DeviceKeyRelease))
AccessXCancelRepeatKey(device->key->xkbInfo, xE->u.u.detail);
#endif
@@ -4445,7 +4445,7 @@
cursor = NullCursor;
else
{
- rc = dixLookupResource((pointer *)&cursor, stuff->cursor, RT_CURSOR,
+ rc = dixLookupResourceByType((pointer *)&cursor, stuff->cursor, RT_CURSOR,
client, DixUseAccess);
if (rc != Success)
{
@@ -4545,8 +4545,8 @@
newCursor = NullCursor;
else
{
- int rc = dixLookupResource((pointer *)&newCursor, stuff->cursor,
- RT_CURSOR, client, DixUseAccess);
+ int rc = dixLookupResourceByType((pointer *)&newCursor, stuff->cursor,
+ RT_CURSOR, client, DixUseAccess);
if (rc != Success)
{
client->errorValue = stuff->cursor;
@@ -5146,7 +5146,7 @@
cursor = NullCursor;
else
{
- rc = dixLookupResource((pointer *)&cursor, stuff->cursor, RT_CURSOR,
+ rc = dixLookupResourceByType((pointer *)&cursor, stuff->cursor, RT_CURSOR,
client, DixUseAccess);
if (rc != Success)
if (!cursor)
@@ -5396,7 +5396,7 @@
REQUEST(xRecolorCursorReq);
REQUEST_SIZE_MATCH(xRecolorCursorReq);
- rc = dixLookupResource((pointer *)&pCursor, stuff->cursor, RT_CURSOR,
+ rc = dixLookupResourceByType((pointer *)&pCursor, stuff->cursor, RT_CURSOR,
client, DixWriteAccess);
if (rc != Success)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/dix/gc.c new/xorg-server-1.6.3/dix/gc.c
--- old/xorg-server-1.6.2/dix/gc.c 2009-07-07 19:48:57.000000000 +0200
+++ new/xorg-server-1.6.3/dix/gc.c 2009-07-26 22:56:57.000000000 +0200
@@ -273,7 +273,7 @@
else
{
NEXTVAL(XID, newpix);
- rc = dixLookupResource((pointer *)&pPixmap, newpix,
+ rc = dixLookupResourceByType((pointer *)&pPixmap, newpix,
RT_PIXMAP, client, DixReadAccess);
}
if (rc == Success)
@@ -310,7 +310,7 @@
else
{
NEXTVAL(XID, newstipple)
- rc = dixLookupResource((pointer *)&pPixmap, newstipple,
+ rc = dixLookupResourceByType((pointer *)&pPixmap, newstipple,
RT_PIXMAP, client, DixReadAccess);
}
if (rc == Success)
@@ -353,7 +353,7 @@
else
{
NEXTVAL(XID, newfont)
- rc = dixLookupResource((pointer *)&pFont, newfont,
+ rc = dixLookupResourceByType((pointer *)&pFont, newfont,
RT_FONT, client, DixUseAccess);
}
if (rc == Success)
@@ -420,7 +420,7 @@
pPixmap = NullPixmap;
}
else {
- rc = dixLookupResource((pointer *)&pPixmap, pid,
+ rc = dixLookupResourceByType((pointer *)&pPixmap, pid,
RT_PIXMAP, client,
DixReadAccess);
if (rc != Success) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/dix/resource.c new/xorg-server-1.6.3/dix/resource.c
--- old/xorg-server-1.6.2/dix/resource.c 2009-07-07 19:48:57.000000000 +0200
+++ new/xorg-server-1.6.3/dix/resource.c 2009-07-26 22:56:57.000000000 +0200
@@ -846,11 +846,10 @@
}
_X_EXPORT int
-dixLookupResource(pointer *result, XID id, RESTYPE rtype,
- ClientPtr client, Mask mode)
+dixLookupResourceByType(pointer *result, XID id, RESTYPE rtype,
+ ClientPtr client, Mask mode)
{
int cid = CLIENT_ID(id);
- int istype = (rtype & TypeMask) && (rtype != RC_ANY);
ResourcePtr res = NULL;
*result = NULL;
@@ -859,8 +858,38 @@
res = clientTable[cid].resources[Hash(cid, id)];
for (; res; res = res->next)
- if ((res->id == id) && ((istype && res->type == rtype) ||
- (!istype && res->type & rtype)))
+ if (res->id == id && res->type == rtype)
+ break;
+ }
+ if (!res)
+ return BadValue;
+
+ if (client) {
+ client->errorValue = id;
+ cid = XaceHook(XACE_RESOURCE_ACCESS, client, id, res->type,
+ res->value, RT_NONE, NULL, mode);
+ if (cid != Success)
+ return cid;
+ }
+
+ *result = res->value;
+ return Success;
+}
+
+_X_EXPORT int
+dixLookupResourceByClass(pointer *result, XID id, RESTYPE rclass,
+ ClientPtr client, Mask mode)
+{
+ int cid = CLIENT_ID(id);
+ ResourcePtr res = NULL;
+
+ *result = NULL;
+
+ if ((cid < MAXCLIENTS) && clientTable[cid].buckets) {
+ res = clientTable[cid].resources[Hash(cid, id)];
+
+ for (; res; res = res->next)
+ if (res->id == id && (res->type & rclass))
break;
}
if (!res)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/dix/window.c new/xorg-server-1.6.3/dix/window.c
--- old/xorg-server-1.6.2/dix/window.c 2009-07-07 19:48:58.000000000 +0200
+++ new/xorg-server-1.6.3/dix/window.c 2009-07-26 22:56:57.000000000 +0200
@@ -1068,7 +1068,7 @@
}
else
{
- rc = dixLookupResource((pointer *)&pPixmap, pixID, RT_PIXMAP,
+ rc = dixLookupResourceByType((pointer *)&pPixmap, pixID, RT_PIXMAP,
client, DixReadAccess);
if (rc == Success)
{
@@ -1128,7 +1128,7 @@
pixID = pWin->parent->border.pixmap->drawable.id;
}
}
- rc = dixLookupResource((pointer *)&pPixmap, pixID, RT_PIXMAP,
+ rc = dixLookupResourceByType((pointer *)&pPixmap, pixID, RT_PIXMAP,
client, DixReadAccess);
if (rc == Success)
{
@@ -1290,7 +1290,7 @@
error = BadMatch;
goto PatchUp;
}
- rc = dixLookupResource((pointer *)&pCmap, cmap, RT_COLORMAP,
+ rc = dixLookupResourceByType((pointer *)&pCmap, cmap, RT_COLORMAP,
client, DixUseAccess);
if (rc != Success)
{
@@ -1366,7 +1366,7 @@
}
else
{
- rc = dixLookupResource((pointer *)&pCursor, cursorID,
+ rc = dixLookupResourceByType((pointer *)&pCursor, cursorID,
RT_CURSOR, client, DixUseAccess);
if (rc != Success)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/exa/exa_accel.c new/xorg-server-1.6.3/exa/exa_accel.c
--- old/xorg-server-1.6.2/exa/exa_accel.c 2009-07-07 19:48:58.000000000 +0200
+++ new/xorg-server-1.6.3/exa/exa_accel.c 2009-07-26 22:56:56.000000000 +0200
@@ -415,6 +415,7 @@
if (rects) {
int i;
+ int ordering;
for (i = 0; i < nbox; i++) {
rects[i].x = pbox[i].x1 + dx + src_off_x;
@@ -423,7 +424,16 @@
rects[i].height = pbox[i].y2 - pbox[i].y1;
}
- srcregion = RECTS_TO_REGION(pScreen, nbox, rects, CT_YXBANDED);
+ /* This must match the miRegionCopy() logic for reversing rect order */
+ if (nbox == 1 || (dx > 0 && dy > 0) ||
+ (pDstDrawable != pSrcDrawable &&
+ (pDstDrawable->type != DRAWABLE_WINDOW ||
+ pSrcDrawable->type != DRAWABLE_WINDOW)))
+ ordering = CT_YXBANDED;
+ else
+ ordering = CT_UNSORTED;
+
+ srcregion = RECTS_TO_REGION(pScreen, nbox, rects, ordering);
xfree(rects);
if (!pGC || !exaGCReadsDestination(pDstDrawable, pGC->planemask,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/hw/xfree86/modes/xf86Crtc.c new/xorg-server-1.6.3/hw/xfree86/modes/xf86Crtc.c
--- old/xorg-server-1.6.2/hw/xfree86/modes/xf86Crtc.c 2009-07-07 19:48:58.000000000 +0200
+++ new/xorg-server-1.6.3/hw/xfree86/modes/xf86Crtc.c 2009-07-26 22:56:57.000000000 +0200
@@ -255,9 +255,6 @@
RRTransformRec saved_transform;
Bool saved_transform_present;
- if (crtc->funcs->set_mode_major)
- return crtc->funcs->set_mode_major(crtc, mode, rotation, x, y);
-
crtc->enabled = xf86CrtcInUse (crtc);
if (!crtc->enabled)
@@ -268,7 +265,6 @@
adjusted_mode = xf86DuplicateMode(mode);
- didLock = crtc->funcs->lock (crtc);
saved_mode = crtc->mode;
saved_x = crtc->x;
@@ -293,19 +289,12 @@
} else
crtc->transformPresent = FALSE;
- if (crtc->funcs->set_origin &&
- memcmp (mode, &saved_mode, sizeof(saved_mode)) == 0 &&
- saved_rotation == rotation &&
- saved_transform_present == crtc->transformPresent &&
- (!crtc->transformPresent || RRTransformEqual(&saved_transform, &crtc->transform)))
- {
- if (!xf86CrtcRotate (crtc))
- goto done;
- crtc->funcs->set_origin (crtc, crtc->x, crtc->y);
- ret = TRUE;
+ if (crtc->funcs->set_mode_major) {
+ ret = crtc->funcs->set_mode_major(crtc, mode, rotation, x, y);
goto done;
}
+ didLock = crtc->funcs->lock (crtc);
/* Pass our mode to the outputs and the CRTC to give them a chance to
* adjust it according to limitations or output properties, and also
* a chance to reject the mode entirely.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/hw/xfree86/modes/xf86EdidModes.c new/xorg-server-1.6.3/hw/xfree86/modes/xf86EdidModes.c
--- old/xorg-server-1.6.2/hw/xfree86/modes/xf86EdidModes.c 2009-07-07 19:48:58.000000000 +0200
+++ new/xorg-server-1.6.3/hw/xfree86/modes/xf86EdidModes.c 2009-07-30 00:49:52.000000000 +0200
@@ -205,6 +205,11 @@
DDC->vendor.prod_id == 2423)
return TRUE;
+ /* Peacock Ergovision 19. See rh#492359 */
+ if (memcmp (DDC->vendor.name, "PEA", 4) == 0 &&
+ DDC->vendor.prod_id == 9003)
+ return TRUE;
+
return FALSE;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/hw/xfree86/parser/Makefile.am new/xorg-server-1.6.3/hw/xfree86/parser/Makefile.am
--- old/xorg-server-1.6.2/hw/xfree86/parser/Makefile.am 2009-07-07 19:48:58.000000000 +0200
+++ new/xorg-server-1.6.3/hw/xfree86/parser/Makefile.am 2009-07-08 22:36:08.000000000 +0200
@@ -1,8 +1,5 @@
if INSTALL_LIBXF86CONFIG
lib_LIBRARIES = libxf86config.a
-LIBHEADERS = \
- xf86Optrec.h \
- xf86Parser.h
else
noinst_LIBRARIES = libxf86config.a
endif
@@ -30,9 +27,8 @@
EXTRA_DIST = \
Configint.h \
configProcs.h \
- xf86Optrec.h \
- xf86Parser.h \
xf86tokens.h
sdk_HEADERS = \
- $(LIBHEADERS)
+ xf86Optrec.h \
+ xf86Parser.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/hw/xfree86/parser/Makefile.in new/xorg-server-1.6.3/hw/xfree86/parser/Makefile.in
--- old/xorg-server-1.6.2/hw/xfree86/parser/Makefile.in 2009-07-08 00:15:19.000000000 +0200
+++ new/xorg-server-1.6.3/hw/xfree86/parser/Makefile.in 2009-08-01 08:34:15.000000000 +0200
@@ -34,7 +34,7 @@
build_triplet = @build@
host_triplet = @host@
subdir = hw/xfree86/parser
-DIST_COMMON = $(am__sdk_HEADERS_DIST) $(srcdir)/Makefile.am \
+DIST_COMMON = $(sdk_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -80,7 +80,6 @@
$(LDFLAGS) -o $@
SOURCES = $(libxf86config_a_SOURCES)
DIST_SOURCES = $(libxf86config_a_SOURCES)
-am__sdk_HEADERS_DIST = xf86Optrec.h xf86Parser.h
sdkHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(sdk_HEADERS)
ETAGS = etags
@@ -364,10 +363,6 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@INSTALL_LIBXF86CONFIG_TRUE@lib_LIBRARIES = libxf86config.a
-@INSTALL_LIBXF86CONFIG_TRUE@LIBHEADERS = \
-@INSTALL_LIBXF86CONFIG_TRUE@ xf86Optrec.h \
-@INSTALL_LIBXF86CONFIG_TRUE@ xf86Parser.h
-
@INSTALL_LIBXF86CONFIG_FALSE@noinst_LIBRARIES = libxf86config.a
libxf86config_a_SOURCES = \
Device.c \
@@ -391,12 +386,11 @@
EXTRA_DIST = \
Configint.h \
configProcs.h \
- xf86Optrec.h \
- xf86Parser.h \
xf86tokens.h
sdk_HEADERS = \
- $(LIBHEADERS)
+ xf86Optrec.h \
+ xf86Parser.h
all: all-am
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/include/resource.h new/xorg-server-1.6.3/include/resource.h
--- old/xorg-server-1.6.2/include/resource.h 2009-07-07 19:48:58.000000000 +0200
+++ new/xorg-server-1.6.3/include/resource.h 2009-07-26 22:56:57.000000000 +0200
@@ -218,13 +218,20 @@
FindComplexResType func,
pointer cdata);
-extern int dixLookupResource(
+extern int dixLookupResourceByType(
pointer *result,
XID id,
RESTYPE rtype,
ClientPtr client,
Mask access_mode);
+extern int dixLookupResourceByClass(
+ pointer *result,
+ XID id,
+ RESTYPE rclass,
+ ClientPtr client,
+ Mask access_mode);
+
extern void GetXIDRange(
int /*client*/,
Bool /*server*/,
@@ -244,29 +251,42 @@
* Please use the noted replacements instead.
*/
-/* replaced by dixLookupResource */
+#ifdef __GNUC__
+#define X_DEPRECATED __attribute__((deprecated))
+#else
+#define X_DEPRECATED
+#endif
+
+/* replaced by dixLookupResourceByType or dixLookupResourceByClass */
+extern int dixLookupResource(
+ pointer *result,
+ XID id,
+ RESTYPE rtype,
+ ClientPtr client,
+ Mask access_mode) X_DEPRECATED;
+
extern pointer SecurityLookupIDByType(
ClientPtr client,
XID id,
RESTYPE rtype,
- Mask access_mode);
+ Mask access_mode) X_DEPRECATED;
-/* replaced by dixLookupResource */
+/* replaced by dixLookupResourceByClass */
extern pointer SecurityLookupIDByClass(
ClientPtr client,
XID id,
RESTYPE classes,
- Mask access_mode);
+ Mask access_mode) X_DEPRECATED;
-/* replaced by dixLookupResource */
+/* replaced by dixLookupResourceByType */
extern pointer LookupIDByType(
XID id,
- RESTYPE rtype);
+ RESTYPE rtype) X_DEPRECATED;
-/* replaced by dixLookupResource */
+/* replaced by dixLookupResourceByClass */
extern pointer LookupIDByClass(
XID id,
- RESTYPE classes);
+ RESTYPE classes) X_DEPRECATED;
#endif /* RESOURCE_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/os/xdmcp.c new/xorg-server-1.6.3/os/xdmcp.c
--- old/xorg-server-1.6.2/os/xdmcp.c 2009-07-07 19:48:58.000000000 +0200
+++ new/xorg-server-1.6.3/os/xdmcp.c 2009-07-26 22:56:56.000000000 +0200
@@ -491,7 +491,9 @@
return;
}
}
- newAddress = (CARD8 *) xalloc (addrlen * sizeof (CARD8));
+ if (ConnectionAddresses.length + 1 == 256)
+ return;
+ newAddress = xalloc (addrlen * sizeof (CARD8));
if (!newAddress)
return;
if (!XdmcpReallocARRAY16 (&ConnectionTypes, ConnectionTypes.length + 1))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/randr/rrscreen.c new/xorg-server-1.6.3/randr/rrscreen.c
--- old/xorg-server-1.6.2/randr/rrscreen.c 2009-07-07 19:48:58.000000000 +0200
+++ new/xorg-server-1.6.3/randr/rrscreen.c 2009-07-26 22:56:57.000000000 +0200
@@ -664,8 +664,9 @@
rep.sizeID = pData->size;
rep.rate = pData->refresh;
- extraLen = (rep.nSizes * sizeof (xScreenSizes) +
- rep.nrateEnts * sizeof (CARD16));
+ extraLen = rep.nSizes * sizeof (xScreenSizes);
+ if (has_rate)
+ extraLen += rep.nrateEnts * sizeof (CARD16);
if (extraLen)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/randr/rrtransform.c new/xorg-server-1.6.3/randr/rrtransform.c
--- old/xorg-server-1.6.2/randr/rrtransform.c 2009-07-07 19:48:58.000000000 +0200
+++ new/xorg-server-1.6.3/randr/rrtransform.c 2009-07-26 22:56:57.000000000 +0200
@@ -251,10 +251,10 @@
#ifdef RANDR_12_INTERFACE
if (rr_transform)
{
- if (!pixman_transform_multiply (transform, transform, &rr_transform->transform))
+ if (!pixman_transform_multiply (transform, &rr_transform->transform, transform))
overflow = TRUE;
- pixman_f_transform_multiply (f_transform, f_transform, &rr_transform->f_transform);
- pixman_f_transform_multiply (f_inverse, &rr_transform->f_inverse, f_inverse);
+ pixman_f_transform_multiply (f_transform, &rr_transform->f_transform, f_transform);
+ pixman_f_transform_multiply (f_inverse, f_inverse, &rr_transform->f_inverse);
}
#endif
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/render/picture.c new/xorg-server-1.6.3/render/picture.c
--- old/xorg-server-1.6.2/render/picture.c 2009-07-07 19:48:58.000000000 +0200
+++ new/xorg-server-1.6.3/render/picture.c 2009-07-26 22:56:57.000000000 +0200
@@ -1070,7 +1070,7 @@
pAlpha = 0;
else
{
- error = dixLookupResource((pointer *)&pAlpha, pid,
+ error = dixLookupResourceByType((pointer *)&pAlpha, pid,
PictureType, client,
DixReadAccess);
if (error != Success)
@@ -1131,7 +1131,7 @@
else
{
clipType = CT_PIXMAP;
- error = dixLookupResource((pointer *)&pPixmap, pid,
+ error = dixLookupResourceByType((pointer *)&pPixmap, pid,
RT_PIXMAP, client,
DixReadAccess);
if (error != Success)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/render/render.c new/xorg-server-1.6.3/render/render.c
--- old/xorg-server-1.6.2/render/render.c 2009-07-07 19:48:58.000000000 +0200
+++ new/xorg-server-1.6.3/render/render.c 2009-07-26 22:56:57.000000000 +0200
@@ -1009,7 +1009,7 @@
LEGAL_NEW_RESOURCE(stuff->gsid, client);
- rc = dixLookupResource((pointer *)&glyphSet, stuff->existing, GlyphSetType,
+ rc = dixLookupResourceByType((pointer *)&glyphSet, stuff->existing, GlyphSetType,
client, DixGetAttrAccess);
if (rc != Success)
{
@@ -1033,7 +1033,7 @@
REQUEST(xRenderFreeGlyphSetReq);
REQUEST_SIZE_MATCH(xRenderFreeGlyphSetReq);
- rc = dixLookupResource((pointer *)&glyphSet, stuff->glyphset, GlyphSetType,
+ rc = dixLookupResourceByType((pointer *)&glyphSet, stuff->glyphset, GlyphSetType,
client, DixDestroyAccess);
if (rc != Success)
{
@@ -1072,7 +1072,7 @@
CARD32 component_alpha;
REQUEST_AT_LEAST_SIZE(xRenderAddGlyphsReq);
- err = dixLookupResource((pointer *)&glyphSet, stuff->glyphset, GlyphSetType,
+ err = dixLookupResourceByType((pointer *)&glyphSet, stuff->glyphset, GlyphSetType,
client, DixAddAccess);
if (err != Success)
{
@@ -1262,7 +1262,7 @@
CARD32 glyph;
REQUEST_AT_LEAST_SIZE(xRenderFreeGlyphsReq);
- rc = dixLookupResource((pointer *)&glyphSet, stuff->glyphset, GlyphSetType,
+ rc = dixLookupResourceByType((pointer *)&glyphSet, stuff->glyphset, GlyphSetType,
client, DixRemoveAccess);
if (rc != Success)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/xfixes/cursor.c new/xorg-server-1.6.3/xfixes/cursor.c
--- old/xorg-server-1.6.2/xfixes/cursor.c 2009-07-07 19:48:58.000000000 +0200
+++ new/xorg-server-1.6.3/xfixes/cursor.c 2009-07-26 22:56:57.000000000 +0200
@@ -863,7 +863,7 @@
REQUEST_SIZE_MATCH (xXFixesHideCursorReq);
- ret = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW,
+ ret = dixLookupResourceByType((pointer *)&pWin, stuff->window, RT_WINDOW,
client, DixGetAttrAccess);
if (ret != Success) {
client->errorValue = stuff->window;
@@ -921,7 +921,7 @@
REQUEST_SIZE_MATCH (xXFixesShowCursorReq);
- rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW,
+ rc = dixLookupResourceByType((pointer *)&pWin, stuff->window, RT_WINDOW,
client, DixGetAttrAccess);
if (rc != Success) {
client->errorValue = stuff->window;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.2/xfixes/region.c new/xorg-server-1.6.3/xfixes/region.c
--- old/xorg-server-1.6.2/xfixes/region.c 2009-07-07 19:48:58.000000000 +0200
+++ new/xorg-server-1.6.3/xfixes/region.c 2009-07-26 22:56:57.000000000 +0200
@@ -115,7 +115,7 @@
REQUEST_SIZE_MATCH (xXFixesCreateRegionFromBitmapReq);
LEGAL_NEW_RESOURCE (stuff->region, client);
- rc = dixLookupResource((pointer *)&pPixmap, stuff->bitmap, RT_PIXMAP,
+ rc = dixLookupResourceByType((pointer *)&pPixmap, stuff->bitmap, RT_PIXMAP,
client, DixReadAccess);
if (rc != Success)
{
@@ -160,7 +160,7 @@
REQUEST_SIZE_MATCH (xXFixesCreateRegionFromWindowReq);
LEGAL_NEW_RESOURCE (stuff->region, client);
- rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW,
+ rc = dixLookupResourceByType((pointer *)&pWin, stuff->window, RT_WINDOW,
client, DixGetAttrAccess);
if (rc != Success)
{
@@ -682,7 +682,7 @@
REQUEST(xXFixesSetWindowShapeRegionReq);
REQUEST_SIZE_MATCH(xXFixesSetWindowShapeRegionReq);
- rc = dixLookupResource((pointer *)&pWin, stuff->dest, RT_WINDOW,
+ rc = dixLookupResourceByType((pointer *)&pWin, stuff->dest, RT_WINDOW,
client, DixSetAttrAccess);
if (rc != Success)
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org