From 1c94119ae26b94a60bb2c2b33494ed43c3b8a52f Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 16 May 2010 20:50:58 +0000
Subject: svn merge -r588:HEAD ^/branches/released .

---
 xorg-server/hw/xwin/winwindowswm.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'xorg-server/hw/xwin/winwindowswm.c')

diff --git a/xorg-server/hw/xwin/winwindowswm.c b/xorg-server/hw/xwin/winwindowswm.c
index d0c6de9bc..e16f6cfaf 100644
--- a/xorg-server/hw/xwin/winwindowswm.c
+++ b/xorg-server/hw/xwin/winwindowswm.c
@@ -124,7 +124,7 @@ ProcWindowsWMQueryVersion(register ClientPtr client)
       swapl(&rep.length, n);
     }
   WriteToClient(client, sizeof(xWindowsWMQueryVersionReply), (char *)&rep);
-  return (client->noClientException);
+  return Success;
 }
 
 
@@ -164,7 +164,7 @@ WMFreeClient (pointer data, XID id)
 	}
       updateEventMask (pHead);
     }
-  xfree ((pointer) pEvent);
+  free((pointer) pEvent);
   return 1;
 }
 
@@ -179,9 +179,9 @@ WMFreeEvents (pointer data, XID id)
     {
       pNext = pCur->next;
       FreeResource (pCur->clientResource, ClientType);
-      xfree ((pointer) pCur);
+      free((pointer) pCur);
     }
-  xfree ((pointer) pHead);
+  free((pointer) pHead);
   eventMask = 0;
   return 1;
 }
@@ -212,7 +212,7 @@ ProcWindowsWMSelectInput (register ClientPtr client)
 	}
       
       /* build the entry */
-      pNewEvent = (WMEventPtr) xalloc (sizeof (WMEventRec));
+      pNewEvent = (WMEventPtr) malloc(sizeof (WMEventRec));
       if (!pNewEvent)
 	return BadAlloc;
       pNewEvent->next = 0;
@@ -234,7 +234,7 @@ ProcWindowsWMSelectInput (register ClientPtr client)
        */
       if (!pHead)
 	{
-	  pHead = (WMEventPtr *) xalloc (sizeof (WMEventPtr));
+	  pHead = (WMEventPtr *) malloc(sizeof (WMEventPtr));
 	  if (!pHead ||
 	      !AddResource (eventResource, eventResourceType, (pointer)pHead))
 	    {
@@ -266,7 +266,7 @@ ProcWindowsWMSelectInput (register ClientPtr client)
 		pNewEvent->next = pEvent->next;
 	      else
 		*pHead = pEvent->next;
-	      xfree (pEvent);
+	      free(pEvent);
 	      updateEventMask (pHead);
 	    }
 	}
@@ -330,7 +330,7 @@ ProcWindowsWMDisableUpdate (register ClientPtr client)
 
   //winDisableUpdate();
 
-  return (client->noClientException);
+  return Success;
 }
 
 static int
@@ -340,7 +340,7 @@ ProcWindowsWMReenableUpdate (register ClientPtr client)
 
   //winEnableUpdate(); 
 
-  return (client->noClientException);
+  return Success;
 }
 
 
@@ -353,7 +353,7 @@ ProcWindowsWMSetFrontProcess (register ClientPtr client)
   
   //QuartzMessageMainThread(kWindowsSetFrontProcess, NULL, 0);
   
-  return (client->noClientException);
+  return Success;
 }
 
 
@@ -403,7 +403,7 @@ ProcWindowsWMFrameGetRect (register ClientPtr client)
 	  rep.x, rep.y, rep.w, rep.h);
 
   WriteToClient(client, sizeof(xWindowsWMFrameGetRectReply), (char *)&rep);
-  return (client->noClientException);
+  return Success;
 }
 
 
@@ -490,7 +490,7 @@ ProcWindowsWMFrameDraw (register ClientPtr client)
     }
   winDebug ("ProcWindowsWMFrameDraw - done\n");
 
-  return (client->noClientException);
+  return Success;
 }
 
 static int
@@ -541,7 +541,7 @@ ProcWindowsWMFrameSetTitle(
 
   winDebug ("ProcWindowsWMFrameSetTitle - done\n");
 
-  return (client->noClientException);
+  return Success;
 }
 
 
-- 
cgit v1.2.3