aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/hw')
-rw-r--r--xorg-server/hw/dmx/config/Canvas.c4
-rw-r--r--xorg-server/hw/dmx/dmx_glxvisuals.c4
-rw-r--r--xorg-server/hw/dmx/dmxinit.c2
-rw-r--r--xorg-server/hw/dmx/dmxwindow.c2
-rw-r--r--xorg-server/hw/dmx/examples/xinput.c4
-rw-r--r--xorg-server/hw/dmx/glxProxy/glxcmds.c16
-rw-r--r--xorg-server/hw/dmx/glxProxy/glxcmdsswap.c2
-rw-r--r--xorg-server/hw/dmx/glxProxy/glxscreens.c4
-rw-r--r--xorg-server/hw/dmx/glxProxy/glxsingle.c6
-rw-r--r--xorg-server/hw/dmx/glxProxy/glxvendor.c4
-rw-r--r--xorg-server/hw/dmx/glxProxy/renderpixswap.c310
-rw-r--r--xorg-server/hw/kdrive/ephyr/XF86dri.c18
-rw-r--r--xorg-server/hw/kdrive/ephyr/ephyrdriext.c4
-rw-r--r--xorg-server/hw/kdrive/ephyr/ephyrhostglx.c10
-rw-r--r--xorg-server/hw/kdrive/ephyr/ephyrhostproxy.c2
-rw-r--r--xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c4
-rw-r--r--xorg-server/hw/kdrive/ephyr/ephyrvideo.c2
-rw-r--r--xorg-server/hw/xfree86/common/xf86cmap.c2
-rw-r--r--xorg-server/hw/xfree86/dri/xf86dri.c4
-rw-r--r--xorg-server/hw/xfree86/i2c/fi1236.c10
-rw-r--r--xorg-server/hw/xfree86/i2c/tda9850.c2
-rw-r--r--xorg-server/hw/xquartz/GL/visualConfigs.c214
-rw-r--r--xorg-server/hw/xquartz/darwin.c16
-rw-r--r--xorg-server/hw/xquartz/xpr/xprScreen.c5
-rw-r--r--xorg-server/hw/xwin/InitOutput.c2
-rwxr-xr-xxorg-server/hw/xwin/glx/indirect.c4
-rw-r--r--xorg-server/hw/xwin/winclipboardxevents.c6
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/wincursor.c6
-rw-r--r--xorg-server/hw/xwin/winengine.c2
-rw-r--r--xorg-server/hw/xwin/wingc.c4
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/winmsg.c2
-rw-r--r--xorg-server/hw/xwin/winmultiwindowicons.c2
-rw-r--r--xorg-server/hw/xwin/winmultiwindowshape.c2
-rw-r--r--xorg-server/hw/xwin/winmultiwindowwndproc.c2
-rw-r--r--xorg-server/hw/xwin/winpfbdd.c8
-rw-r--r--xorg-server/hw/xwin/winpixmap.c2
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/winscrinit.c2
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/winsetsp.c4
-rw-r--r--xorg-server/hw/xwin/winshaddd.c8
-rw-r--r--xorg-server/hw/xwin/winshadddnl.c10
-rw-r--r--xorg-server/hw/xwin/winshadgdi.c2
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/winwin32rootless.c4
-rw-r--r--xorg-server/hw/xwin/winwin32rootlesswndproc.c6
43 files changed, 335 insertions, 394 deletions
diff --git a/xorg-server/hw/dmx/config/Canvas.c b/xorg-server/hw/dmx/config/Canvas.c
index 34a47a2bf..f0586e509 100644
--- a/xorg-server/hw/dmx/config/Canvas.c
+++ b/xorg-server/hw/dmx/config/Canvas.c
@@ -76,7 +76,7 @@ CanvasExpose(Widget w, XEvent * event, Region region)
if (!XtIsRealized(w))
return;
- XtCallCallbacks(w, XtNcanvasExposeCallback, (XtPointer) & data);
+ XtCallCallbacks(w, XtNcanvasExposeCallback, (XtPointer) &data);
}
static void
@@ -162,4 +162,4 @@ CanvasClassRec canvasClassRec = {
}
};
-WidgetClass canvasWidgetClass = (WidgetClass) & canvasClassRec;
+WidgetClass canvasWidgetClass = (WidgetClass) &canvasClassRec;
diff --git a/xorg-server/hw/dmx/dmx_glxvisuals.c b/xorg-server/hw/dmx/dmx_glxvisuals.c
index 9fcc0e58d..f903b7491 100644
--- a/xorg-server/hw/dmx/dmx_glxvisuals.c
+++ b/xorg-server/hw/dmx/dmx_glxvisuals.c
@@ -61,7 +61,7 @@ GetGLXVisualConfigs(Display * dpy, int screen, int *nconfigs)
req->reqType = majorOpcode;
req->glxCode = X_GLXGetVisualConfigs;
req->screen = screen;
- if (!_XReply(dpy, (xReply *) & reply, 0, False)) {
+ if (!_XReply(dpy, (xReply *) &reply, 0, False)) {
/* Something is busted. Punt. */
UnlockDisplay(dpy);
SyncHandle();
@@ -252,7 +252,7 @@ GetGLXFBConfigs(Display * dpy, int glxMajorOpcode, int *nconfigs)
*nconfigs = 0;
- if (!_XReply(dpy, (xReply *) & reply, 0, False)) {
+ if (!_XReply(dpy, (xReply *) &reply, 0, False)) {
/* Something is busted. Punt. */
UnlockDisplay(dpy);
SyncHandle();
diff --git a/xorg-server/hw/dmx/dmxinit.c b/xorg-server/hw/dmx/dmxinit.c
index 94dbdd230..ec8a59e0d 100644
--- a/xorg-server/hw/dmx/dmxinit.c
+++ b/xorg-server/hw/dmx/dmxinit.c
@@ -740,10 +740,10 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
/* Check if GLX extension exists on all back-end servers */
for (i = 0; i < dmxNumScreens; i++)
glxSupported &= (dmxScreens[i].glxMajorOpcode > 0);
-#endif
if (serverGeneration == 1)
dmxAddExtensions(glxSupported);
+#endif
/* Tell dix layer about the backend displays */
for (i = 0; i < dmxNumScreens; i++) {
diff --git a/xorg-server/hw/dmx/dmxwindow.c b/xorg-server/hw/dmx/dmxwindow.c
index 855e56b9d..9b8a3840e 100644
--- a/xorg-server/hw/dmx/dmxwindow.c
+++ b/xorg-server/hw/dmx/dmxwindow.c
@@ -786,7 +786,7 @@ dmxWindowExposures(WindowPtr pWindow, RegionPtr prgn, RegionPtr other_exposed)
if (pWinPriv->window) {
while (XCheckIfEvent(dmxScreen->beDisplay, &ev,
dmxWindowExposurePredicate,
- (XPointer) & pWinPriv->window)) {
+ (XPointer) &pWinPriv->window)) {
/* Handle expose events -- this should not be necessary
since the base window in which the root window was
created is guaranteed to be on top (override_redirect),
diff --git a/xorg-server/hw/dmx/examples/xinput.c b/xorg-server/hw/dmx/examples/xinput.c
index db6601030..6eddc6a67 100644
--- a/xorg-server/hw/dmx/examples/xinput.c
+++ b/xorg-server/hw/dmx/examples/xinput.c
@@ -303,8 +303,8 @@ main(int argc, char **argv)
XNextEvent(display, &event);
for (i = 0; i < cnt; i++) {
- XDeviceMotionEvent *e = (XDeviceMotionEvent *) & event;
- XDeviceButtonEvent *b = (XDeviceButtonEvent *) & event;
+ XDeviceMotionEvent *e = (XDeviceMotionEvent *) &event;
+ XDeviceButtonEvent *b = (XDeviceButtonEvent *) &event;
if (event.type == event_type[i]) {
printf("%s id=%lu (%d @ %d,%d; s=0x%04x, d=%d, t=%lu)"
diff --git a/xorg-server/hw/dmx/glxProxy/glxcmds.c b/xorg-server/hw/dmx/glxProxy/glxcmds.c
index 91011d109..45382748f 100644
--- a/xorg-server/hw/dmx/glxProxy/glxcmds.c
+++ b/xorg-server/hw/dmx/glxProxy/glxcmds.c
@@ -1276,7 +1276,7 @@ MakeCurrent(__GLXclientState * cl,
be_req->context =
(unsigned int) (glxc ? glxc->real_ids[s - from_screen] : 0);
be_req->oldContextTag = GetCurrentBackEndTag(cl, tag, s);
- if (!_XReply(dpy, (xReply *) & be_reply, 0, False)) {
+ if (!_XReply(dpy, (xReply *) &be_reply, 0, False)) {
/* The make current failed */
UnlockDisplay(dpy);
@@ -1331,7 +1331,7 @@ MakeCurrent(__GLXclientState * cl,
be_new_req->context =
(unsigned int) (glxc ? glxc->real_ids[s - from_screen] : 0);
be_new_req->oldContextTag = GetCurrentBackEndTag(cl, tag, s);
- if (!_XReply(dpy, (xReply *) & be_new_reply, 0, False)) {
+ if (!_XReply(dpy, (xReply *) &be_new_reply, 0, False)) {
/* The make current failed */
UnlockDisplay(dpy);
@@ -1362,7 +1362,7 @@ MakeCurrent(__GLXclientState * cl,
ext_req->context =
(unsigned int) (glxc ? glxc->real_ids[s - from_screen] : 0);
ext_req->oldContextTag = GetCurrentBackEndTag(cl, tag, s);
- if (!_XReply(dpy, (xReply *) & ext_reply, 0, False)) {
+ if (!_XReply(dpy, (xReply *) &ext_reply, 0, False)) {
/* The make current failed */
UnlockDisplay(dpy);
@@ -2177,7 +2177,7 @@ __glXDoSwapBuffers(__GLXclientState * cl, XID drawId, GLXContextTag tag)
finishReq->glxCode = X_GLsop_Finish;
finishReq->contextTag =
(tag ? GetCurrentBackEndTag(cl, tag, s) : 0);
- (void) _XReply(dpy, (xReply *) & reply, 0, False);
+ (void) _XReply(dpy, (xReply *) &reply, 0, False);
UnlockDisplay(dpy);
SyncHandle();
}
@@ -2605,7 +2605,7 @@ __glXQueryExtensionsString(__GLXclientState * cl, GLbyte * pc)
be_req->reqType = dmxScreen->glxMajorOpcode;
be_req->glxCode = X_GLXQueryServerString;
be_req->screen = DefaultScreen(dpy);
- _XReply(dpy, (xReply *) & be_reply, 0, False);
+ _XReply(dpy, (xReply *) &be_reply, 0, False);
len = (int) be_reply.length;
numbytes = (int) be_reply.n;
slop = numbytes * __GLX_SIZE_INT8 & 3;
@@ -2690,7 +2690,7 @@ __glXQueryServerString(__GLXclientState * cl, GLbyte * pc)
be_req->glxCode = X_GLXQueryServerString;
be_req->screen = DefaultScreen(dpy);
be_req->name = name;
- _XReply(dpy, (xReply *) & be_reply, 0, False);
+ _XReply(dpy, (xReply *) &be_reply, 0, False);
len = (int) be_reply.length;
numbytes = (int) be_reply.n;
slop = numbytes * __GLX_SIZE_INT8 & 3;
@@ -3045,7 +3045,7 @@ __glXGetFBConfigsSGIX(__GLXclientState * cl, GLbyte * pc)
new_req.length = req->length;
new_req.screen = req->screen;
- return (__glXGetFBConfigs(cl, (GLbyte *) & new_req));
+ return (__glXGetFBConfigs(cl, (GLbyte *) &new_req));
}
int
@@ -3591,7 +3591,7 @@ __glXGetDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
be_req->glxCode = X_GLXGetDrawableAttributes;
be_req->drawable = be_drawable;
be_req->length = req->length;
- if (!_XReply(dpy, (xReply *) & reply, 0, False)) {
+ if (!_XReply(dpy, (xReply *) &reply, 0, False)) {
UnlockDisplay(dpy);
SyncHandle();
return (BE_TO_CLIENT_ERROR(dmxLastErrorEvent.error_code));
diff --git a/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c b/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c
index ac79cda22..ab3e7edc1 100644
--- a/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c
+++ b/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c
@@ -1051,7 +1051,7 @@ __glXSwapGetFBConfigsSGIX(__GLXclientState * cl, GLbyte * pc)
new_req.length = req->length;
new_req.screen = req->screen;
- return (__glXSwapGetFBConfigs(cl, (GLbyte *) & new_req));
+ return (__glXSwapGetFBConfigs(cl, (GLbyte *) &new_req));
}
int
diff --git a/xorg-server/hw/dmx/glxProxy/glxscreens.c b/xorg-server/hw/dmx/glxProxy/glxscreens.c
index f725bd138..2a1909244 100644
--- a/xorg-server/hw/dmx/glxProxy/glxscreens.c
+++ b/xorg-server/hw/dmx/glxProxy/glxscreens.c
@@ -88,7 +88,7 @@ CalcServerVersionAndExtensions(void)
req->glxCode = X_GLXQueryVersion;
req->majorVersion = GLX_SERVER_MAJOR_VERSION;
req->minorVersion = GLX_SERVER_MINOR_VERSION;
- _XReply(dpy, (xReply *) & reply, 0, False);
+ _XReply(dpy, (xReply *) &reply, 0, False);
UnlockDisplay(dpy);
SyncHandle();
@@ -147,7 +147,7 @@ CalcServerVersionAndExtensions(void)
req->glxCode = X_GLXQueryServerString;
req->screen = DefaultScreen(dpy);
req->name = GLX_EXTENSIONS;
- _XReply(dpy, (xReply *) & reply, 0, False);
+ _XReply(dpy, (xReply *) &reply, 0, False);
length = (int) reply.length;
numbytes = (int) reply.n;
diff --git a/xorg-server/hw/dmx/glxProxy/glxsingle.c b/xorg-server/hw/dmx/glxProxy/glxsingle.c
index 87842001f..e60cfeb70 100644
--- a/xorg-server/hw/dmx/glxProxy/glxsingle.c
+++ b/xorg-server/hw/dmx/glxProxy/glxsingle.c
@@ -249,7 +249,7 @@ __glXForwardPipe0WithReply(__GLXclientState * cl, GLbyte * pc)
/*
* get the reply from the back-end server
*/
- _XReply(dpy, (xReply *) & be_reply, 0, False);
+ _XReply(dpy, (xReply *) &be_reply, 0, False);
be_buf_size = be_reply.length << 2;
if (be_buf_size > 0) {
be_buf = (char *) malloc(be_buf_size);
@@ -348,7 +348,7 @@ __glXForwardAllWithReply(__GLXclientState * cl, GLbyte * pc)
/*
* get the reply from the back-end server
*/
- _XReply(dpy, (xReply *) & be_reply, 0, False);
+ _XReply(dpy, (xReply *) &be_reply, 0, False);
be_buf_size = be_reply.length << 2;
if (be_buf_size > 0) {
be_buf = (char *) malloc(be_buf_size);
@@ -919,7 +919,7 @@ __glXDisp_ReadPixels(__GLXclientState * cl, GLbyte * pc)
*(GLboolean *) (be_pc + 24) = swapBytes;
*(GLboolean *) (be_pc + 25) = lsbFirst;
- _XReply(dpy, (xReply *) & be_reply, 0, False);
+ _XReply(dpy, (xReply *) &be_reply, 0, False);
if (be_reply.length > 0) {
char *be_buf;
diff --git a/xorg-server/hw/dmx/glxProxy/glxvendor.c b/xorg-server/hw/dmx/glxProxy/glxvendor.c
index e5c8da144..5777c6acc 100644
--- a/xorg-server/hw/dmx/glxProxy/glxvendor.c
+++ b/xorg-server/hw/dmx/glxProxy/glxvendor.c
@@ -237,7 +237,7 @@ __glXVForwardPipe0WithReply(__GLXclientState * cl, GLbyte * pc)
/*
* get the reply from the back-end server
*/
- _XReply(dpy, (xReply *) & be_reply, 0, False);
+ _XReply(dpy, (xReply *) &be_reply, 0, False);
be_buf_size = be_reply.length << 2;
if (be_buf_size > 0) {
be_buf = (char *) malloc(be_buf_size);
@@ -331,7 +331,7 @@ __glXVForwardAllWithReply(__GLXclientState * cl, GLbyte * pc)
/*
* get the reply from the back-end server
*/
- _XReply(dpy, (xReply *) & be_reply, 0, False);
+ _XReply(dpy, (xReply *) &be_reply, 0, False);
be_buf_size = be_reply.length << 2;
if (be_buf_size > 0) {
be_buf = (char *) malloc(be_buf_size);
diff --git a/xorg-server/hw/dmx/glxProxy/renderpixswap.c b/xorg-server/hw/dmx/glxProxy/renderpixswap.c
index 3458e611c..32df0d5a8 100644
--- a/xorg-server/hw/dmx/glxProxy/renderpixswap.c
+++ b/xorg-server/hw/dmx/glxProxy/renderpixswap.c
@@ -39,10 +39,10 @@ __glXDispSwap_PolygonStipple(GLbyte * pc)
__GLX_DECLARE_SWAP_VARIABLES;
- __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
- __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+ __GLX_SWAP_INT((GLbyte *) &hdr->rowLength);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipRows);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipPixels);
+ __GLX_SWAP_INT((GLbyte *) &hdr->alignment);
hdr->swapBytes = !hdr->swapBytes;
}
@@ -54,17 +54,17 @@ __glXDispSwap_Bitmap(GLbyte * pc)
__GLX_DECLARE_SWAP_VARIABLES;
- __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
- __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+ __GLX_SWAP_INT((GLbyte *) &hdr->rowLength);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipRows);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipPixels);
+ __GLX_SWAP_INT((GLbyte *) &hdr->alignment);
- __GLX_SWAP_INT((GLbyte *) & hdr->width);
- __GLX_SWAP_INT((GLbyte *) & hdr->height);
- __GLX_SWAP_FLOAT((GLbyte *) & hdr->xorig);
- __GLX_SWAP_FLOAT((GLbyte *) & hdr->yorig);
- __GLX_SWAP_FLOAT((GLbyte *) & hdr->xmove);
- __GLX_SWAP_FLOAT((GLbyte *) & hdr->ymove);
+ __GLX_SWAP_INT((GLbyte *) &hdr->width);
+ __GLX_SWAP_INT((GLbyte *) &hdr->height);
+ __GLX_SWAP_FLOAT((GLbyte *) &hdr->xorig);
+ __GLX_SWAP_FLOAT((GLbyte *) &hdr->yorig);
+ __GLX_SWAP_FLOAT((GLbyte *) &hdr->xmove);
+ __GLX_SWAP_FLOAT((GLbyte *) &hdr->ymove);
hdr->swapBytes = !hdr->swapBytes;
@@ -77,19 +77,19 @@ __glXDispSwap_TexImage1D(GLbyte * pc)
__GLX_DECLARE_SWAP_VARIABLES;
- __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
- __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+ __GLX_SWAP_INT((GLbyte *) &hdr->rowLength);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipRows);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipPixels);
+ __GLX_SWAP_INT((GLbyte *) &hdr->alignment);
- __GLX_SWAP_INT((GLbyte *) & hdr->target);
- __GLX_SWAP_INT((GLbyte *) & hdr->level);
- __GLX_SWAP_INT((GLbyte *) & hdr->components);
- __GLX_SWAP_INT((GLbyte *) & hdr->width);
- __GLX_SWAP_INT((GLbyte *) & hdr->height);
- __GLX_SWAP_INT((GLbyte *) & hdr->border);
- __GLX_SWAP_INT((GLbyte *) & hdr->format);
- __GLX_SWAP_INT((GLbyte *) & hdr->type);
+ __GLX_SWAP_INT((GLbyte *) &hdr->target);
+ __GLX_SWAP_INT((GLbyte *) &hdr->level);
+ __GLX_SWAP_INT((GLbyte *) &hdr->components);
+ __GLX_SWAP_INT((GLbyte *) &hdr->width);
+ __GLX_SWAP_INT((GLbyte *) &hdr->height);
+ __GLX_SWAP_INT((GLbyte *) &hdr->border);
+ __GLX_SWAP_INT((GLbyte *) &hdr->format);
+ __GLX_SWAP_INT((GLbyte *) &hdr->type);
/*
** Just invert swapBytes flag; the GL will figure out if it needs to swap
@@ -105,19 +105,19 @@ __glXDispSwap_TexImage2D(GLbyte * pc)
__GLX_DECLARE_SWAP_VARIABLES;
- __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
- __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+ __GLX_SWAP_INT((GLbyte *) &hdr->rowLength);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipRows);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipPixels);
+ __GLX_SWAP_INT((GLbyte *) &hdr->alignment);
- __GLX_SWAP_INT((GLbyte *) & hdr->target);
- __GLX_SWAP_INT((GLbyte *) & hdr->level);
- __GLX_SWAP_INT((GLbyte *) & hdr->components);
- __GLX_SWAP_INT((GLbyte *) & hdr->width);
- __GLX_SWAP_INT((GLbyte *) & hdr->height);
- __GLX_SWAP_INT((GLbyte *) & hdr->border);
- __GLX_SWAP_INT((GLbyte *) & hdr->format);
- __GLX_SWAP_INT((GLbyte *) & hdr->type);
+ __GLX_SWAP_INT((GLbyte *) &hdr->target);
+ __GLX_SWAP_INT((GLbyte *) &hdr->level);
+ __GLX_SWAP_INT((GLbyte *) &hdr->components);
+ __GLX_SWAP_INT((GLbyte *) &hdr->width);
+ __GLX_SWAP_INT((GLbyte *) &hdr->height);
+ __GLX_SWAP_INT((GLbyte *) &hdr->border);
+ __GLX_SWAP_INT((GLbyte *) &hdr->format);
+ __GLX_SWAP_INT((GLbyte *) &hdr->type);
/*
** Just invert swapBytes flag; the GL will figure out if it needs to swap
@@ -133,25 +133,25 @@ __glXDispSwap_TexImage3D(GLbyte * pc)
__GLX_DECLARE_SWAP_VARIABLES;
- __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
- __GLX_SWAP_INT((GLbyte *) & hdr->imageHeight);
- __GLX_SWAP_INT((GLbyte *) & hdr->imageDepth);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipImages);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipVolumes);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
- __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
-
- __GLX_SWAP_INT((GLbyte *) & hdr->target);
- __GLX_SWAP_INT((GLbyte *) & hdr->level);
- __GLX_SWAP_INT((GLbyte *) & hdr->internalformat);
- __GLX_SWAP_INT((GLbyte *) & hdr->width);
- __GLX_SWAP_INT((GLbyte *) & hdr->height);
- __GLX_SWAP_INT((GLbyte *) & hdr->depth);
- __GLX_SWAP_INT((GLbyte *) & hdr->size4d);
- __GLX_SWAP_INT((GLbyte *) & hdr->border);
- __GLX_SWAP_INT((GLbyte *) & hdr->format);
- __GLX_SWAP_INT((GLbyte *) & hdr->type);
+ __GLX_SWAP_INT((GLbyte *) &hdr->rowLength);
+ __GLX_SWAP_INT((GLbyte *) &hdr->imageHeight);
+ __GLX_SWAP_INT((GLbyte *) &hdr->imageDepth);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipRows);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipImages);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipVolumes);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipPixels);
+ __GLX_SWAP_INT((GLbyte *) &hdr->alignment);
+
+ __GLX_SWAP_INT((GLbyte *) &hdr->target);
+ __GLX_SWAP_INT((GLbyte *) &hdr->level);
+ __GLX_SWAP_INT((GLbyte *) &hdr->internalformat);
+ __GLX_SWAP_INT((GLbyte *) &hdr->width);
+ __GLX_SWAP_INT((GLbyte *) &hdr->height);
+ __GLX_SWAP_INT((GLbyte *) &hdr->depth);
+ __GLX_SWAP_INT((GLbyte *) &hdr->size4d);
+ __GLX_SWAP_INT((GLbyte *) &hdr->border);
+ __GLX_SWAP_INT((GLbyte *) &hdr->format);
+ __GLX_SWAP_INT((GLbyte *) &hdr->type);
/*
** Just invert swapBytes flag; the GL will figure out if it needs to swap
@@ -167,15 +167,15 @@ __glXDispSwap_DrawPixels(GLbyte * pc)
__GLX_DECLARE_SWAP_VARIABLES;
- __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
- __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+ __GLX_SWAP_INT((GLbyte *) &hdr->rowLength);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipRows);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipPixels);
+ __GLX_SWAP_INT((GLbyte *) &hdr->alignment);
- __GLX_SWAP_INT((GLbyte *) & hdr->width);
- __GLX_SWAP_INT((GLbyte *) & hdr->height);
- __GLX_SWAP_INT((GLbyte *) & hdr->format);
- __GLX_SWAP_INT((GLbyte *) & hdr->type);
+ __GLX_SWAP_INT((GLbyte *) &hdr->width);
+ __GLX_SWAP_INT((GLbyte *) &hdr->height);
+ __GLX_SWAP_INT((GLbyte *) &hdr->format);
+ __GLX_SWAP_INT((GLbyte *) &hdr->type);
/*
** Just invert swapBytes flag; the GL will figure out if it needs to swap
@@ -191,17 +191,17 @@ __glXDispSwap_TexSubImage1D(GLbyte * pc)
__GLX_DECLARE_SWAP_VARIABLES;
- __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
- __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+ __GLX_SWAP_INT((GLbyte *) &hdr->rowLength);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipRows);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipPixels);
+ __GLX_SWAP_INT((GLbyte *) &hdr->alignment);
- __GLX_SWAP_INT((GLbyte *) & hdr->target);
- __GLX_SWAP_INT((GLbyte *) & hdr->level);
- __GLX_SWAP_INT((GLbyte *) & hdr->xoffset);
- __GLX_SWAP_INT((GLbyte *) & hdr->width);
- __GLX_SWAP_INT((GLbyte *) & hdr->format);
- __GLX_SWAP_INT((GLbyte *) & hdr->type);
+ __GLX_SWAP_INT((GLbyte *) &hdr->target);
+ __GLX_SWAP_INT((GLbyte *) &hdr->level);
+ __GLX_SWAP_INT((GLbyte *) &hdr->xoffset);
+ __GLX_SWAP_INT((GLbyte *) &hdr->width);
+ __GLX_SWAP_INT((GLbyte *) &hdr->format);
+ __GLX_SWAP_INT((GLbyte *) &hdr->type);
/*
** Just invert swapBytes flag; the GL will figure out if it needs to swap
@@ -217,19 +217,19 @@ __glXDispSwap_TexSubImage2D(GLbyte * pc)
__GLX_DECLARE_SWAP_VARIABLES;
- __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
- __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+ __GLX_SWAP_INT((GLbyte *) &hdr->rowLength);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipRows);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipPixels);
+ __GLX_SWAP_INT((GLbyte *) &hdr->alignment);
- __GLX_SWAP_INT((GLbyte *) & hdr->target);
- __GLX_SWAP_INT((GLbyte *) & hdr->level);
- __GLX_SWAP_INT((GLbyte *) & hdr->xoffset);
- __GLX_SWAP_INT((GLbyte *) & hdr->yoffset);
- __GLX_SWAP_INT((GLbyte *) & hdr->width);
- __GLX_SWAP_INT((GLbyte *) & hdr->height);
- __GLX_SWAP_INT((GLbyte *) & hdr->format);
- __GLX_SWAP_INT((GLbyte *) & hdr->type);
+ __GLX_SWAP_INT((GLbyte *) &hdr->target);
+ __GLX_SWAP_INT((GLbyte *) &hdr->level);
+ __GLX_SWAP_INT((GLbyte *) &hdr->xoffset);
+ __GLX_SWAP_INT((GLbyte *) &hdr->yoffset);
+ __GLX_SWAP_INT((GLbyte *) &hdr->width);
+ __GLX_SWAP_INT((GLbyte *) &hdr->height);
+ __GLX_SWAP_INT((GLbyte *) &hdr->format);
+ __GLX_SWAP_INT((GLbyte *) &hdr->type);
/*
** Just invert swapBytes flag; the GL will figure out if it needs to swap
@@ -246,26 +246,26 @@ __glXDispSwap_TexSubImage3D(GLbyte * pc)
__GLX_DECLARE_SWAP_VARIABLES;
- __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
- __GLX_SWAP_INT((GLbyte *) & hdr->imageHeight);
- __GLX_SWAP_INT((GLbyte *) & hdr->imageDepth);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipImages);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipVolumes);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
- __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
-
- __GLX_SWAP_INT((GLbyte *) & hdr->target);
- __GLX_SWAP_INT((GLbyte *) & hdr->level);
- __GLX_SWAP_INT((GLbyte *) & hdr->xoffset);
- __GLX_SWAP_INT((GLbyte *) & hdr->yoffset);
- __GLX_SWAP_INT((GLbyte *) & hdr->zoffset);
- __GLX_SWAP_INT((GLbyte *) & hdr->width);
- __GLX_SWAP_INT((GLbyte *) & hdr->height);
- __GLX_SWAP_INT((GLbyte *) & hdr->depth);
- __GLX_SWAP_INT((GLbyte *) & hdr->size4d);
- __GLX_SWAP_INT((GLbyte *) & hdr->format);
- __GLX_SWAP_INT((GLbyte *) & hdr->type);
+ __GLX_SWAP_INT((GLbyte *) &hdr->rowLength);
+ __GLX_SWAP_INT((GLbyte *) &hdr->imageHeight);
+ __GLX_SWAP_INT((GLbyte *) &hdr->imageDepth);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipRows);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipImages);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipVolumes);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipPixels);
+ __GLX_SWAP_INT((GLbyte *) &hdr->alignment);
+
+ __GLX_SWAP_INT((GLbyte *) &hdr->target);
+ __GLX_SWAP_INT((GLbyte *) &hdr->level);
+ __GLX_SWAP_INT((GLbyte *) &hdr->xoffset);
+ __GLX_SWAP_INT((GLbyte *) &hdr->yoffset);
+ __GLX_SWAP_INT((GLbyte *) &hdr->zoffset);
+ __GLX_SWAP_INT((GLbyte *) &hdr->width);
+ __GLX_SWAP_INT((GLbyte *) &hdr->height);
+ __GLX_SWAP_INT((GLbyte *) &hdr->depth);
+ __GLX_SWAP_INT((GLbyte *) &hdr->size4d);
+ __GLX_SWAP_INT((GLbyte *) &hdr->format);
+ __GLX_SWAP_INT((GLbyte *) &hdr->type);
/*
** Just invert swapBytes flag; the GL will figure out if it needs to swap
@@ -281,16 +281,16 @@ __glXDispSwap_ColorTable(GLbyte * pc)
__GLX_DECLARE_SWAP_VARIABLES;
- __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
- __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+ __GLX_SWAP_INT((GLbyte *) &hdr->rowLength);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipRows);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipPixels);
+ __GLX_SWAP_INT((GLbyte *) &hdr->alignment);
- __GLX_SWAP_INT((GLbyte *) & hdr->target);
- __GLX_SWAP_INT((GLbyte *) & hdr->internalformat);
- __GLX_SWAP_INT((GLbyte *) & hdr->width);
- __GLX_SWAP_INT((GLbyte *) & hdr->format);
- __GLX_SWAP_INT((GLbyte *) & hdr->type);
+ __GLX_SWAP_INT((GLbyte *) &hdr->target);
+ __GLX_SWAP_INT((GLbyte *) &hdr->internalformat);
+ __GLX_SWAP_INT((GLbyte *) &hdr->width);
+ __GLX_SWAP_INT((GLbyte *) &hdr->format);
+ __GLX_SWAP_INT((GLbyte *) &hdr->type);
/*
** Just invert swapBytes flag; the GL will figure out if it needs to swap
@@ -306,16 +306,16 @@ __glXDispSwap_ColorSubTable(GLbyte * pc)
(__GLXdispatchColorSubTableHeader *) pc;
__GLX_DECLARE_SWAP_VARIABLES;
- __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
- __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+ __GLX_SWAP_INT((GLbyte *) &hdr->rowLength);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipRows);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipPixels);
+ __GLX_SWAP_INT((GLbyte *) &hdr->alignment);
- __GLX_SWAP_INT((GLbyte *) & hdr->target);
- __GLX_SWAP_INT((GLbyte *) & hdr->start);
- __GLX_SWAP_INT((GLbyte *) & hdr->count);
- __GLX_SWAP_INT((GLbyte *) & hdr->format);
- __GLX_SWAP_INT((GLbyte *) & hdr->type);
+ __GLX_SWAP_INT((GLbyte *) &hdr->target);
+ __GLX_SWAP_INT((GLbyte *) &hdr->start);
+ __GLX_SWAP_INT((GLbyte *) &hdr->count);
+ __GLX_SWAP_INT((GLbyte *) &hdr->format);
+ __GLX_SWAP_INT((GLbyte *) &hdr->type);
/*
** Just invert swapBytes flag; the GL will figure out if it needs to swap
@@ -331,16 +331,16 @@ __glXDispSwap_ConvolutionFilter1D(GLbyte * pc)
(__GLXdispatchConvolutionFilterHeader *) pc;
__GLX_DECLARE_SWAP_VARIABLES;
- __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
- __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+ __GLX_SWAP_INT((GLbyte *) &hdr->rowLength);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipRows);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipPixels);
+ __GLX_SWAP_INT((GLbyte *) &hdr->alignment);
- __GLX_SWAP_INT((GLbyte *) & hdr->target);
- __GLX_SWAP_INT((GLbyte *) & hdr->internalformat);
- __GLX_SWAP_INT((GLbyte *) & hdr->width);
- __GLX_SWAP_INT((GLbyte *) & hdr->format);
- __GLX_SWAP_INT((GLbyte *) & hdr->type);
+ __GLX_SWAP_INT((GLbyte *) &hdr->target);
+ __GLX_SWAP_INT((GLbyte *) &hdr->internalformat);
+ __GLX_SWAP_INT((GLbyte *) &hdr->width);
+ __GLX_SWAP_INT((GLbyte *) &hdr->format);
+ __GLX_SWAP_INT((GLbyte *) &hdr->type);
/*
** Just invert swapBytes flag; the GL will figure out if it needs to swap
@@ -356,17 +356,17 @@ __glXDispSwap_ConvolutionFilter2D(GLbyte * pc)
(__GLXdispatchConvolutionFilterHeader *) pc;
__GLX_DECLARE_SWAP_VARIABLES;
- __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
- __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
+ __GLX_SWAP_INT((GLbyte *) &hdr->rowLength);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipRows);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipPixels);
+ __GLX_SWAP_INT((GLbyte *) &hdr->alignment);
- __GLX_SWAP_INT((GLbyte *) & hdr->target);
- __GLX_SWAP_INT((GLbyte *) & hdr->internalformat);
- __GLX_SWAP_INT((GLbyte *) & hdr->width);
- __GLX_SWAP_INT((GLbyte *) & hdr->height);
- __GLX_SWAP_INT((GLbyte *) & hdr->format);
- __GLX_SWAP_INT((GLbyte *) & hdr->type);
+ __GLX_SWAP_INT((GLbyte *) &hdr->target);
+ __GLX_SWAP_INT((GLbyte *) &hdr->internalformat);
+ __GLX_SWAP_INT((GLbyte *) &hdr->width);
+ __GLX_SWAP_INT((GLbyte *) &hdr->height);
+ __GLX_SWAP_INT((GLbyte *) &hdr->format);
+ __GLX_SWAP_INT((GLbyte *) &hdr->type);
/*
** Just invert swapBytes flag; the GL will figure out if it needs to swap
@@ -386,17 +386,17 @@ __glXDispSwap_SeparableFilter2D(GLbyte * pc)
hdrlen = __GLX_PAD(__GLX_CONV_FILT_CMD_HDR_SIZE);
- __GLX_SWAP_INT((GLbyte *) & hdr->rowLength);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipRows);
- __GLX_SWAP_INT((GLbyte *) & hdr->skipPixels);
- __GLX_SWAP_INT((GLbyte *) & hdr->alignment);
-
- __GLX_SWAP_INT((GLbyte *) & hdr->target);
- __GLX_SWAP_INT((GLbyte *) & hdr->internalformat);
- __GLX_SWAP_INT((GLbyte *) & hdr->width);
- __GLX_SWAP_INT((GLbyte *) & hdr->height);
- __GLX_SWAP_INT((GLbyte *) & hdr->format);
- __GLX_SWAP_INT((GLbyte *) & hdr->type);
+ __GLX_SWAP_INT((GLbyte *) &hdr->rowLength);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipRows);
+ __GLX_SWAP_INT((GLbyte *) &hdr->skipPixels);
+ __GLX_SWAP_INT((GLbyte *) &hdr->alignment);
+
+ __GLX_SWAP_INT((GLbyte *) &hdr->target);
+ __GLX_SWAP_INT((GLbyte *) &hdr->internalformat);
+ __GLX_SWAP_INT((GLbyte *) &hdr->width);
+ __GLX_SWAP_INT((GLbyte *) &hdr->height);
+ __GLX_SWAP_INT((GLbyte *) &hdr->format);
+ __GLX_SWAP_INT((GLbyte *) &hdr->type);
/*
** Just invert swapBytes flag; the GL will figure out if it needs to swap
diff --git a/xorg-server/hw/kdrive/ephyr/XF86dri.c b/xorg-server/hw/kdrive/ephyr/XF86dri.c
index 74bf67678..9d742f394 100644
--- a/xorg-server/hw/kdrive/ephyr/XF86dri.c
+++ b/xorg-server/hw/kdrive/ephyr/XF86dri.c
@@ -151,7 +151,7 @@ XF86DRIQueryVersion(Display * dpy, int *majorVersion, int *minorVersion,
GetReq(XF86DRIQueryVersion, req);
req->reqType = info->codes->major_opcode;
req->driReqType = X_XF86DRIQueryVersion;
- if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
+ if (!_XReply(dpy, (xReply *) &rep, 0, xFalse)) {
UnlockDisplay(dpy);
SyncHandle();
TRACE("QueryVersion... return False");
@@ -181,7 +181,7 @@ XF86DRIQueryDirectRenderingCapable(Display * dpy, int screen, Bool *isCapable)
req->reqType = info->codes->major_opcode;
req->driReqType = X_XF86DRIQueryDirectRenderingCapable;
req->screen = screen;
- if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
+ if (!_XReply(dpy, (xReply *) &rep, 0, xFalse)) {
UnlockDisplay(dpy);
SyncHandle();
TRACE("QueryDirectRenderingCapable... return False");
@@ -210,7 +210,7 @@ XF86DRIOpenConnection(Display * dpy, int screen,
req->reqType = info->codes->major_opcode;
req->driReqType = X_XF86DRIOpenConnection;
req->screen = screen;
- if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
+ if (!_XReply(dpy, (xReply *) &rep, 0, xFalse)) {
UnlockDisplay(dpy);
SyncHandle();
TRACE("OpenConnection... return False");
@@ -260,7 +260,7 @@ XF86DRIAuthConnection(Display * dpy, int screen, drm_magic_t magic)
req->screen = screen;
req->magic = magic;
rep.authenticated = 0;
- if (!_XReply(dpy, (xReply *) & rep, 0, xFalse) || !rep.authenticated) {
+ if (!_XReply(dpy, (xReply *) &rep, 0, xFalse) || !rep.authenticated) {
UnlockDisplay(dpy);
SyncHandle();
TRACE("AuthConnection... return False");
@@ -311,7 +311,7 @@ XF86DRIGetClientDriverName(Display * dpy, int screen,
req->reqType = info->codes->major_opcode;
req->driReqType = X_XF86DRIGetClientDriverName;
req->screen = screen;
- if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
+ if (!_XReply(dpy, (xReply *) &rep, 0, xFalse)) {
UnlockDisplay(dpy);
SyncHandle();
TRACE("GetClientDriverName... return False");
@@ -362,7 +362,7 @@ XF86DRICreateContextWithConfig(Display * dpy, int screen, int configID,
req->screen = screen;
*context = XAllocID(dpy);
req->context = *context;
- if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
+ if (!_XReply(dpy, (xReply *) &rep, 0, xFalse)) {
UnlockDisplay(dpy);
SyncHandle();
TRACE("CreateContext... return False");
@@ -421,7 +421,7 @@ XF86DRICreateDrawable(Display * dpy, int screen,
req->driReqType = X_XF86DRICreateDrawable;
req->screen = screen;
req->drawable = drawable;
- if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
+ if (!_XReply(dpy, (xReply *) &rep, 0, xFalse)) {
UnlockDisplay(dpy);
SyncHandle();
TRACE("CreateDrawable... return False");
@@ -503,7 +503,7 @@ XF86DRIGetDrawableInfo(Display * dpy, int screen, Drawable drawable,
req->screen = screen;
req->drawable = drawable;
- if (!_XReply(dpy, (xReply *) & rep, 1, xFalse)) {
+ if (!_XReply(dpy, (xReply *) &rep, 1, xFalse)) {
UnlockDisplay(dpy);
SyncHandle();
TRACE("GetDrawableInfo... return False");
@@ -585,7 +585,7 @@ XF86DRIGetDeviceInfo(Display * dpy, int screen, drm_handle_t * hFrameBuffer,
req->reqType = info->codes->major_opcode;
req->driReqType = X_XF86DRIGetDeviceInfo;
req->screen = screen;
- if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
+ if (!_XReply(dpy, (xReply *) &rep, 0, xFalse)) {
UnlockDisplay(dpy);
SyncHandle();
TRACE("GetDeviceInfo... return False");
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrdriext.c b/xorg-server/hw/kdrive/ephyr/ephyrdriext.c
index 1a98a2dff..144c6e1ac 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrdriext.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrdriext.c
@@ -754,7 +754,7 @@ ProcXF86DRICreateContext(register ClientPtr client)
if (!ephyrDRICreateContext(stuff->screen,
stuff->visual,
&context_id,
- (drm_context_t *) & rep.hHWContext)) {
+ (drm_context_t *) &rep.hHWContext)) {
return BadValue;
}
@@ -964,7 +964,7 @@ ProcXF86DRICreateDrawable(ClientPtr client)
if (!ephyrDRICreateDrawable(stuff->screen,
remote_win,
- (drm_drawable_t *) & rep.hHWDrawable)) {
+ (drm_drawable_t *) &rep.hHWDrawable)) {
EPHYR_LOG_ERROR("failed to create dri drawable\n");
return BadValue;
}
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrhostglx.c b/xorg-server/hw/kdrive/ephyr/ephyrhostglx.c
index 392489a00..5c6c40f0b 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrhostglx.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrhostglx.c
@@ -121,7 +121,7 @@ ephyrHostGLXQueryVersion(int *a_major, int *a_minor)
req->glxCode = X_GLXQueryVersion;
req->majorVersion = 2;
req->minorVersion = 1;
- _XReply(dpy, (xReply *) & reply, 0, False);
+ _XReply(dpy, (xReply *) &reply, 0, False);
UnlockDisplay(dpy);
SyncHandle();
@@ -207,7 +207,7 @@ ephyrHostGLXGetStringFromServer(int a_screen_number,
req->for_whom = default_screen;
req->name = a_string_name;
- _XReply(dpy, (xReply *) & reply, 0, False);
+ _XReply(dpy, (xReply *) &reply, 0, False);
length = reply.length * 4;
if (!length) {
@@ -303,7 +303,7 @@ ephyrHostGLXGetVisualConfigsInternal(enum VisualConfRequestType a_type,
break;
}
- if (!_XReply(dpy, (xReply *) & reply, 0, False)) {
+ if (!_XReply(dpy, (xReply *) &reply, 0, False)) {
EPHYR_LOG_ERROR("unknown error\n");
UnlockDisplay(dpy);
goto out;
@@ -615,7 +615,7 @@ ephyrHostGLXMakeCurrent(int a_drawable, int a_readable,
}
memset(&reply, 0, sizeof(reply));
- if (!_XReply(dpy, (xReply *) & reply, 0, False)) {
+ if (!_XReply(dpy, (xReply *) &reply, 0, False)) {
EPHYR_LOG_ERROR("failed to get reply from host\n");
UnlockDisplay(dpy);
SyncHandle();
@@ -735,7 +735,7 @@ ephyrHostIsContextDirect(int a_ctxt_id, int *a_is_direct)
req->reqType = major_opcode;
req->glxCode = X_GLXIsDirect;
req->context = remote_glx_ctxt_id;
- if (!_XReply(dpy, (xReply *) & reply, 0, False)) {
+ if (!_XReply(dpy, (xReply *) &reply, 0, False)) {
EPHYR_LOG_ERROR("fail in reading reply from host\n");
UnlockDisplay(dpy);
SyncHandle();
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrhostproxy.c b/xorg-server/hw/kdrive/ephyr/ephyrhostproxy.c
index 410e6b6e4..a4f25c159 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrhostproxy.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrhostproxy.c
@@ -73,7 +73,7 @@ ephyrHostProxyDoForward(pointer a_request_buffer,
GetXReq(forward_req);
memmove(forward_req, in_req, 4);
- if (!_XReply(dpy, (xReply *) & reply, 0, FALSE)) {
+ if (!_XReply(dpy, (xReply *) &reply, 0, FALSE)) {
EPHYR_LOG_ERROR("failed to get reply\n");
goto out;
}
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c b/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c
index 05a821b39..362aa055e 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c
@@ -304,7 +304,7 @@ ephyrHostXVAdaptorArrayAt(const EphyrHostXVAdaptorArray * a_this, int a_index)
if (a_index >= a_this->nb_adaptors)
return NULL;
- return (EphyrHostXVAdaptor *) & a_this->adaptors[a_index];
+ return (EphyrHostXVAdaptor *) &a_this->adaptors[a_index];
}
char
@@ -668,7 +668,7 @@ ephyrHostXVQueryImageAttributes(int a_port_id,
/*
* read the reply
*/
- if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
+ if (!_XReply(dpy, (xReply *) &rep, 0, xFalse)) {
EPHYR_LOG_ERROR("QeryImageAttribute req failed\n");
goto out;
}
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrvideo.c b/xorg-server/hw/kdrive/ephyr/ephyrvideo.c
index 67eadd121..55dbd2e3a 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrvideo.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrvideo.c
@@ -495,7 +495,7 @@ ephyrXVPrivQueryHostAdaptors(EphyrXVPriv * a_this)
port_priv_offset = a_this->adaptors[i].nPorts;
for (j = 0; j < a_this->adaptors[i].nPorts; j++) {
EphyrPortPriv *port_privs_base =
- (EphyrPortPriv *) & a_this->adaptors[i].
+ (EphyrPortPriv *) &a_this->adaptors[i].
pPortPrivates[port_priv_offset];
EphyrPortPriv *port_priv = &port_privs_base[j];
diff --git a/xorg-server/hw/xfree86/common/xf86cmap.c b/xorg-server/hw/xfree86/common/xf86cmap.c
index 25f84e579..85f35f8db 100644
--- a/xorg-server/hw/xfree86/common/xf86cmap.c
+++ b/xorg-server/hw/xfree86/common/xf86cmap.c
@@ -608,7 +608,7 @@ CMapRefreshColors(ColormapPtr pmap, int defs, int *indices)
case GrayScale:
for (i = 0; i < defs; i++) {
index = indices[i];
- entry = (EntryPtr) & pmap->red[index];
+ entry = (EntryPtr) &pmap->red[index];
if (entry->fShared) {
colors[index].red =
diff --git a/xorg-server/hw/xfree86/dri/xf86dri.c b/xorg-server/hw/xfree86/dri/xf86dri.c
index 0b2e8fa1b..086e833ed 100644
--- a/xorg-server/hw/xfree86/dri/xf86dri.c
+++ b/xorg-server/hw/xfree86/dri/xf86dri.c
@@ -280,7 +280,7 @@ ProcXF86DRICreateContext(register ClientPtr client)
if (!DRICreateContext(pScreen,
NULL,
- stuff->context, (drm_context_t *) & rep.hHWContext)) {
+ stuff->context, (drm_context_t *) &rep.hHWContext)) {
return BadValue;
}
@@ -329,7 +329,7 @@ ProcXF86DRICreateDrawable(ClientPtr client)
return rc;
if (!DRICreateDrawable(screenInfo.screens[stuff->screen], client,
- pDrawable, (drm_drawable_t *) & rep.hHWDrawable)) {
+ pDrawable, (drm_drawable_t *) &rep.hHWDrawable)) {
return BadValue;
}
diff --git a/xorg-server/hw/xfree86/i2c/fi1236.c b/xorg-server/hw/xfree86/i2c/fi1236.c
index 282fe7e34..2eb27ba6d 100644
--- a/xorg-server/hw/xfree86/i2c/fi1236.c
+++ b/xorg-server/hw/xfree86/i2c/fi1236.c
@@ -91,7 +91,7 @@ MT2032_getid(FI1236Ptr f)
CARD8 in;
in = 0x11;
- I2C_WriteRead(&(f->d), (I2CByte *) & in, 1, out, 4);
+ I2C_WriteRead(&(f->d), (I2CByte *) &in, 1, out, 4);
xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO,
"MT2032: Company code 0x%02x%02x, part code 0x%02x, revision code 0x%02x\n",
out[0], out[1], out[2], out[3]);
@@ -432,7 +432,7 @@ MT2032_get_afc_hint(FI1236Ptr f)
CARD8 AFC;
in = 0x0e;
- I2C_WriteRead(&(f->d), (I2CByte *) & in, 1, out, 2);
+ I2C_WriteRead(&(f->d), (I2CByte *) &in, 1, out, 2);
AFC = (out[0] >> 4) & 0x7;
#if 0
xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "AFC=%d TAD1=%d TAD2=%d\n",
@@ -467,7 +467,7 @@ MT2032_dump_status(FI1236Ptr f)
CARD8 TAD2, TAD1;
in = 0x0e;
- I2C_WriteRead(&(f->d), (I2CByte *) & in, 1, out, 2);
+ I2C_WriteRead(&(f->d), (I2CByte *) &in, 1, out, 2);
XOK = out[0] & 1;
LO1LK = (out[0] >> 2) & 1;
LO2LK = (out[0] >> 1) & 1;
@@ -589,12 +589,12 @@ FI1236_tune(FI1236Ptr f, CARD32 frequency)
if ((f->type == TUNER_TYPE_FM1216ME) || (f->type == TUNER_TYPE_FI1236W)) {
f->tuner_data.aux = 0x20;
- I2C_WriteRead(&(f->d), (I2CByte *) & (f->tuner_data), 5, NULL, 0);
+ I2C_WriteRead(&(f->d), (I2CByte *) &(f->tuner_data), 5, NULL, 0);
I2C_WriteRead(&(f->d), NULL, 0, &data, 1);
xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "Tuner status %x\n", data);
}
else
- I2C_WriteRead(&(f->d), (I2CByte *) & (f->tuner_data), 4, NULL, 0);
+ I2C_WriteRead(&(f->d), (I2CByte *) &(f->tuner_data), 4, NULL, 0);
}
void
diff --git a/xorg-server/hw/xfree86/i2c/tda9850.c b/xorg-server/hw/xfree86/i2c/tda9850.c
index c2ce6971f..d258bda05 100644
--- a/xorg-server/hw/xfree86/i2c/tda9850.c
+++ b/xorg-server/hw/xfree86/i2c/tda9850.c
@@ -131,6 +131,6 @@ tda9850_getstatus(TDA9850Ptr t)
{
CARD16 status;
- I2C_WriteRead(&(t->d), NULL, 0, (I2CByte *) & status, 2);
+ I2C_WriteRead(&(t->d), NULL, 0, (I2CByte *) &status, 2);
return status;
}
diff --git a/xorg-server/hw/xquartz/GL/visualConfigs.c b/xorg-server/hw/xquartz/GL/visualConfigs.c
index e37eefbe4..03486cd66 100644
--- a/xorg-server/hw/xquartz/GL/visualConfigs.c
+++ b/xorg-server/hw/xquartz/GL/visualConfigs.c
@@ -58,40 +58,38 @@
#include "darwinfb.h"
/* Based originally on code from indirect.c which was based on code from i830_dri.c. */
-__GLXconfig *
-__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
-{
+__GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber) {
int numConfigs = 0;
__GLXconfig *visualConfigs, *c;
struct glCapabilities caps;
struct glCapabilitiesConfig *conf;
int stereo, depth, aux, buffers, stencil, accum, color, msample;
- if (getGlCapabilities(&caps)) {
+ if(getGlCapabilities(&caps)) {
ErrorF("error from getGlCapabilities()!\n");
return NULL;
}
/*
- conf->stereo is 0 or 1, but we need at least 1 iteration of the loop,
- so we treat a true conf->stereo as 2.
+ conf->stereo is 0 or 1, but we need at least 1 iteration of the loop,
+ so we treat a true conf->stereo as 2.
- The depth size is 0 or 24. Thus we do 2 iterations for that.
+ The depth size is 0 or 24. Thus we do 2 iterations for that.
- conf->aux_buffers (when available/non-zero) result in 2 iterations instead of 1.
+ conf->aux_buffers (when available/non-zero) result in 2 iterations instead of 1.
- conf->buffers indicates whether we have single or double buffering.
+ conf->buffers indicates whether we have single or double buffering.
- conf->total_stencil_bit_depths
+ conf->total_stencil_bit_depths
- conf->total_color_buffers indicates the RGB/RGBA color depths.
+ conf->total_color_buffers indicates the RGB/RGBA color depths.
- conf->total_accum_buffers iterations for accum (with at least 1 if equal to 0)
+ conf->total_accum_buffers iterations for accum (with at least 1 if equal to 0)
- conf->total_depth_buffer_depths
+ conf->total_depth_buffer_depths
- conf->multisample_buffers iterations (with at least 1 if equal to 0). We add 1
- for the 0 multisampling config.
+ conf->multisample_buffers iterations (with at least 1 if equal to 0). We add 1
+ for the 0 multisampling config.
*/
@@ -99,57 +97,43 @@ __glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
numConfigs = 0;
- for (conf = caps.configurations; conf; conf = conf->next) {
- if (conf->total_color_buffers <= 0)
+ for(conf = caps.configurations; conf; conf = conf->next) {
+ if(conf->total_color_buffers <= 0)
continue;
numConfigs += (conf->stereo ? 2 : 1)
- * (conf->aux_buffers ? 2 : 1)
- * conf->buffers
- * ((conf->total_stencil_bit_depths >
- 0) ? conf->total_stencil_bit_depths : 1)
- * conf->total_color_buffers
- * ((conf->total_accum_buffers >
- 0) ? conf->total_accum_buffers : 1)
- * conf->total_depth_buffer_depths
- * (conf->multisample_buffers + 1);
+ * (conf->aux_buffers ? 2 : 1)
+ * conf->buffers
+ * ((conf->total_stencil_bit_depths > 0) ? conf->total_stencil_bit_depths : 1)
+ * conf->total_color_buffers
+ * ((conf->total_accum_buffers > 0) ? conf->total_accum_buffers : 1)
+ * conf->total_depth_buffer_depths
+ * (conf->multisample_buffers + 1);
}
- if (numConfigsPtr)
+ if(numConfigsPtr)
*numConfigsPtr = numConfigs;
visualConfigs = calloc(sizeof(*visualConfigs), numConfigs);
- if (NULL == visualConfigs) {
+ if(NULL == visualConfigs) {
ErrorF("xcalloc failure when allocating visualConfigs\n");
freeGlCapabilities(&caps);
return NULL;
}
c = visualConfigs; /* current buffer */
- for (conf = caps.configurations; conf; conf = conf->next) {
- for (stereo = 0; stereo < (conf->stereo ? 2 : 1); ++stereo) {
- for (aux = 0; aux < (conf->aux_buffers ? 2 : 1); ++aux) {
- for (buffers = 0; buffers < conf->buffers; ++buffers) {
- for (stencil = 0;
- stencil < ((conf->total_stencil_bit_depths > 0) ?
- conf->
- total_stencil_bit_depths : 1);
- ++stencil) {
- for (color = 0; color < conf->total_color_buffers;
- ++color) {
- for (accum = 0;
- accum < ((conf->total_accum_buffers > 0) ?
- conf->
- total_accum_buffers : 1);
- ++accum) {
- for (depth = 0;
- depth < conf->total_depth_buffer_depths;
- ++depth) {
- for (msample = 0;
- msample <
- (conf->multisample_buffers + 1);
- ++msample) {
+ for(conf = caps.configurations; conf; conf = conf->next) {
+ for(stereo = 0; stereo < (conf->stereo ? 2 : 1); ++stereo) {
+ for(aux = 0; aux < (conf->aux_buffers ? 2 : 1); ++aux) {
+ for(buffers = 0; buffers < conf->buffers; ++buffers) {
+ for(stencil = 0; stencil < ((conf->total_stencil_bit_depths > 0) ?
+ conf->total_stencil_bit_depths : 1); ++stencil) {
+ for(color = 0; color < conf->total_color_buffers; ++color) {
+ for(accum = 0; accum < ((conf->total_accum_buffers > 0) ?
+ conf->total_accum_buffers : 1); ++accum) {
+ for(depth = 0; depth < conf->total_depth_buffer_depths; ++depth) {
+ for(msample = 0; msample < (conf->multisample_buffers + 1); ++msample) {
// Global
c->visualID = -1;
@@ -162,12 +146,10 @@ __glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
c->indexBits = 0;
c->pixmapMode = 0; // TODO: What should this be?
- if (conf->accelerated) {
+ if(conf->accelerated) {
c->visualRating = GLX_NONE;
- }
- else {
- c->visualRating =
- GLX_SLOW_VISUAL_EXT;
+ } else {
+ c->visualRating = GLX_SLOW_VISUAL_EXT;
}
c->transparentPixel = GLX_NONE;
@@ -179,91 +161,52 @@ __glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
c->visualSelectGroup = 0;
- c->swapMethod =
- GLX_SWAP_UNDEFINED_OML;
+ c->swapMethod = GLX_SWAP_UNDEFINED_OML;
// Stereo
c->stereoMode = stereo ? TRUE : FALSE;
// Aux buffers
- c->numAuxBuffers =
- aux ? conf->aux_buffers : 0;
+ c->numAuxBuffers = aux ? conf->aux_buffers : 0;
// Double Buffered
- c->doubleBufferMode =
- buffers ? TRUE : FALSE;
+ c->doubleBufferMode = buffers ? TRUE : FALSE;
// Stencil Buffer
- if (conf->total_stencil_bit_depths >
- 0) {
- c->stencilBits =
- conf->stencil_bit_depths[
- stencil];
- }
- else {
+ if(conf->total_stencil_bit_depths > 0) {
+ c->stencilBits = conf->stencil_bit_depths[stencil];
+ } else {
c->stencilBits = 0;
}
// Color
- if (GLCAPS_COLOR_BUF_INVALID_VALUE !=
- conf->color_buffers[color].a) {
- c->alphaBits =
- conf->color_buffers[color].a;
- }
- else {
+ if(GLCAPS_COLOR_BUF_INVALID_VALUE != conf->color_buffers[color].a) {
+ c->alphaBits = conf->color_buffers[color].a;
+ } else {
c->alphaBits = 0;
}
- c->redBits =
- conf->color_buffers[color].r;
- c->greenBits =
- conf->color_buffers[color].g;
- c->blueBits =
- conf->color_buffers[color].b;
-
- c->rgbBits = c->alphaBits +
- c->redBits +
- c->greenBits +
- c->blueBits;
-
- c->alphaMask =
- AM_ARGB(c->alphaBits, c->redBits,
- c->greenBits,
- c->blueBits);
- c->redMask =
- RM_ARGB(c->alphaBits, c->redBits,
- c->greenBits,
- c->blueBits);
- c->greenMask =
- GM_ARGB(c->alphaBits, c->redBits,
- c->greenBits,
- c->blueBits);
- c->blueMask =
- BM_ARGB(c->alphaBits, c->redBits,
- c->greenBits,
- c->blueBits);
+ c->redBits = conf->color_buffers[color].r;
+ c->greenBits = conf->color_buffers[color].g;
+ c->blueBits = conf->color_buffers[color].b;
+
+ c->rgbBits = c->alphaBits + c->redBits + c->greenBits + c->blueBits;
+
+ c->alphaMask = AM_ARGB(c->alphaBits, c->redBits, c->greenBits, c->blueBits);
+ c->redMask = RM_ARGB(c->alphaBits, c->redBits, c->greenBits, c->blueBits);
+ c->greenMask = GM_ARGB(c->alphaBits, c->redBits, c->greenBits, c->blueBits);
+ c->blueMask = BM_ARGB(c->alphaBits, c->redBits, c->greenBits, c->blueBits);
// Accumulation Buffers
- if (conf->total_accum_buffers > 0) {
- c->accumRedBits =
- conf->accum_buffers[accum].r;
- c->accumGreenBits =
- conf->accum_buffers[accum].g;
- c->accumBlueBits =
- conf->accum_buffers[accum].b;
- if (
- GLCAPS_COLOR_BUF_INVALID_VALUE
- !=
- conf->accum_buffers[accum].a)
- {
- c->accumAlphaBits =
- conf->accum_buffers[accum
- ].a;
- }
- else {
+ if(conf->total_accum_buffers > 0) {
+ c->accumRedBits = conf->accum_buffers[accum].r;
+ c->accumGreenBits = conf->accum_buffers[accum].g;
+ c->accumBlueBits = conf->accum_buffers[accum].b;
+ if(GLCAPS_COLOR_BUF_INVALID_VALUE != conf->accum_buffers[accum].a) {
+ c->accumAlphaBits = conf->accum_buffers[accum].a;
+ } else {
c->accumAlphaBits = 0;
}
- }
- else {
+ } else {
c->accumRedBits = 0;
c->accumGreenBits = 0;
c->accumBlueBits = 0;
@@ -271,17 +214,13 @@ __glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
}
// Depth
- c->depthBits =
- conf->depth_buffers[depth];
+ c->depthBits = conf->depth_buffers[depth];
// MultiSample
- if (msample > 0) {
- c->samples =
- conf->multisample_samples;
- c->sampleBuffers =
- conf->multisample_buffers;
- }
- else {
+ if(msample > 0) {
+ c->samples = conf->multisample_samples;
+ c->sampleBuffers = conf->multisample_buffers;
+ } else {
c->samples = 0;
c->sampleBuffers = 0;
}
@@ -291,9 +230,7 @@ __glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
* GLXPbuffers in direct mode.
*/
/* SGIX_fbconfig / GLX 1.3 */
- c->drawableType = GLX_WINDOW_BIT |
- GLX_PIXMAP_BIT |
- GLX_PBUFFER_BIT;
+ c->drawableType = GLX_WINDOW_BIT | GLX_PIXMAP_BIT | GLX_PBUFFER_BIT;
c->renderType = GLX_RGBA_BIT;
c->xRenderable = GL_TRUE;
c->fbconfigID = -1;
@@ -310,8 +247,7 @@ __glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
*/
c->maxPbufferWidth = 8192;
c->maxPbufferHeight = 8192;
- c->maxPbufferPixels =
- /*Do we need this?*/ 0;
+ c->maxPbufferPixels = /*Do we need this?*/ 0;
/*
* There is no introspection for this sort of thing
* with CGL. What should we do realistically?
@@ -337,12 +273,10 @@ __glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
}
}
- (c - 1)->next = NULL;
+ (c-1)->next = NULL;
if (c - visualConfigs != numConfigs) {
- FatalError(
- "numConfigs calculation error in setVisualConfigs! numConfigs is %d i is %d\n",
- numConfigs, (int)(c - visualConfigs));
+ FatalError("numConfigs calculation error in setVisualConfigs! numConfigs is %d i is %d\n", numConfigs, (int)(c - visualConfigs));
}
freeGlCapabilities(&caps);
diff --git a/xorg-server/hw/xquartz/darwin.c b/xorg-server/hw/xquartz/darwin.c
index bf511801d..e0983d6ef 100644
--- a/xorg-server/hw/xquartz/darwin.c
+++ b/xorg-server/hw/xquartz/darwin.c
@@ -230,13 +230,15 @@ DarwinScreenInit(ScreenPtr pScreen, int argc, char **argv)
}
// TODO: Make PseudoColor visuals not suck in TrueColor mode
- // if(dfb->depth > 8)
- // miSetVisualTypesAndMasks(8, PseudoColorMask, 8, PseudoColor, 0, 0, 0);
- if (dfb->depth > 15)
- miSetVisualTypesAndMasks(15, TrueColorMask, 5, TrueColor,
- RM_ARGB(0, 5, 5, 5), GM_ARGB(0, 5, 5,
- 5),
- BM_ARGB(0, 5, 5, 5));
+ // if(dfb->depth > 8)
+ // miSetVisualTypesAndMasks(8, PseudoColorMask, 8, PseudoColor, 0, 0, 0);
+ //
+ // TODO: Re-add support for 15bit
+ // if (dfb->depth > 15)
+ // miSetVisualTypesAndMasks(15, TrueColorMask, 5, TrueColor,
+ // RM_ARGB(0, 5, 5, 5), GM_ARGB(0, 5, 5,
+ // 5),
+ // BM_ARGB(0, 5, 5, 5));
if (dfb->depth > 24)
miSetVisualTypesAndMasks(24, TrueColorMask, 8, TrueColor,
RM_ARGB(0, 8, 8, 8), GM_ARGB(0, 8, 8,
diff --git a/xorg-server/hw/xquartz/xpr/xprScreen.c b/xorg-server/hw/xquartz/xpr/xprScreen.c
index efe2aa882..e37601995 100644
--- a/xorg-server/hw/xquartz/xpr/xprScreen.c
+++ b/xorg-server/hw/xquartz/xpr/xprScreen.c
@@ -359,6 +359,10 @@ have_depth:
dfb->blueMask = 0;
break;
+#if 0
+ // Removed because Mountain Lion removed support for
+ // 15bit backing stores. We can possibly re-add
+ // this once libXplugin is updated to work around it.
case 15:
dfb->visuals = TrueColorMask; //LARGE_VISUALS;
dfb->preferredCVC = TrueColor;
@@ -369,6 +373,7 @@ have_depth:
dfb->greenMask = GM_ARGB(0, 5, 5, 5);
dfb->blueMask = BM_ARGB(0, 5, 5, 5);
break;
+#endif
// case 24:
default:
diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c
index 0c638df1d..a35721e74 100644
--- a/xorg-server/hw/xwin/InitOutput.c
+++ b/xorg-server/hw/xwin/InitOutput.c
@@ -1072,7 +1072,7 @@ winCheckDisplayNumber(void)
NULL,
GetLastError(),
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- (LPTSTR) & lpMsgBuf, 0, NULL);
+ (LPTSTR) &lpMsgBuf, 0, NULL);
ErrorF("winCheckDisplayNumber - CreateMutex failed: %s\n",
(LPSTR) lpMsgBuf);
LocalFree(lpMsgBuf);
diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c
index 10da5b515..37a03ff00 100755
--- a/xorg-server/hw/xwin/glx/indirect.c
+++ b/xorg-server/hw/xwin/glx/indirect.c
@@ -256,7 +256,7 @@ glxWinErrorMessage(void)
if (!FormatMessage
(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS |
FORMAT_MESSAGE_MAX_WIDTH_MASK, NULL, last_error, 0,
- (LPTSTR) & errorbuffer, sizeof(errorbuffer), NULL)) {
+ (LPTSTR) &errorbuffer, sizeof(errorbuffer), NULL)) {
snprintf(errorbuffer, sizeof(errorbuffer), "Unknown error");
}
@@ -1532,7 +1532,7 @@ glxWinDeferredCreateContext(__GLXWinContext * gc, __GLXWinDrawable * draw)
}
draw->hDIB =
- CreateDIBSection(draw->dibDC, (BITMAPINFO *) & bmpHeader,
+ CreateDIBSection(draw->dibDC, (BITMAPINFO *) &bmpHeader,
DIB_RGB_COLORS, &pBits, 0, 0);
if (draw->dibDC == NULL) {
ErrorF("CreateDIBSection error: %s\n", glxWinErrorMessage());
diff --git a/xorg-server/hw/xwin/winclipboardxevents.c b/xorg-server/hw/xwin/winclipboardxevents.c
index 4bb6c12fa..4aff0659b 100644
--- a/xorg-server/hw/xwin/winclipboardxevents.c
+++ b/xorg-server/hw/xwin/winclipboardxevents.c
@@ -167,7 +167,7 @@ winClipboardFlushXEvents(HWND hwnd,
*/
iReturn = XSendEvent(pDisplay,
eventSelection.requestor,
- False, 0L, (XEvent *) & eventSelection);
+ False, 0L, (XEvent *) &eventSelection);
if (iReturn == BadValue || iReturn == BadWindow) {
ErrorF("winClipboardFlushXEvents - SelectionRequest - "
"XSendEvent () failed\n");
@@ -362,7 +362,7 @@ winClipboardFlushXEvents(HWND hwnd,
/* Notify the requesting window that the operation has completed */
iReturn = XSendEvent(pDisplay,
eventSelection.requestor,
- False, 0L, (XEvent *) & eventSelection);
+ False, 0L, (XEvent *) &eventSelection);
if (iReturn == BadValue || iReturn == BadWindow) {
ErrorF("winClipboardFlushXEvents - SelectionRequest - "
"XSendEvent () failed\n");
@@ -401,7 +401,7 @@ winClipboardFlushXEvents(HWND hwnd,
/* Notify the requesting window that the operation is complete */
iReturn = XSendEvent(pDisplay,
eventSelection.requestor,
- False, 0L, (XEvent *) & eventSelection);
+ False, 0L, (XEvent *) &eventSelection);
if (iReturn == BadValue || iReturn == BadWindow) {
/*
* Should not be a problem if XSendEvent fails because
diff --git a/xorg-server/hw/xwin/wincursor.c b/xorg-server/hw/xwin/wincursor.c
index 77cf1c13f..8e8c6fd3d 100644..100755
--- a/xorg-server/hw/xwin/wincursor.c
+++ b/xorg-server/hw/xwin/wincursor.c
@@ -103,7 +103,7 @@ winPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
/* Translate the client area coords to screen coords */
MapWindowPoints(pScreenPriv->hwndScreen,
- HWND_DESKTOP, (LPPOINT) & rcClient, 2);
+ HWND_DESKTOP, (LPPOINT) &rcClient, 2);
/*
* Update the Windows cursor position so that we don't
@@ -274,7 +274,7 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen)
if (!lpBits) {
/* Bicolor, use a palettized DIB */
winDebug("winLoadCursor: Trying two color cursor\n");
- pbmi = (BITMAPINFO *) & bi;
+ pbmi = (BITMAPINFO *) &bi;
memset(pbmi, 0, sizeof(BITMAPINFOHEADER));
pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
pbmi->bmiHeader.biWidth = pScreenPriv->cursor.sm_cx;
@@ -357,7 +357,7 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen)
CreateCompatibleBitmap(hDC, pScreenPriv->cursor.sm_cx,
pScreenPriv->cursor.sm_cy);
SetDIBits(hDC, hXor, 0, pScreenPriv->cursor.sm_cy, lpBits,
- (BITMAPINFO *) & bi, DIB_RGB_COLORS);
+ (BITMAPINFO *) &bi, DIB_RGB_COLORS);
ReleaseDC(NULL, hDC);
}
free(lpBits);
diff --git a/xorg-server/hw/xwin/winengine.c b/xorg-server/hw/xwin/winengine.c
index cf8a526a5..e597e2c49 100644
--- a/xorg-server/hw/xwin/winengine.c
+++ b/xorg-server/hw/xwin/winengine.c
@@ -108,7 +108,7 @@ winDetectSupportedEngines(void)
/* Try to query for DirectDraw4 interface */
ddrval = IDirectDraw_QueryInterface(lpdd,
&IID_IDirectDraw4,
- (LPVOID *) & lpdd4);
+ (LPVOID *) &lpdd4);
if (SUCCEEDED(ddrval)) {
/* We have DirectDraw4 */
winDebug (
diff --git a/xorg-server/hw/xwin/wingc.c b/xorg-server/hw/xwin/wingc.c
index 259d2e29d..aba398d0a 100644
--- a/xorg-server/hw/xwin/wingc.c
+++ b/xorg-server/hw/xwin/wingc.c
@@ -89,8 +89,8 @@ winCreateGCNativeGDI(GCPtr pGC)
winDebug ("winCreateGCNativeGDI - depth: %d\n", pGC->depth);
- pGC->ops = (GCOps *) & winGCOps;
- pGC->funcs = (GCFuncs *) & winGCFuncs;
+ pGC->ops = (GCOps *) &winGCOps;
+ pGC->funcs = (GCFuncs *) &winGCFuncs;
/* We want all coordinates passed to spans functions to be screen relative */
pGC->miTranslate = TRUE;
diff --git a/xorg-server/hw/xwin/winmsg.c b/xorg-server/hw/xwin/winmsg.c
index 3b08d4fde..7831a3b36 100644..100755
--- a/xorg-server/hw/xwin/winmsg.c
+++ b/xorg-server/hw/xwin/winmsg.c
@@ -82,7 +82,7 @@ winW32ErrorEx(const char *msg, DWORD errorcode)
NULL,
errorcode,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- (LPTSTR) & buffer, 0, NULL)) {
+ (LPTSTR) &buffer, 0, NULL)) {
ErrorF(msg);
ErrorF("Unknown error in FormatMessage!\n");
}
diff --git a/xorg-server/hw/xwin/winmultiwindowicons.c b/xorg-server/hw/xwin/winmultiwindowicons.c
index 28bf35303..2e0c82604 100644
--- a/xorg-server/hw/xwin/winmultiwindowicons.c
+++ b/xorg-server/hw/xwin/winmultiwindowicons.c
@@ -255,7 +255,7 @@ NetWMToWinIconAlpha(uint32_t * icon)
ii.fIcon = TRUE;
ii.xHotspot = 0; /* ignored */
ii.yHotspot = 0; /* ignored */
- ii.hbmColor = CreateDIBSection(hdc, (BITMAPINFO *) & bmh,
+ ii.hbmColor = CreateDIBSection(hdc, (BITMAPINFO *) &bmh,
DIB_RGB_COLORS, (void **) &DIB_pixels, NULL,
0);
ReleaseDC(NULL, hdc);
diff --git a/xorg-server/hw/xwin/winmultiwindowshape.c b/xorg-server/hw/xwin/winmultiwindowshape.c
index 26cd715bc..0a00e79ee 100644
--- a/xorg-server/hw/xwin/winmultiwindowshape.c
+++ b/xorg-server/hw/xwin/winmultiwindowshape.c
@@ -133,7 +133,7 @@ winReshapeMultiWindow(WindowPtr pWin)
/* Translate client rectangle coords to screen coords */
/* NOTE: Only transforms top and left members */
- ClientToScreen(pWinPriv->hWnd, (LPPOINT) & rcClient);
+ ClientToScreen(pWinPriv->hWnd, (LPPOINT) &rcClient);
/* Get window rectangle */
if (!GetWindowRect(pWinPriv->hWnd, &rcWindow)) {
diff --git a/xorg-server/hw/xwin/winmultiwindowwndproc.c b/xorg-server/hw/xwin/winmultiwindowwndproc.c
index 44da5041f..7ceee11a5 100644
--- a/xorg-server/hw/xwin/winmultiwindowwndproc.c
+++ b/xorg-server/hw/xwin/winmultiwindowwndproc.c
@@ -488,7 +488,7 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
NULL,
GetLastError(),
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- (LPTSTR) & lpMsgBuf, 0, NULL);
+ (LPTSTR) &lpMsgBuf, 0, NULL);
ErrorF("winTopLevelWindowProc - BitBlt failed: %s\n",
(LPSTR) lpMsgBuf);
diff --git a/xorg-server/hw/xwin/winpfbdd.c b/xorg-server/hw/xwin/winpfbdd.c
index e2ed49af8..53056e177 100644
--- a/xorg-server/hw/xwin/winpfbdd.c
+++ b/xorg-server/hw/xwin/winpfbdd.c
@@ -78,7 +78,7 @@ winAllocateFBPrimaryDD(ScreenPtr pScreen)
/* Get client area location in screen coords */
GetClientRect(pScreenPriv->hwndScreen, &rcClient);
MapWindowPoints(pScreenPriv->hwndScreen,
- HWND_DESKTOP, (LPPOINT) & rcClient, 2);
+ HWND_DESKTOP, (LPPOINT) &rcClient, 2);
/* Create a DirectDraw object, store the address at lpdd */
ddrval = (*g_fpDirectDrawCreate) (NULL, &pScreenPriv->pdd, NULL);
@@ -88,7 +88,7 @@ winAllocateFBPrimaryDD(ScreenPtr pScreen)
/* Get a DirectDraw2 interface pointer */
ddrval = IDirectDraw_QueryInterface(pScreenPriv->pdd,
&IID_IDirectDraw2,
- (LPVOID *) & pScreenPriv->pdd2);
+ (LPVOID *) &pScreenPriv->pdd2);
if (FAILED(ddrval)) {
ErrorF("winAllocateFBShadowDD - Failed DD2 query: %08x\n",
(unsigned int) ddrval);
@@ -461,7 +461,7 @@ winActivateAppPrimaryDD(ScreenPtr pScreen)
/* Get client area in screen coords */
GetClientRect(pScreenPriv->hwndScreen, &rcClient);
MapWindowPoints(pScreenPriv->hwndScreen,
- HWND_DESKTOP, (LPPOINT) & rcClient, 2);
+ HWND_DESKTOP, (LPPOINT) &rcClient, 2);
/* Setup a source rectangle */
rcSrc.left = 0;
@@ -526,7 +526,7 @@ winHotKeyAltTabPrimaryDD(ScreenPtr pScreen)
/* Get client area in screen coords */
GetClientRect(pScreenPriv->hwndScreen, &rcClient);
MapWindowPoints(pScreenPriv->hwndScreen,
- HWND_DESKTOP, (LPPOINT) & rcClient, 2);
+ HWND_DESKTOP, (LPPOINT) &rcClient, 2);
/* Did we loose the primary surface? */
ddrval = IDirectDrawSurface2_IsLost(pScreenPriv->pddsPrimary);
diff --git a/xorg-server/hw/xwin/winpixmap.c b/xorg-server/hw/xwin/winpixmap.c
index ac883a84c..43c0c3c14 100644
--- a/xorg-server/hw/xwin/winpixmap.c
+++ b/xorg-server/hw/xwin/winpixmap.c
@@ -107,7 +107,7 @@ winCreatePixmapNativeGDI(ScreenPtr pScreen,
/* Create a DIB for the pixmap */
pPixmapPriv->hBitmap = winCreateDIBNativeGDI(iWidth, iHeight, iDepth,
&pPixmapPriv->pbBits,
- (BITMAPINFO **) & pPixmapPriv->
+ (BITMAPINFO **) &pPixmapPriv->
pbmih);
winDebug("winCreatePixmap () - Created a pixmap %08x, %dx%dx%d, for "
diff --git a/xorg-server/hw/xwin/winscrinit.c b/xorg-server/hw/xwin/winscrinit.c
index c0426ac0b..c6fddaf9b 100644..100755
--- a/xorg-server/hw/xwin/winscrinit.c
+++ b/xorg-server/hw/xwin/winscrinit.c
@@ -539,7 +539,7 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
&pScreenPriv->ptWMProc,
&pScreenPriv->ptXMsgProc,
&pScreenPriv->pmServerStarted,
- pScreenInfo->dwScreen, (HWND) & pScreenPriv->hwndScreen,
+ pScreenInfo->dwScreen, (HWND) &pScreenPriv->hwndScreen,
#ifdef XWIN_MULTIWINDOWINTWM
pScreenInfo->fInternalWM ||
#endif
diff --git a/xorg-server/hw/xwin/winsetsp.c b/xorg-server/hw/xwin/winsetsp.c
index fb9105132..001e50e11 100644..100755
--- a/xorg-server/hw/xwin/winsetsp.c
+++ b/xorg-server/hw/xwin/winsetsp.c
@@ -112,7 +112,7 @@ winSetSpansNativeGDI(DrawablePtr pDrawable,
0, 0,
*piWidths, 1,
pSrcs,
- (BITMAPINFO*)&bmi,
+ (BITMAPINFO *) &bmi,
DIB_RGB_COLORS, g_copyROP[pGC->alu]);
pSrcs += PixmapBytePad(*piWidths, pDrawable->depth);
@@ -155,7 +155,7 @@ winSetSpansNativeGDI(DrawablePtr pDrawable,
0, 0,
*piWidths, 1,
pSrcs,
- (BITMAPINFO *) & bmi,
+ (BITMAPINFO *) &bmi,
DIB_RGB_COLORS, g_copyROP[pGC->alu]);
pSrcs += PixmapBytePad(*piWidths, pDrawable->depth);
diff --git a/xorg-server/hw/xwin/winshaddd.c b/xorg-server/hw/xwin/winshaddd.c
index e35fe394c..5a117aace 100644
--- a/xorg-server/hw/xwin/winshaddd.c
+++ b/xorg-server/hw/xwin/winshaddd.c
@@ -220,7 +220,7 @@ winAllocateFBShadowDD(ScreenPtr pScreen)
/* Get a DirectDraw2 interface pointer */
ddrval = IDirectDraw_QueryInterface(pScreenPriv->pdd,
&IID_IDirectDraw2,
- (LPVOID *) & pScreenPriv->pdd2);
+ (LPVOID *) &pScreenPriv->pdd2);
if (FAILED(ddrval)) {
ErrorF("winAllocateFBShadowDD - Failed DD2 query: %08x\n",
(unsigned int) ddrval);
@@ -487,7 +487,7 @@ winShadowUpdateDD(ScreenPtr pScreen, shadowBufPtr pBuf)
ptOrigin.x = pScreenInfo->dwXOffset;
ptOrigin.y = pScreenInfo->dwYOffset;
MapWindowPoints(pScreenPriv->hwndScreen,
- HWND_DESKTOP, (LPPOINT) & ptOrigin, 1);
+ HWND_DESKTOP, (LPPOINT) &ptOrigin, 1);
/* Unlock the shadow surface, so we can blit */
ddrval = IDirectDrawSurface2_Unlock(pScreenPriv->pddsShadow, NULL);
@@ -830,7 +830,7 @@ winBltExposedRegionsShadowDD(ScreenPtr pScreen)
ptOrigin.y = pScreenInfo->dwYOffset;
MapWindowPoints(pScreenPriv->hwndScreen,
- HWND_DESKTOP, (LPPOINT) & ptOrigin, 1);
+ HWND_DESKTOP, (LPPOINT) &ptOrigin, 1);
rcDest.left = ptOrigin.x;
rcDest.right = ptOrigin.x + pScreenInfo->dwWidth;
rcDest.top = ptOrigin.y;
@@ -973,7 +973,7 @@ winRedrawScreenShadowDD(ScreenPtr pScreen)
ptOrigin.x = pScreenInfo->dwXOffset;
ptOrigin.y = pScreenInfo->dwYOffset;
MapWindowPoints(pScreenPriv->hwndScreen,
- HWND_DESKTOP, (LPPOINT) & ptOrigin, 1);
+ HWND_DESKTOP, (LPPOINT) &ptOrigin, 1);
rcDest.left = ptOrigin.x;
rcDest.right = ptOrigin.x + pScreenInfo->dwWidth;
rcDest.top = ptOrigin.y;
diff --git a/xorg-server/hw/xwin/winshadddnl.c b/xorg-server/hw/xwin/winshadddnl.c
index a50128668..af13aba52 100644
--- a/xorg-server/hw/xwin/winshadddnl.c
+++ b/xorg-server/hw/xwin/winshadddnl.c
@@ -344,7 +344,7 @@ winAllocateFBShadowDDNL(ScreenPtr pScreen)
/* Create a DirectDraw object, store the address at lpdd */
ddrval = (*g_fpDirectDrawCreate) (NULL,
- (LPDIRECTDRAW *) & pScreenPriv->pdd,
+ (LPDIRECTDRAW *) &pScreenPriv->pdd,
NULL);
if (FAILED(ddrval)) {
ErrorF("winAllocateFBShadowDDNL - Could not start "
@@ -357,7 +357,7 @@ winAllocateFBShadowDDNL(ScreenPtr pScreen)
/* Get a DirectDraw4 interface pointer */
ddrval = IDirectDraw_QueryInterface(pScreenPriv->pdd,
&IID_IDirectDraw4,
- (LPVOID *) & pScreenPriv->pdd4);
+ (LPVOID *) &pScreenPriv->pdd4);
if (FAILED(ddrval)) {
ErrorF("winAllocateFBShadowDDNL - Failed DD4 query: %08x\n",
(unsigned int) ddrval);
@@ -608,7 +608,7 @@ winShadowUpdateDDNL(ScreenPtr pScreen, shadowBufPtr pBuf)
ptOrigin.x = pScreenInfo->dwXOffset;
ptOrigin.y = pScreenInfo->dwYOffset;
MapWindowPoints(pScreenPriv->hwndScreen,
- HWND_DESKTOP, (LPPOINT) & ptOrigin, 1);
+ HWND_DESKTOP, (LPPOINT) &ptOrigin, 1);
/*
* Handle small regions with multiple blits,
@@ -921,7 +921,7 @@ winBltExposedRegionsShadowDDNL(ScreenPtr pScreen)
ptOrigin.y = pScreenInfo->dwYOffset;
MapWindowPoints(pScreenPriv->hwndScreen,
- HWND_DESKTOP, (LPPOINT) & ptOrigin, 1);
+ HWND_DESKTOP, (LPPOINT) &ptOrigin, 1);
rcDest.left = ptOrigin.x;
rcDest.right = ptOrigin.x + pScreenInfo->dwWidth;
rcDest.top = ptOrigin.y;
@@ -986,7 +986,7 @@ winRedrawScreenShadowDDNL(ScreenPtr pScreen)
ptOrigin.x = pScreenInfo->dwXOffset;
ptOrigin.y = pScreenInfo->dwYOffset;
MapWindowPoints(pScreenPriv->hwndScreen,
- HWND_DESKTOP, (LPPOINT) & ptOrigin, 1);
+ HWND_DESKTOP, (LPPOINT) &ptOrigin, 1);
rcDest.left = ptOrigin.x;
rcDest.right = ptOrigin.x + pScreenInfo->dwWidth;
rcDest.top = ptOrigin.y;
diff --git a/xorg-server/hw/xwin/winshadgdi.c b/xorg-server/hw/xwin/winshadgdi.c
index 6bfe41179..9e981cea7 100644
--- a/xorg-server/hw/xwin/winshadgdi.c
+++ b/xorg-server/hw/xwin/winshadgdi.c
@@ -336,7 +336,7 @@ winAllocateFBShadowGDI(ScreenPtr pScreen)
pScreenPriv->hbmpShadow = CreateDIBSection(pScreenPriv->hdcScreen,
(BITMAPINFO *) pScreenPriv->
pbmih, DIB_RGB_COLORS,
- (VOID **) & pScreenInfo->pfb,
+ (VOID **) &pScreenInfo->pfb,
NULL, 0);
if (pScreenPriv->hbmpShadow == NULL || pScreenInfo->pfb == NULL) {
winW32Error ("winAllocateFBShadowGDI - CreateDIBSection failed:");
diff --git a/xorg-server/hw/xwin/winwin32rootless.c b/xorg-server/hw/xwin/winwin32rootless.c
index 55039bccd..b0de5697d 100644..100755
--- a/xorg-server/hw/xwin/winwin32rootless.c
+++ b/xorg-server/hw/xwin/winwin32rootless.c
@@ -559,7 +559,7 @@ winMWExtWMReshapeFrame(RootlessFrameID wid, RegionPtr pShape)
/* Create region for non-client area */
GetWindowRect(pRLWinPriv->hWnd, &rcWindow);
GetClientRect(pRLWinPriv->hWnd, &rcClient);
- MapWindowPoints(pRLWinPriv->hWnd, HWND_DESKTOP, (LPPOINT) & rcClient, 2);
+ MapWindowPoints(pRLWinPriv->hWnd, HWND_DESKTOP, (LPPOINT) &rcClient, 2);
OffsetRgn(hRgn, rcClient.left - rcWindow.left, rcClient.top - rcWindow.top);
OffsetRect(&rcClient, -rcWindow.left, -rcWindow.top);
OffsetRect(&rcWindow, -rcWindow.left, -rcWindow.top);
@@ -645,7 +645,7 @@ winMWExtWMStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow)
hbmpNew = CreateDIBSection(pRLWinPriv->hdcScreen,
(BITMAPINFO *) pRLWinPriv->pbmihShadow,
DIB_RGB_COLORS,
- (VOID **) & pRLWinPriv->pfb, NULL, 0);
+ (VOID **) &pRLWinPriv->pfb, NULL, 0);
if (hbmpNew == NULL || pRLWinPriv->pfb == NULL) {
ErrorF("winMWExtWMStartDrawing - CreateDIBSection failed\n");
//return FALSE;
diff --git a/xorg-server/hw/xwin/winwin32rootlesswndproc.c b/xorg-server/hw/xwin/winwin32rootlesswndproc.c
index 46000efe4..13a9cd645 100644
--- a/xorg-server/hw/xwin/winwin32rootlesswndproc.c
+++ b/xorg-server/hw/xwin/winwin32rootlesswndproc.c
@@ -778,7 +778,7 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
NULL,
GetLastError(),
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- (LPTSTR) & lpMsgBuf, 0, NULL);
+ (LPTSTR) &lpMsgBuf, 0, NULL);
ErrorF("winMWExtWMWindowProc - BitBlt failed: %s\n",
(LPSTR) lpMsgBuf);
@@ -1052,7 +1052,7 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
if (!pRLWinPriv->fMovingOrSizing
/*&& (pWinPos->flags & SWP_SHOWWINDOW) */ ) {
GetClientRect(hwnd, &rcClient);
- MapWindowPoints(hwnd, HWND_DESKTOP, (LPPOINT) & rcClient, 2);
+ MapWindowPoints(hwnd, HWND_DESKTOP, (LPPOINT) &rcClient, 2);
if (!(pWinPos->flags & SWP_NOMOVE)
&& !(pWinPos->flags & SWP_NOSIZE)) {
@@ -1252,7 +1252,7 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
GetClientRect(hwnd, &rcClient);
- MapWindowPoints(hwnd, HWND_DESKTOP, (LPPOINT) & rcClient, 2);
+ MapWindowPoints(hwnd, HWND_DESKTOP, (LPPOINT) &rcClient, 2);
#ifdef XWIN_MULTIWINDOWINTWM
if (winIsInternalWMRunning(pScreenInfo))