1 files changed, 18 insertions, 43 deletions

diff --git a/xorg-server/hw/xwin/winwindowswm.c b/xorg-server/hw/xwin/winwindowswm.c
index 577614db6..05879eb9d 100644
--- a/xorg-server/hw/xwin/winwindowswm.c
+++ b/xorg-server/hw/xwin/winwindowswm.c
@@ -261,10 +261,8 @@ winWindowsWMSendEvent (int type, unsigned int mask, int which, int arg,
   WMEventPtr		*pHead, pEvent;
   ClientPtr		client;
   xWindowsWMNotifyEvent se;
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winWindowsWMSendEvent %d %d %d %d,  %d %d - %d %d\n",
+  winDebug ("winWindowsWMSendEvent %d %d %d %d,  %d %d - %d %d\n",
 	  type, mask, which, arg, x, y, w, h);
-#endif
   dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType,
 				NullClient, DixUnknownAccess);
   if (!pHead)
@@ -272,16 +270,13 @@ winWindowsWMSendEvent (int type, unsigned int mask, int which, int arg,
   for (pEvent = *pHead; pEvent; pEvent = pEvent->next)
     {
       client = pEvent->client;
-#if CYGMULTIWINDOW_DEBUG
-      ErrorF ("winWindowsWMSendEvent - x%08x\n", (int) client);
-#endif
+      winDebug ("winWindowsWMSendEvent - x%08x\n", (int) client);
       if ((pEvent->mask & mask) == 0)
 	{
 	  continue;
 	}
-#if CYGMULTIWINDOW_DEBUG 
-      ErrorF ("winWindowsWMSendEvent - send\n");
-#endif
+      winDebug ("winWindowsWMSendEvent - send\n");
+
       se.type = type + WMEventBase;
       se.kind = which;
       se.window = window;
@@ -341,10 +336,8 @@ ProcWindowsWMFrameGetRect (ClientPtr client)
   RECT rcNew;
   REQUEST(xWindowsWMFrameGetRectReq);
 
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameGetRect %d %d\n",
+  winDebug ("ProcWindowsWMFrameGetRect %d %d\n",
 	  (sizeof(xWindowsWMFrameGetRectReq) >> 2), (int) client->req_len);
-#endif
   
   REQUEST_SIZE_MATCH(xWindowsWMFrameGetRectReq);
   rep.type = X_Reply;
@@ -363,10 +356,8 @@ ProcWindowsWMFrameGetRect (ClientPtr client)
   SetRect (&rcNew, stuff->ix, stuff->iy,
 	   stuff->ix + stuff->iw, stuff->iy + stuff->ih);
     
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameGetRect - %d %d %d %d\n",
+  winDebug ("ProcWindowsWMFrameGetRect - %d %d %d %d\n",
 	  stuff->ix, stuff->iy, stuff->ix + stuff->iw, stuff->iy + stuff->ih);
-#endif
 
   /*
    * Calculate the required size of the Windows window rectangle,
@@ -377,10 +368,8 @@ ProcWindowsWMFrameGetRect (ClientPtr client)
   rep.y = rcNew.top;
   rep.w = rcNew.right - rcNew.left;
   rep.h = rcNew.bottom - rcNew.top;
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameGetRect - %d %d %d %d\n",
+  winDebug ("ProcWindowsWMFrameGetRect - %d %d %d %d\n",
 	  rep.x, rep.y, rep.w, rep.h);
-#endif
 
   WriteToClient(client, sizeof(xWindowsWMFrameGetRectReply), (char *)&rep);
   return Success;
@@ -399,26 +388,22 @@ ProcWindowsWMFrameDraw (ClientPtr client)
 
   REQUEST_SIZE_MATCH (xWindowsWMFrameDrawReq);
 
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameDraw\n");
-#endif
+  winDebug ("ProcWindowsWMFrameDraw\n");
+
   rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
   if (rc != Success)
       return rc;
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameDraw - Window found\n");
-#endif
+
+  winDebug ("ProcWindowsWMFrameDraw - Window found\n");
 
   pRLWinPriv = (win32RootlessWindowPtr) RootlessFrameForWindow (pWin, TRUE);
   if (pRLWinPriv == 0) return BadWindow;
 
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameDraw - HWND 0x%08x 0x%08x 0x%08x\n",
+  winDebug ("ProcWindowsWMFrameDraw - HWND 0x%08x 0x%08x 0x%08x\n",
 	  (int) pRLWinPriv->hWnd, (int) stuff->frame_style,
 	  (int) stuff->frame_style_ex);
-  ErrorF ("ProcWindowsWMFrameDraw - %d %d %d %d\n",
+  winDebug ("ProcWindowsWMFrameDraw - %d %d %d %d\n",
 	  stuff->ix, stuff->iy, stuff->iw, stuff->ih);
-#endif
 
   /* Store the origin, height, and width in a rectangle structure */
   SetRect (&rcNew, stuff->ix, stuff->iy,
@@ -470,9 +455,7 @@ ProcWindowsWMFrameDraw (ClientPtr client)
       winMWExtWMReshapeFrame (pRLWinPriv, &newShape);
       RegionUninit(&newShape);
     }
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameDraw - done\n");
-#endif
+  winDebug ("ProcWindowsWMFrameDraw - done\n");
 
   return Success;
 }
@@ -487,18 +470,14 @@ ProcWindowsWMFrameSetTitle(ClientPtr client)
   win32RootlessWindowPtr pRLWinPriv;
   int rc;
 
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameSetTitle\n");
-#endif
+  winDebug ("ProcWindowsWMFrameSetTitle\n");
 
   REQUEST_AT_LEAST_SIZE(xWindowsWMFrameSetTitleReq);
 
   rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
   if (rc != Success)
       return rc;
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameSetTitle - Window found\n");
-#endif
+  winDebug ("ProcWindowsWMFrameSetTitle - Window found\n");
 
   title_length = stuff->title_length;
   title_max = (stuff->length << 2) - sizeof(xWindowsWMFrameSetTitleReq);
@@ -506,9 +485,7 @@ ProcWindowsWMFrameSetTitle(ClientPtr client)
   if (title_max < title_length)
     return BadValue;
 
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameSetTitle - length is valid\n");
-#endif
+  winDebug ("ProcWindowsWMFrameSetTitle - length is valid\n");
 
   title_bytes = malloc (title_length+1);
   strncpy (title_bytes, (unsigned char *) &stuff[1], title_length);
@@ -527,9 +504,7 @@ ProcWindowsWMFrameSetTitle(ClientPtr client)
 
   free (title_bytes);
 
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameSetTitle - done\n");
-#endif
+  winDebug ("ProcWindowsWMFrameSetTitle - done\n");
 
   return Success;
 }