Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 390 insertions, 414 deletions

diff --git a/xorg-server/hw/xwin/winwindowswm.c b/xorg-server/hw/xwin/winwindowswm.c
index 05879eb9d..a14caf7a9 100644
--- a/xorg-server/hw/xwin/winwindowswm.c
+++ b/xorg-server/hw/xwin/winwindowswm.c
@@ -47,207 +47,193 @@ static int WMErrorBase;
 static unsigned char WMReqCode = 0;
 static int WMEventBase = 0;
 
-static RESTYPE ClientType, eventResourceType; /* resource types for event masks */
+static RESTYPE ClientType, eventResourceType;   /* resource types for event masks */
 static XID eventResource;
 
 /* Currently selected events */
 static unsigned int eventMask = 0;
 
-static int WMFreeClient (pointer data, XID id);
-static int WMFreeEvents (pointer data, XID id);
-static void SNotifyEvent(xWindowsWMNotifyEvent *from, xWindowsWMNotifyEvent *to);
+static int WMFreeClient(pointer data, XID id);
+static int WMFreeEvents(pointer data, XID id);
+static void SNotifyEvent(xWindowsWMNotifyEvent * from,
+                         xWindowsWMNotifyEvent * to);
 
 typedef struct _WMEvent *WMEventPtr;
 typedef struct _WMEvent {
-  WMEventPtr      next;
-  ClientPtr	    client;
-  XID		    clientResource;
-  unsigned int    mask;
+    WMEventPtr next;
+    ClientPtr client;
+    XID clientResource;
+    unsigned int mask;
 } WMEventRec;
 
 static inline BoxRec
-make_box (int x, int y, int w, int h)
+make_box(int x, int y, int w, int h)
 {
-  BoxRec r;
-  r.x1 = x;
-  r.y1 = y;
-  r.x2 = x + w;
-  r.y2 = y + h;
-  return r;
+    BoxRec r;
+
+    r.x1 = x;
+    r.y1 = y;
+    r.x2 = x + w;
+    r.y2 = y + h;
+    return r;
 }
 
 static int
 ProcWindowsWMQueryVersion(ClientPtr client)
 {
-  xWindowsWMQueryVersionReply rep;
-  int n;
-
-  REQUEST_SIZE_MATCH(xWindowsWMQueryVersionReq);
-  rep.type = X_Reply;
-  rep.length = 0;
-  rep.sequenceNumber = client->sequence;
-  rep.majorVersion = SERVER_WINDOWSWM_MAJOR_VERSION;
-  rep.minorVersion = SERVER_WINDOWSWM_MINOR_VERSION;
-  rep.patchVersion = SERVER_WINDOWSWM_PATCH_VERSION;
-  if (client->swapped)
-    {
-      swaps(&rep.sequenceNumber);
-      swapl(&rep.length);
+    xWindowsWMQueryVersionReply rep;
+    int n;
+
+    REQUEST_SIZE_MATCH(xWindowsWMQueryVersionReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.majorVersion = SERVER_WINDOWSWM_MAJOR_VERSION;
+    rep.minorVersion = SERVER_WINDOWSWM_MINOR_VERSION;
+    rep.patchVersion = SERVER_WINDOWSWM_PATCH_VERSION;
+    if (client->swapped) {
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
     }
-  WriteToClient(client, sizeof(xWindowsWMQueryVersionReply), (char *)&rep);
-  return Success;
+    WriteToClient(client, sizeof(xWindowsWMQueryVersionReply), (char *) &rep);
+    return Success;
 }
 
-
 /* events */
 
 static inline void
-updateEventMask (WMEventPtr *pHead)
+updateEventMask(WMEventPtr * pHead)
 {
-  WMEventPtr pCur;
+    WMEventPtr pCur;
 
-  eventMask = 0;
-  for (pCur = *pHead; pCur != NULL; pCur = pCur->next)
-    eventMask |= pCur->mask;
+    eventMask = 0;
+    for (pCur = *pHead; pCur != NULL; pCur = pCur->next)
+        eventMask |= pCur->mask;
 }
 
-/*ARGSUSED*/
-static int
-WMFreeClient (pointer data, XID id)
+ /*ARGSUSED*/ static int
+WMFreeClient(pointer data, XID id)
 {
-  WMEventPtr   pEvent;
-  WMEventPtr   *pHead, pCur, pPrev;
-
-  pEvent = (WMEventPtr) data;
-  dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType,
-				NullClient, DixUnknownAccess);
-  if (pHead)
-    {
-      pPrev = 0;
-      for (pCur = *pHead; pCur && pCur != pEvent; pCur=pCur->next)
-	pPrev = pCur;
-      if (pCur)
-	{
-	  if (pPrev)
-	    pPrev->next = pEvent->next;
-	  else
-	    *pHead = pEvent->next;
-	}
-      updateEventMask (pHead);
+    WMEventPtr pEvent;
+    WMEventPtr *pHead, pCur, pPrev;
+
+    pEvent = (WMEventPtr) data;
+    dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType,
+                            NullClient, DixUnknownAccess);
+    if (pHead) {
+        pPrev = 0;
+        for (pCur = *pHead; pCur && pCur != pEvent; pCur = pCur->next)
+            pPrev = pCur;
+        if (pCur) {
+            if (pPrev)
+                pPrev->next = pEvent->next;
+            else
+                *pHead = pEvent->next;
+        }
+        updateEventMask(pHead);
     }
-  free((pointer) pEvent);
-  return 1;
+    free((pointer) pEvent);
+    return 1;
 }
 
-/*ARGSUSED*/
-static int
-WMFreeEvents (pointer data, XID id)
+ /*ARGSUSED*/ static int
+WMFreeEvents(pointer data, XID id)
 {
-  WMEventPtr   *pHead, pCur, pNext;
-  
-  pHead = (WMEventPtr *) data;
-  for (pCur = *pHead; pCur; pCur = pNext)
-    {
-      pNext = pCur->next;
-      FreeResource (pCur->clientResource, ClientType);
-      free((pointer) pCur);
+    WMEventPtr *pHead, pCur, pNext;
+
+    pHead = (WMEventPtr *) data;
+    for (pCur = *pHead; pCur; pCur = pNext) {
+        pNext = pCur->next;
+        FreeResource(pCur->clientResource, ClientType);
+        free((pointer) pCur);
     }
-  free((pointer) pHead);
-  eventMask = 0;
-  return 1;
+    free((pointer) pHead);
+    eventMask = 0;
+    return 1;
 }
 
 static int
-ProcWindowsWMSelectInput (ClientPtr client)
+ProcWindowsWMSelectInput(ClientPtr client)
 {
-  REQUEST(xWindowsWMSelectInputReq);
-  WMEventPtr		pEvent, pNewEvent, *pHead;
-  XID			clientResource;
-
-  REQUEST_SIZE_MATCH (xWindowsWMSelectInputReq);
-  dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType, client, DixWriteAccess);
-  if (stuff->mask != 0)
-    {
-      if (pHead)
-	{
-	  /* check for existing entry. */
-	  for (pEvent = *pHead; pEvent; pEvent = pEvent->next)
-	    {
-	      if (pEvent->client == client)
-		{
-		  pEvent->mask = stuff->mask;
-		  updateEventMask (pHead);
-		  return Success;
-		}
-	    }
-	}
-      
-      /* build the entry */
-      pNewEvent = (WMEventPtr) malloc(sizeof (WMEventRec));
-      if (!pNewEvent)
-	return BadAlloc;
-      pNewEvent->next = 0;
-      pNewEvent->client = client;
-      pNewEvent->mask = stuff->mask;
-      /*
-       * add a resource that will be deleted when
-       * the client goes away
-       */
-      clientResource = FakeClientID (client->index);
-      pNewEvent->clientResource = clientResource;
-      if (!AddResource (clientResource, ClientType, (pointer)pNewEvent))
-	return BadAlloc;
-      /*
-       * create a resource to contain a pointer to the list
-       * of clients selecting input.  This must be indirect as
-       * the list may be arbitrarily rearranged which cannot be
-       * done through the resource database.
-       */
-      if (!pHead)
-	{
-	  pHead = (WMEventPtr *) malloc(sizeof (WMEventPtr));
-	  if (!pHead ||
-	      !AddResource (eventResource, eventResourceType, (pointer)pHead))
-	    {
-	      FreeResource (clientResource, RT_NONE);
-	      return BadAlloc;
-	    }
-	  *pHead = 0;
-	}
-      pNewEvent->next = *pHead;
-      *pHead = pNewEvent;
-      updateEventMask (pHead);
+    REQUEST(xWindowsWMSelectInputReq);
+    WMEventPtr pEvent, pNewEvent, *pHead;
+    XID clientResource;
+
+    REQUEST_SIZE_MATCH(xWindowsWMSelectInputReq);
+    dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType,
+                            client, DixWriteAccess);
+    if (stuff->mask != 0) {
+        if (pHead) {
+            /* check for existing entry. */
+            for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
+                if (pEvent->client == client) {
+                    pEvent->mask = stuff->mask;
+                    updateEventMask(pHead);
+                    return Success;
+                }
+            }
+        }
+
+        /* build the entry */
+        pNewEvent = (WMEventPtr) malloc(sizeof(WMEventRec));
+        if (!pNewEvent)
+            return BadAlloc;
+        pNewEvent->next = 0;
+        pNewEvent->client = client;
+        pNewEvent->mask = stuff->mask;
+        /*
+         * add a resource that will be deleted when
+         * the client goes away
+         */
+        clientResource = FakeClientID(client->index);
+        pNewEvent->clientResource = clientResource;
+        if (!AddResource(clientResource, ClientType, (pointer) pNewEvent))
+            return BadAlloc;
+        /*
+         * create a resource to contain a pointer to the list
+         * of clients selecting input.  This must be indirect as
+         * the list may be arbitrarily rearranged which cannot be
+         * done through the resource database.
+         */
+        if (!pHead) {
+            pHead = (WMEventPtr *) malloc(sizeof(WMEventPtr));
+            if (!pHead ||
+                !AddResource(eventResource, eventResourceType, (pointer) pHead))
+            {
+                FreeResource(clientResource, RT_NONE);
+                return BadAlloc;
+            }
+            *pHead = 0;
+        }
+        pNewEvent->next = *pHead;
+        *pHead = pNewEvent;
+        updateEventMask(pHead);
     }
-  else if (stuff->mask == 0)
-    {
-      /* delete the interest */
-      if (pHead)
-	{
-	  pNewEvent = 0;
-	  for (pEvent = *pHead; pEvent; pEvent = pEvent->next)
-	    {
-	      if (pEvent->client == client)
-		break;
-	      pNewEvent = pEvent;
-	    }
-	  if (pEvent)
-	    {
-	      FreeResource (pEvent->clientResource, ClientType);
-	      if (pNewEvent)
-		pNewEvent->next = pEvent->next;
-	      else
-		*pHead = pEvent->next;
-	      free(pEvent);
-	      updateEventMask (pHead);
-	    }
-	}
+    else if (stuff->mask == 0) {
+        /* delete the interest */
+        if (pHead) {
+            pNewEvent = 0;
+            for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
+                if (pEvent->client == client)
+                    break;
+                pNewEvent = pEvent;
+            }
+            if (pEvent) {
+                FreeResource(pEvent->clientResource, ClientType);
+                if (pNewEvent)
+                    pNewEvent->next = pEvent->next;
+                else
+                    *pHead = pEvent->next;
+                free(pEvent);
+                updateEventMask(pHead);
+            }
+        }
     }
-  else
-    {
-      client->errorValue = stuff->mask;
-      return BadValue;
+    else {
+        client->errorValue = stuff->mask;
+        return BadValue;
     }
-  return Success;
+    return Success;
 }
 
 /*
@@ -255,360 +241,350 @@ ProcWindowsWMSelectInput (ClientPtr client)
  */
 
 void
-winWindowsWMSendEvent (int type, unsigned int mask, int which, int arg,
-		       Window window, int x, int y, int w, int h)
+winWindowsWMSendEvent(int type, unsigned int mask, int which, int arg,
+                      Window window, int x, int y, int w, int h)
 {
-  WMEventPtr		*pHead, pEvent;
-  ClientPtr		client;
-  xWindowsWMNotifyEvent se;
-  winDebug ("winWindowsWMSendEvent %d %d %d %d,  %d %d - %d %d\n",
-	  type, mask, which, arg, x, y, w, h);
-  dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType,
-				NullClient, DixUnknownAccess);
-  if (!pHead)
-    return;
-  for (pEvent = *pHead; pEvent; pEvent = pEvent->next)
-    {
-      client = pEvent->client;
-      winDebug ("winWindowsWMSendEvent - x%08x\n", (int) client);
-      if ((pEvent->mask & mask) == 0)
-	{
-	  continue;
-	}
-      winDebug ("winWindowsWMSendEvent - send\n");
-
-      se.type = type + WMEventBase;
-      se.kind = which;
-      se.window = window;
-      se.arg = arg;
-      se.x = x;
-      se.y = y;
-      se.w = w;
-      se.h = h;
-      se.time = currentTime.milliseconds;
-      WriteEventsToClient (client, 1, (xEvent *) &se);
+    WMEventPtr *pHead, pEvent;
+    ClientPtr client;
+    xWindowsWMNotifyEvent se;
+    winDebug ("winWindowsWMSendEvent %d %d %d %d,  %d %d - %d %d\n",
+              type, mask, which, arg, x, y, w, h);
+    dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType,
+                            NullClient, DixUnknownAccess);
+    if (!pHead)
+        return;
+    for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
+        client = pEvent->client;
+        winDebug ("winWindowsWMSendEvent - x%08x\n", (int) client);
+        if ((pEvent->mask & mask) == 0) {
+            continue;
+        }
+        winDebug ("winWindowsWMSendEvent - send\n");
+
+        se.type = type + WMEventBase;
+        se.kind = which;
+        se.window = window;
+        se.arg = arg;
+        se.x = x;
+        se.y = y;
+        se.w = w;
+        se.h = h;
+        se.time = currentTime.milliseconds;
+        WriteEventsToClient(client, 1, (xEvent *) &se);
     }
 }
 
 /* general utility functions */
 
 static int
-ProcWindowsWMDisableUpdate (ClientPtr client)
+ProcWindowsWMDisableUpdate(ClientPtr client)
 {
-  REQUEST_SIZE_MATCH(xWindowsWMDisableUpdateReq);
+    REQUEST_SIZE_MATCH(xWindowsWMDisableUpdateReq);
 
-  //winDisableUpdate();
+    //winDisableUpdate();
 
-  return Success;
+    return Success;
 }
 
 static int
-ProcWindowsWMReenableUpdate (ClientPtr client)
+ProcWindowsWMReenableUpdate(ClientPtr client)
 {
-  REQUEST_SIZE_MATCH(xWindowsWMReenableUpdateReq);
+    REQUEST_SIZE_MATCH(xWindowsWMReenableUpdateReq);
 
-  //winEnableUpdate(); 
+    //winEnableUpdate(); 
 
-  return Success;
+    return Success;
 }
 
-
 /* window functions */
 
 static int
-ProcWindowsWMSetFrontProcess (ClientPtr client)
+ProcWindowsWMSetFrontProcess(ClientPtr client)
 {
-  REQUEST_SIZE_MATCH(xWindowsWMSetFrontProcessReq);
-  
-  //QuartzMessageMainThread(kWindowsSetFrontProcess, NULL, 0);
-  
-  return Success;
-}
+    REQUEST_SIZE_MATCH(xWindowsWMSetFrontProcessReq);
+
+    //QuartzMessageMainThread(kWindowsSetFrontProcess, NULL, 0);
 
+    return Success;
+}
 
 /* frame functions */
 
 static int
-ProcWindowsWMFrameGetRect (ClientPtr client)
+ProcWindowsWMFrameGetRect(ClientPtr client)
 {
-  xWindowsWMFrameGetRectReply rep;
-  BoxRec ir;
-  RECT rcNew;
-  REQUEST(xWindowsWMFrameGetRectReq);
+    xWindowsWMFrameGetRectReply rep;
+    BoxRec ir;
+    RECT rcNew;
+
+    REQUEST(xWindowsWMFrameGetRectReq);
 
   winDebug ("ProcWindowsWMFrameGetRect %d %d\n",
-	  (sizeof(xWindowsWMFrameGetRectReq) >> 2), (int) client->req_len);
-  
-  REQUEST_SIZE_MATCH(xWindowsWMFrameGetRectReq);
-  rep.type = X_Reply;
-  rep.length = 0;
-  rep.sequenceNumber = client->sequence;
-
-  ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);
-
-  if (stuff->frame_rect != 0)
-    {
-      ErrorF ("ProcWindowsWMFrameGetRect - stuff->frame_rect != 0\n");
-      return BadValue;
+            (sizeof(xWindowsWMFrameGetRectReq) >> 2), (int) client->req_len);
+
+    REQUEST_SIZE_MATCH(xWindowsWMFrameGetRectReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    ir = make_box(stuff->ix, stuff->iy, stuff->iw, stuff->ih);
+
+    if (stuff->frame_rect != 0) {
+        ErrorF("ProcWindowsWMFrameGetRect - stuff->frame_rect != 0\n");
+        return BadValue;
     }
 
-  /* Store the origin, height, and width in a rectangle structure */
-  SetRect (&rcNew, stuff->ix, stuff->iy,
-	   stuff->ix + stuff->iw, stuff->iy + stuff->ih);
-    
-  winDebug ("ProcWindowsWMFrameGetRect - %d %d %d %d\n",
-	  stuff->ix, stuff->iy, stuff->ix + stuff->iw, stuff->iy + stuff->ih);
-
-  /*
-   * Calculate the required size of the Windows window rectangle,
-   * given the size of the Windows window client area.
-   */
-  AdjustWindowRectEx (&rcNew, stuff->frame_style, FALSE, stuff->frame_style_ex);
-  rep.x = rcNew.left;
-  rep.y = rcNew.top;
-  rep.w = rcNew.right - rcNew.left;
-  rep.h = rcNew.bottom - rcNew.top;
-  winDebug ("ProcWindowsWMFrameGetRect - %d %d %d %d\n",
-	  rep.x, rep.y, rep.w, rep.h);
-
-  WriteToClient(client, sizeof(xWindowsWMFrameGetRectReply), (char *)&rep);
-  return Success;
+    /* Store the origin, height, and width in a rectangle structure */
+    SetRect(&rcNew, stuff->ix, stuff->iy,
+            stuff->ix + stuff->iw, stuff->iy + stuff->ih);
+
+    winDebug ("ProcWindowsWMFrameGetRect - %d %d %d %d\n",
+              stuff->ix, stuff->iy, stuff->ix + stuff->iw, stuff->iy + stuff->ih);
+
+    /*
+     * Calculate the required size of the Windows window rectangle,
+     * given the size of the Windows window client area.
+     */
+    AdjustWindowRectEx(&rcNew, stuff->frame_style, FALSE,
+                       stuff->frame_style_ex);
+    rep.x = rcNew.left;
+    rep.y = rcNew.top;
+    rep.w = rcNew.right - rcNew.left;
+    rep.h = rcNew.bottom - rcNew.top;
+    winDebug ("ProcWindowsWMFrameGetRect - %d %d %d %d\n",
+           rep.x, rep.y, rep.w, rep.h);
+
+    WriteToClient(client, sizeof(xWindowsWMFrameGetRectReply), (char *) &rep);
+    return Success;
 }
 
-
 static int
-ProcWindowsWMFrameDraw (ClientPtr client)
+ProcWindowsWMFrameDraw(ClientPtr client)
 {
-  REQUEST(xWindowsWMFrameDrawReq);
-  WindowPtr pWin;
-  win32RootlessWindowPtr pRLWinPriv;
-  RECT rcNew;
-  int nCmdShow, rc;
-  RegionRec newShape;
-
-  REQUEST_SIZE_MATCH (xWindowsWMFrameDrawReq);
-
-  winDebug ("ProcWindowsWMFrameDraw\n");
-
-  rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
-  if (rc != Success)
-      return rc;
-
-  winDebug ("ProcWindowsWMFrameDraw - Window found\n");
-
-  pRLWinPriv = (win32RootlessWindowPtr) RootlessFrameForWindow (pWin, TRUE);
-  if (pRLWinPriv == 0) return BadWindow;
-
-  winDebug ("ProcWindowsWMFrameDraw - HWND 0x%08x 0x%08x 0x%08x\n",
-	  (int) pRLWinPriv->hWnd, (int) stuff->frame_style,
-	  (int) stuff->frame_style_ex);
-  winDebug ("ProcWindowsWMFrameDraw - %d %d %d %d\n",
-	  stuff->ix, stuff->iy, stuff->iw, stuff->ih);
-
-  /* Store the origin, height, and width in a rectangle structure */
-  SetRect (&rcNew, stuff->ix, stuff->iy,
-	   stuff->ix + stuff->iw, stuff->iy + stuff->ih);
-
-  /*
-   * Calculate the required size of the Windows window rectangle,
-   * given the size of the Windows window client area.
-   */
-  AdjustWindowRectEx (&rcNew, stuff->frame_style, FALSE, stuff->frame_style_ex);
-  
-  /* Set the window extended style flags */
-  if (!SetWindowLongPtr (pRLWinPriv->hWnd, GWL_EXSTYLE, stuff->frame_style_ex))
-    {
-      return BadValue;
+    REQUEST(xWindowsWMFrameDrawReq);
+    WindowPtr pWin;
+    win32RootlessWindowPtr pRLWinPriv;
+    RECT rcNew;
+    int nCmdShow, rc;
+    RegionRec newShape;
+
+    REQUEST_SIZE_MATCH(xWindowsWMFrameDrawReq);
+
+    winDebug ("ProcWindowsWMFrameDraw\n");
+
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
+    if (rc != Success)
+        return rc;
+
+    winDebug ("ProcWindowsWMFrameDraw - Window found\n");
+
+    pRLWinPriv = (win32RootlessWindowPtr) RootlessFrameForWindow(pWin, TRUE);
+    if (pRLWinPriv == 0)
+        return BadWindow;
+
+    winDebug ("ProcWindowsWMFrameDraw - HWND 0x%08x 0x%08x 0x%08x\n",
+              (int) pRLWinPriv->hWnd, (int) stuff->frame_style,
+              (int) stuff->frame_style_ex);
+    winDebug ("ProcWindowsWMFrameDraw - %d %d %d %d\n",
+              stuff->ix, stuff->iy, stuff->iw, stuff->ih);
+
+    /* Store the origin, height, and width in a rectangle structure */
+    SetRect(&rcNew, stuff->ix, stuff->iy,
+            stuff->ix + stuff->iw, stuff->iy + stuff->ih);
+
+    /*
+     * Calculate the required size of the Windows window rectangle,
+     * given the size of the Windows window client area.
+     */
+    AdjustWindowRectEx(&rcNew, stuff->frame_style, FALSE,
+                       stuff->frame_style_ex);
+
+    /* Set the window extended style flags */
+    if (!SetWindowLongPtr(pRLWinPriv->hWnd, GWL_EXSTYLE, stuff->frame_style_ex)) {
+        return BadValue;
     }
 
-  /* Set the window standard style flags */
-  if (!SetWindowLongPtr (pRLWinPriv->hWnd, GWL_STYLE, stuff->frame_style))
-    {
-      return BadValue;
+    /* Set the window standard style flags */
+    if (!SetWindowLongPtr(pRLWinPriv->hWnd, GWL_STYLE, stuff->frame_style)) {
+        return BadValue;
     }
 
-  /* Flush the window style */
-  if (!SetWindowPos (pRLWinPriv->hWnd, NULL,
-		     rcNew.left, rcNew.top,
-		     rcNew.right - rcNew.left, rcNew.bottom - rcNew.top,
-		     SWP_NOZORDER | SWP_FRAMECHANGED | SWP_NOACTIVATE))
-    {
-      return BadValue;
+    /* Flush the window style */
+    if (!SetWindowPos(pRLWinPriv->hWnd, NULL,
+                      rcNew.left, rcNew.top,
+                      rcNew.right - rcNew.left, rcNew.bottom - rcNew.top,
+                      SWP_NOZORDER | SWP_FRAMECHANGED | SWP_NOACTIVATE)) {
+        return BadValue;
     }
-  if (!IsWindowVisible(pRLWinPriv->hWnd))
-    nCmdShow = SW_HIDE;
-  else 
-    nCmdShow = SW_SHOWNA;
-
-  ShowWindow (pRLWinPriv->hWnd, nCmdShow);
-
-  winMWExtWMUpdateIcon (pWin->drawable.id);
-
-  if (wBoundingShape(pWin) != NULL)
-    {
-      /* wBoundingShape is relative to *inner* origin of window.
-	 Translate by borderWidth to get the outside-relative position. */
-      
-      RegionNull(&newShape);
-      RegionCopy(&newShape, wBoundingShape(pWin));
-      RegionTranslate(&newShape, pWin->borderWidth, pWin->borderWidth);
-      winMWExtWMReshapeFrame (pRLWinPriv, &newShape);
-      RegionUninit(&newShape);
+    if (!IsWindowVisible(pRLWinPriv->hWnd))
+        nCmdShow = SW_HIDE;
+    else
+        nCmdShow = SW_SHOWNA;
+
+    ShowWindow(pRLWinPriv->hWnd, nCmdShow);
+
+    winMWExtWMUpdateIcon(pWin->drawable.id);
+
+    if (wBoundingShape(pWin) != NULL) {
+        /* wBoundingShape is relative to *inner* origin of window.
+           Translate by borderWidth to get the outside-relative position. */
+
+        RegionNull(&newShape);
+        RegionCopy(&newShape, wBoundingShape(pWin));
+        RegionTranslate(&newShape, pWin->borderWidth, pWin->borderWidth);
+        winMWExtWMReshapeFrame(pRLWinPriv, &newShape);
+        RegionUninit(&newShape);
     }
-  winDebug ("ProcWindowsWMFrameDraw - done\n");
+    winDebug ("ProcWindowsWMFrameDraw - done\n");
 
-  return Success;
+    return Success;
 }
 
 static int
 ProcWindowsWMFrameSetTitle(ClientPtr client)
 {
-  unsigned int title_length, title_max;
-  char *title_bytes;
-  REQUEST(xWindowsWMFrameSetTitleReq);
-  WindowPtr pWin;
-  win32RootlessWindowPtr pRLWinPriv;
-  int rc;
+    unsigned int title_length, title_max;
+    char *title_bytes;
+
+    REQUEST(xWindowsWMFrameSetTitleReq);
+    WindowPtr pWin;
+    win32RootlessWindowPtr pRLWinPriv;
+    int rc;
 
-  winDebug ("ProcWindowsWMFrameSetTitle\n");
+    winDebug ("ProcWindowsWMFrameSetTitle\n");
 
-  REQUEST_AT_LEAST_SIZE(xWindowsWMFrameSetTitleReq);
+    REQUEST_AT_LEAST_SIZE(xWindowsWMFrameSetTitleReq);
 
-  rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
-  if (rc != Success)
-      return rc;
-  winDebug ("ProcWindowsWMFrameSetTitle - Window found\n");
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
+    if (rc != Success)
+        return rc;
+    winDebug ("ProcWindowsWMFrameSetTitle - Window found\n");
 
-  title_length = stuff->title_length;
-  title_max = (stuff->length << 2) - sizeof(xWindowsWMFrameSetTitleReq);
+    title_length = stuff->title_length;
+    title_max = (stuff->length << 2) - sizeof(xWindowsWMFrameSetTitleReq);
 
-  if (title_max < title_length)
-    return BadValue;
+    if (title_max < title_length)
+        return BadValue;
 
-  winDebug ("ProcWindowsWMFrameSetTitle - length is valid\n");
+    winDebug ("ProcWindowsWMFrameSetTitle - length is valid\n");
 
-  title_bytes = malloc (title_length+1);
-  strncpy (title_bytes, (unsigned char *) &stuff[1], title_length);
-  title_bytes[title_length] = '\0';
+    title_bytes = malloc(title_length + 1);
+    strncpy(title_bytes, (unsigned char *) &stuff[1], title_length);
+    title_bytes[title_length] = '\0';
 
-  pRLWinPriv = (win32RootlessWindowPtr) RootlessFrameForWindow (pWin, FALSE);
+    pRLWinPriv = (win32RootlessWindowPtr) RootlessFrameForWindow(pWin, FALSE);
 
-  if (pRLWinPriv == 0)
-    {
-      free (title_bytes);
-      return BadWindow;
+    if (pRLWinPriv == 0) {
+        free(title_bytes);
+        return BadWindow;
     }
-    
-  /* Flush the window style */
-  SetWindowText (pRLWinPriv->hWnd, title_bytes);
 
-  free (title_bytes);
+    /* Flush the window style */
+    SetWindowText(pRLWinPriv->hWnd, title_bytes);
 
-  winDebug ("ProcWindowsWMFrameSetTitle - done\n");
+    free(title_bytes);
 
-  return Success;
-}
+    winDebug ("ProcWindowsWMFrameSetTitle - done\n");
 
+    return Success;
+}
 
 /* dispatch */
 
 static int
-ProcWindowsWMDispatch (ClientPtr client)
+ProcWindowsWMDispatch(ClientPtr client)
 {
-  REQUEST(xReq);
+    REQUEST(xReq);
 
-  switch (stuff->data)
-    {
+    switch (stuff->data) {
     case X_WindowsWMQueryVersion:
-      return ProcWindowsWMQueryVersion(client);
+        return ProcWindowsWMQueryVersion(client);
     }
 
-  if (!LocalClient(client))
-    return WMErrorBase + WindowsWMClientNotLocal;
+    if (!LocalClient(client))
+        return WMErrorBase + WindowsWMClientNotLocal;
 
-  switch (stuff->data)
-    {
+    switch (stuff->data) {
     case X_WindowsWMSelectInput:
-      return ProcWindowsWMSelectInput(client);
+        return ProcWindowsWMSelectInput(client);
     case X_WindowsWMDisableUpdate:
-      return ProcWindowsWMDisableUpdate(client);
+        return ProcWindowsWMDisableUpdate(client);
     case X_WindowsWMReenableUpdate:
-      return ProcWindowsWMReenableUpdate(client);
+        return ProcWindowsWMReenableUpdate(client);
     case X_WindowsWMSetFrontProcess:
-      return ProcWindowsWMSetFrontProcess(client);
+        return ProcWindowsWMSetFrontProcess(client);
     case X_WindowsWMFrameGetRect:
-      return ProcWindowsWMFrameGetRect(client);
+        return ProcWindowsWMFrameGetRect(client);
     case X_WindowsWMFrameDraw:
-      return ProcWindowsWMFrameDraw(client);
+        return ProcWindowsWMFrameDraw(client);
     case X_WindowsWMFrameSetTitle:
-      return ProcWindowsWMFrameSetTitle(client);
+        return ProcWindowsWMFrameSetTitle(client);
     default:
-      return BadRequest;
+        return BadRequest;
     }
 }
 
 static void
-SNotifyEvent (xWindowsWMNotifyEvent *from, xWindowsWMNotifyEvent *to)
+SNotifyEvent(xWindowsWMNotifyEvent * from, xWindowsWMNotifyEvent * to)
 {
-  to->type = from->type;
-  to->kind = from->kind;
-  cpswaps (from->sequenceNumber, to->sequenceNumber);
-  cpswapl (from->window, to->window);
-  cpswapl (from->time, to->time);
-  cpswapl (from->arg, to->arg);
+    to->type = from->type;
+    to->kind = from->kind;
+    cpswaps(from->sequenceNumber, to->sequenceNumber);
+    cpswapl(from->window, to->window);
+    cpswapl(from->time, to->time);
+    cpswapl(from->arg, to->arg);
 }
 
 static int
-SProcWindowsWMQueryVersion (ClientPtr client)
+SProcWindowsWMQueryVersion(ClientPtr client)
 {
-  int n;
-  REQUEST(xWindowsWMQueryVersionReq);
-  swaps(&stuff->length);
-  return ProcWindowsWMQueryVersion(client);
+    int n;
+
+    REQUEST(xWindowsWMQueryVersionReq);
+    swaps(&stuff->length);
+    return ProcWindowsWMQueryVersion(client);
 }
 
 static int
-SProcWindowsWMDispatch (ClientPtr client)
+SProcWindowsWMDispatch(ClientPtr client)
 {
-  REQUEST(xReq);
+    REQUEST(xReq);
 
-  /* It is bound to be non-local when there is byte swapping */
-  if (!LocalClient(client))
-    return WMErrorBase + WindowsWMClientNotLocal;
+    /* It is bound to be non-local when there is byte swapping */
+    if (!LocalClient(client))
+        return WMErrorBase + WindowsWMClientNotLocal;
 
-  /* only local clients are allowed WM access */
-  switch (stuff->data)
-    {
+    /* only local clients are allowed WM access */
+    switch (stuff->data) {
     case X_WindowsWMQueryVersion:
-      return SProcWindowsWMQueryVersion(client);
+        return SProcWindowsWMQueryVersion(client);
     default:
-      return BadRequest;
+        return BadRequest;
     }
 }
 
 void
-winWindowsWMExtensionInit (void)
+winWindowsWMExtensionInit(void)
 {
-  ExtensionEntry* extEntry;
-
-  ClientType = CreateNewResourceType(WMFreeClient, "WMClient");
-  eventResourceType = CreateNewResourceType(WMFreeEvents, "WMEvent");
-  eventResource = FakeClientID(0);
-
-  if (ClientType && eventResourceType &&
-      (extEntry = AddExtension(WINDOWSWMNAME,
-			       WindowsWMNumberEvents,
-			       WindowsWMNumberErrors,
-			       ProcWindowsWMDispatch,
-			       SProcWindowsWMDispatch,
-			       NULL,
-			       StandardMinorOpcode)))
-    {
-      size_t i;
-      WMReqCode = (unsigned char)extEntry->base;
-      WMErrorBase = extEntry->errorBase;
-      WMEventBase = extEntry->eventBase;
-      for (i=0; i < WindowsWMNumberEvents; i++)
-        EventSwapVector[WMEventBase + i] = (EventSwapPtr) SNotifyEvent;
+    ExtensionEntry *extEntry;
+
+    ClientType = CreateNewResourceType(WMFreeClient, "WMClient");
+    eventResourceType = CreateNewResourceType(WMFreeEvents, "WMEvent");
+    eventResource = FakeClientID(0);
+
+    if (ClientType && eventResourceType &&
+        (extEntry = AddExtension(WINDOWSWMNAME,
+                                 WindowsWMNumberEvents,
+                                 WindowsWMNumberErrors,
+                                 ProcWindowsWMDispatch,
+                                 SProcWindowsWMDispatch,
+                                 NULL, StandardMinorOpcode))) {
+        size_t i;
+
+        WMReqCode = (unsigned char) extEntry->base;
+        WMErrorBase = extEntry->errorBase;
+        WMEventBase = extEntry->eventBase;
+        for (i = 0; i < WindowsWMNumberEvents; i++)
+            EventSwapVector[WMEventBase + i] = (EventSwapPtr) SNotifyEvent;
     }
 }