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, 154 insertions, 167 deletions

diff --git a/xorg-server/hw/xwin/wingetsp.c b/xorg-server/hw/xwin/wingetsp.c
index 0fd0ebce9..1076b5cc5 100644
--- a/xorg-server/hw/xwin/wingetsp.c
+++ b/xorg-server/hw/xwin/wingetsp.c
@@ -1,167 +1,154 @@
-/*

- *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.

- *

- *Permission is hereby granted, free of charge, to any person obtaining

- * a copy of this software and associated documentation files (the

- *"Software"), to deal in the Software without restriction, including

- *without limitation the rights to use, copy, modify, merge, publish,

- *distribute, sublicense, and/or sell copies of the Software, and to

- *permit persons to whom the Software is furnished to do so, subject to

- *the following conditions:

- *

- *The above copyright notice and this permission notice shall be

- *included in all copies or substantial portions of the Software.

- *

- *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

- *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

- *NONINFRINGEMENT. IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR

- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- *Except as contained in this notice, the name of the XFree86 Project

- *shall not be used in advertising or otherwise to promote the sale, use

- *or other dealings in this Software without prior written authorization

- *from the XFree86 Project.

- *

- * Authors:	Harold L Hunt II

- * 		Alan Hourihane <alanh@fairlite.demon.co.uk>

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-

-/* See Porting Layer Definition - p. 55 */

-void

-winGetSpansNativeGDI (DrawablePtr	pDrawable, 

-		      int		nMax, 

-		      DDXPointPtr	pPoints, 

-		      int		*piWidths, 

-		      int		iSpans, 

-		      char		*pDsts)

-{

-  PixmapPtr		pPixmap = NULL;

-  winPrivPixmapPtr	pPixmapPriv = NULL;

-  int			iSpan;

-  DDXPointPtr		pPoint = NULL;

-  int			*piWidth = NULL;

-  char			*pDst = pDsts;

-  HBITMAP		hbmpWindow, hbmpOrig, hbmpOrig1;

-  BYTE			*pbWindow = NULL;

-  HDC			hdcMem, hdcMem1;

-  ScreenPtr		pScreen = pDrawable->pScreen;

-  winScreenPriv(pScreen);

-

-  /* Branch on the drawable type */

-  switch (pDrawable->type)

-    {

-    case DRAWABLE_PIXMAP:

-      winDebug ("winGetSpans - DRAWABLE_PIXMAP %08x\n",

-	      pDrawable);

-

-      pPixmap = (PixmapPtr) pDrawable;

-      pPixmapPriv = winGetPixmapPriv (pPixmap);

-

-      /* Open a memory HDC */

-      hdcMem1 = CreateCompatibleDC (NULL);

-      hdcMem = CreateCompatibleDC (NULL);

-

-      /* Select the drawable pixmap into a DC */

-      hbmpOrig1 = SelectObject (hdcMem1, pPixmapPriv->hBitmap);

-

-      if (hbmpOrig1 == NULL)

-	FatalError ("winGetSpans - DRAWABLE_PIXMAP - SelectObject () "

-		    "failed on pPixmapPriv->hBitmap\n");

-

-      /* Loop through spans */

-      for (iSpan = 0; iSpan < iSpans; ++iSpan)

-	{

-	  pPoint = pPoints + iSpan;

-	  piWidth = piWidths + iSpan;

-

-      	  hbmpWindow = winCreateDIBNativeGDI (*piWidth, 1,

-					      pDrawable->depth,

-					      &pbWindow,

-					      NULL);

-

-      	  hbmpOrig = SelectObject (hdcMem, hbmpWindow);

-			       

-          /* Transfer the window bits to the window bitmap */

-          BitBlt (hdcMem,

-		  0, 0,

-		  *piWidth, 1, 

-		  hdcMem1,

-		  pPoint->x, pPoint->y,

-		  SRCCOPY);

-

-	  memcpy (pDst,

-		  (char*) pbWindow,

-		  PixmapBytePad (*piWidth, pDrawable->depth));

-

-      	  /* Pop the window bitmap out of the HDC and delete the bitmap */

-      	  SelectObject (hdcMem, hbmpOrig);

-	  DeleteObject (hbmpWindow);

-

-	  /* Calculate offset of next bit destination */

-	  pDst += PixmapBytePad (*piWidth, pDrawable->depth);

-	}

-      

-      /* Pop the pixmap's bitmap out of the HDC */

-      SelectObject (hdcMem1, hbmpOrig1);

-

-      /* Delete the HDCs */

-      DeleteDC (hdcMem1);

-      DeleteDC (hdcMem);

-      break;

-

-    case DRAWABLE_WINDOW:

-

-      /* Open a memory HDC */

-      hdcMem = CreateCompatibleDC (NULL);

-

-      /* Loop through spans */

-      for (iSpan = 0; iSpan < iSpans; ++iSpan)

-	{

-	  pPoint = pPoints + iSpan;

-	  piWidth = piWidths + iSpan;

-

-      	  hbmpWindow = winCreateDIBNativeGDI (*piWidth, 1,

-					      pDrawable->depth,

-					      &pbWindow,

-					      NULL);

-

-      	  hbmpOrig = SelectObject (hdcMem, hbmpWindow);

-

-          /* Transfer the window bits to the window bitmap */

-          BitBlt (hdcMem,

-		  0, 0,

-		  *piWidth, 1, 

-		  pScreenPriv->hdcScreen,

-		  pPoint->x, pPoint->y,

-		  SRCCOPY);

-

-	  memcpy (pDst,

-		  (char*) pbWindow,

-		  PixmapBytePad (*piWidth, pDrawable->depth));

-

-      	  /* Pop the window bitmap out of the HDC */

-      	  SelectObject (hdcMem, hbmpOrig);

-

-	  DeleteObject (hbmpWindow);

-

-	  /* Calculate offset of next bit destination */

-	  pDst += PixmapBytePad (*piWidth, pDrawable->depth);

-	}

-

-      /* Delete the window bitmap */

-      DeleteDC (hdcMem);

-      break;

-

-    default:

-      FatalError ("winGetSpans - Unknown drawable type\n");

-      break;

-    }

-}

+/*
+ *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
+ *
+ *Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ *"Software"), to deal in the Software without restriction, including
+ *without limitation the rights to use, copy, modify, merge, publish,
+ *distribute, sublicense, and/or sell copies of the Software, and to
+ *permit persons to whom the Software is furnished to do so, subject to
+ *the following conditions:
+ *
+ *The above copyright notice and this permission notice shall be
+ *included in all copies or substantial portions of the Software.
+ *
+ *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *NONINFRINGEMENT. IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR
+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *Except as contained in this notice, the name of the XFree86 Project
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from the XFree86 Project.
+ *
+ * Authors:	Harold L Hunt II
+ * 		Alan Hourihane <alanh@fairlite.demon.co.uk>
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+
+/* See Porting Layer Definition - p. 55 */
+void
+winGetSpansNativeGDI(DrawablePtr pDrawable,
+                     int nMax,
+                     DDXPointPtr pPoints,
+                     int *piWidths, int iSpans, char *pDsts)
+{
+    PixmapPtr pPixmap = NULL;
+    winPrivPixmapPtr pPixmapPriv = NULL;
+    int iSpan;
+    DDXPointPtr pPoint = NULL;
+    int *piWidth = NULL;
+    char *pDst = pDsts;
+    HBITMAP hbmpWindow, hbmpOrig, hbmpOrig1;
+    BYTE *pbWindow = NULL;
+    HDC hdcMem, hdcMem1;
+    ScreenPtr pScreen = pDrawable->pScreen;
+
+    winScreenPriv(pScreen);
+
+    /* Branch on the drawable type */
+    switch (pDrawable->type) {
+    case DRAWABLE_PIXMAP:
+      winDebug ("winGetSpans - DRAWABLE_PIXMAP %08x\n", pDrawable);
+
+        pPixmap = (PixmapPtr) pDrawable;
+        pPixmapPriv = winGetPixmapPriv(pPixmap);
+
+        /* Open a memory HDC */
+        hdcMem1 = CreateCompatibleDC(NULL);
+        hdcMem = CreateCompatibleDC(NULL);
+
+        /* Select the drawable pixmap into a DC */
+        hbmpOrig1 = SelectObject(hdcMem1, pPixmapPriv->hBitmap);
+
+        if (hbmpOrig1 == NULL)
+            FatalError("winGetSpans - DRAWABLE_PIXMAP - SelectObject () "
+                       "failed on pPixmapPriv->hBitmap\n");
+
+        /* Loop through spans */
+        for (iSpan = 0; iSpan < iSpans; ++iSpan) {
+            pPoint = pPoints + iSpan;
+            piWidth = piWidths + iSpan;
+
+            hbmpWindow = winCreateDIBNativeGDI(*piWidth, 1,
+                                               pDrawable->depth,
+                                               &pbWindow, NULL);
+
+            hbmpOrig = SelectObject(hdcMem, hbmpWindow);
+
+            /* Transfer the window bits to the window bitmap */
+            BitBlt(hdcMem,
+                   0, 0, *piWidth, 1, hdcMem1, pPoint->x, pPoint->y, SRCCOPY);
+
+            memcpy(pDst,
+                   (char *) pbWindow,
+                   PixmapBytePad(*piWidth, pDrawable->depth));
+
+            /* Pop the window bitmap out of the HDC and delete the bitmap */
+            SelectObject(hdcMem, hbmpOrig);
+            DeleteObject(hbmpWindow);
+
+            /* Calculate offset of next bit destination */
+            pDst += PixmapBytePad(*piWidth, pDrawable->depth);
+        }
+
+        /* Pop the pixmap's bitmap out of the HDC */
+        SelectObject(hdcMem1, hbmpOrig1);
+
+        /* Delete the HDCs */
+        DeleteDC(hdcMem1);
+        DeleteDC(hdcMem);
+        break;
+
+    case DRAWABLE_WINDOW:
+
+        /* Open a memory HDC */
+        hdcMem = CreateCompatibleDC(NULL);
+
+        /* Loop through spans */
+        for (iSpan = 0; iSpan < iSpans; ++iSpan) {
+            pPoint = pPoints + iSpan;
+            piWidth = piWidths + iSpan;
+
+            hbmpWindow = winCreateDIBNativeGDI(*piWidth, 1,
+                                               pDrawable->depth,
+                                               &pbWindow, NULL);
+
+            hbmpOrig = SelectObject(hdcMem, hbmpWindow);
+
+            /* Transfer the window bits to the window bitmap */
+            BitBlt(hdcMem,
+                   0, 0,
+                   *piWidth, 1,
+                   pScreenPriv->hdcScreen, pPoint->x, pPoint->y, SRCCOPY);
+
+            memcpy(pDst,
+                   (char *) pbWindow,
+                   PixmapBytePad(*piWidth, pDrawable->depth));
+
+            /* Pop the window bitmap out of the HDC */
+            SelectObject(hdcMem, hbmpOrig);
+
+            DeleteObject(hbmpWindow);
+
+            /* Calculate offset of next bit destination */
+            pDst += PixmapBytePad(*piWidth, pDrawable->depth);
+        }
+
+        /* Delete the window bitmap */
+        DeleteDC(hdcMem);
+        break;
+
+    default:
+        FatalError("winGetSpans - Unknown drawable type\n");
+        break;
+    }
+}