aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Xext
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-04-27 13:04:40 +0000
committermarha <marha@users.sourceforge.net>2010-04-27 13:04:40 +0000
commit9691d196c34d551ebc33843692afd0ee23b9389b (patch)
tree184412bc028d5e4b62492d4c95a899b35e600692 /xorg-server/Xext
parentf49a8c2a1f02f8089d709ec8dcf7080c041baf0c (diff)
downloadvcxsrv-9691d196c34d551ebc33843692afd0ee23b9389b.tar.gz
vcxsrv-9691d196c34d551ebc33843692afd0ee23b9389b.tar.bz2
vcxsrv-9691d196c34d551ebc33843692afd0ee23b9389b.zip
svn merge -r549:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/Xext')
-rw-r--r--xorg-server/Xext/panoramiX.c3
-rw-r--r--xorg-server/Xext/panoramiX.h13
-rw-r--r--xorg-server/Xext/panoramiXprocs.c2
-rw-r--r--xorg-server/Xext/shape.c6
4 files changed, 6 insertions, 18 deletions
diff --git a/xorg-server/Xext/panoramiX.c b/xorg-server/Xext/panoramiX.c
index 96eb8f9e1..d5965c2d0 100644
--- a/xorg-server/Xext/panoramiX.c
+++ b/xorg-server/Xext/panoramiX.c
@@ -476,7 +476,8 @@ void PanoramiXExtensionInit(int argc, char *argv[])
panoramiXdataPtr = (PanoramiXData *)
xcalloc(PanoramiXNumScreens, sizeof(PanoramiXData));
- BREAK_IF(!panoramiXdataPtr);
+ if (!panoramiXdataPtr)
+ break;
if (!dixRequestPrivate(PanoramiXGCKey, sizeof(PanoramiXGCRec))) {
noPanoramiXExtension = TRUE;
diff --git a/xorg-server/Xext/panoramiX.h b/xorg-server/Xext/panoramiX.h
index 463a99441..35de17951 100644
--- a/xorg-server/Xext/panoramiX.h
+++ b/xorg-server/Xext/panoramiX.h
@@ -80,19 +80,6 @@ typedef struct {
#define FOR_NSCREENS_BACKWARD(j) for(j = PanoramiXNumScreens - 1; j >= 0; j--)
#define FOR_NSCREENS(j) FOR_NSCREENS_FORWARD(j)
-#define BREAK_IF(a) if ((a)) break
-#define IF_RETURN(a,b) if ((a)) return (b)
-
-#define FORCE_ROOT(a) { \
- int _j; \
- for (_j = PanoramiXNumScreens - 1; _j; _j--) \
- if ((a).root == WindowTable[_j]->drawable.id) \
- break; \
- (a).rootX += panoramiXdataPtr[_j].x; \
- (a).rootY += panoramiXdataPtr[_j].y; \
- (a).root = WindowTable[0]->drawable.id; \
-}
-
#define IS_SHARED_PIXMAP(r) (((r)->type == XRT_PIXMAP) && (r)->u.pix.shared)
#endif /* _PANORAMIX_H_ */
diff --git a/xorg-server/Xext/panoramiXprocs.c b/xorg-server/Xext/panoramiXprocs.c
index 6834efb71..6635db905 100644
--- a/xorg-server/Xext/panoramiXprocs.c
+++ b/xorg-server/Xext/panoramiXprocs.c
@@ -1728,7 +1728,7 @@ int PanoramiXPolyFillArc(ClientPtr client)
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
narcs = (client->req_len << 2) - sizeof(xPolyFillArcReq);
- IF_RETURN((narcs % sizeof(xArc)), BadLength);
+ if (narcs % sizeof(xArc)) return BadLength;
narcs /= sizeof(xArc);
if (narcs > 0) {
origArcs = xalloc(narcs * sizeof(xArc));
diff --git a/xorg-server/Xext/shape.c b/xorg-server/Xext/shape.c
index 85cc9b932..3a7dad5d7 100644
--- a/xorg-server/Xext/shape.c
+++ b/xorg-server/Xext/shape.c
@@ -367,7 +367,7 @@ ProcPanoramiXShapeRectangles(
FOR_NSCREENS(j) {
stuff->dest = win->info[j].id;
result = ProcShapeRectangles (client);
- BREAK_IF(result != Success);
+ if (result != Success) break;
}
return (result);
}
@@ -476,7 +476,7 @@ ProcPanoramiXShapeMask(
if(pmap)
stuff->src = pmap->info[j].id;
result = ProcShapeMask (client);
- BREAK_IF(result != Success);
+ if (result != Success) break;
}
return (result);
}
@@ -602,7 +602,7 @@ ProcPanoramiXShapeCombine(
stuff->dest = win->info[j].id;
stuff->src = win2->info[j].id;
result = ProcShapeCombine (client);
- BREAK_IF(result != Success);
+ if (result != Success) break;
}
return (result);
}