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, 178 insertions, 184 deletions

diff --git a/xorg-server/hw/xwin/winpixmap.c b/xorg-server/hw/xwin/winpixmap.c
index 2af95f225..ac883a84c 100644
--- a/xorg-server/hw/xwin/winpixmap.c
+++ b/xorg-server/hw/xwin/winpixmap.c
@@ -1,184 +1,178 @@
-/*

- *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:	drewry, september 1986

- *		Harold L Hunt II

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-

-

-/*

- * Local prototypes

- */

-

-#if 0

-static void

-winXRotatePixmapNativeGDI (PixmapPtr pPix, int rw);

-

-static void

-winYRotatePixmapNativeGDI (PixmapPtr pPix, int rh);

-

-static void

-winCopyRotatePixmapNativeGDI (PixmapPtr psrcPix, PixmapPtr *ppdstPix,

-			      int xrot, int yrot);

-#endif

-

-

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

-/* See mfb/mfbpixmap.c - mfbCreatePixmap() */

-PixmapPtr

-winCreatePixmapNativeGDI (ScreenPtr pScreen,

-			  int iWidth, int iHeight,

-			  int iDepth, unsigned usage_hint)

-{

-  winPrivPixmapPtr	pPixmapPriv = NULL;

-  PixmapPtr		pPixmap = NULL;

-

-  /* Allocate pixmap memory */

-  pPixmap = AllocatePixmap (pScreen, 0);

-  if (!pPixmap)

-    {

-      ErrorF ("winCreatePixmapNativeGDI () - Couldn't allocate a pixmap\n");

-      return NullPixmap;

-    }

-

-  winDebug ("winCreatePixmap () - w %d h %d d %d uh %d bw %d\n",

-	  iWidth, iHeight, iDepth, usage_hint,

-	  PixmapBytePad (iWidth, iDepth));

-

-  /* Setup pixmap values */

-  pPixmap->drawable.type = DRAWABLE_PIXMAP;

-  pPixmap->drawable.class = 0;

-  pPixmap->drawable.pScreen = pScreen;

-  pPixmap->drawable.depth = iDepth;

-  pPixmap->drawable.bitsPerPixel = BitsPerPixel (iDepth);

-  pPixmap->drawable.id = 0;

-  pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;

-  pPixmap->drawable.x = 0;

-  pPixmap->drawable.y = 0;

-  pPixmap->drawable.width = iWidth;

-  pPixmap->drawable.height = iHeight;

-  pPixmap->devKind = 0;

-  pPixmap->refcnt = 1;

-  pPixmap->devPrivate.ptr = NULL;

-  pPixmap->usage_hint = usage_hint;

-

-  /* Pixmap privates are allocated by AllocatePixmap */

-  pPixmapPriv = winGetPixmapPriv (pPixmap);

-

-  /* Initialize pixmap privates */

-  pPixmapPriv->hBitmap = NULL;

-  pPixmapPriv->hdcSelected = NULL;

-  pPixmapPriv->pbBits = NULL;

-  pPixmapPriv->dwScanlineBytes = PixmapBytePad (iWidth, iDepth);

-

-  /* Check for zero width or height pixmaps */

-  if (iWidth == 0 || iHeight == 0)

-    {

-      /* Don't allocate a real pixmap, just set fields and return */

-      return pPixmap;

-    }

-

-  /* Create a DIB for the pixmap */

-  pPixmapPriv->hBitmap = winCreateDIBNativeGDI (iWidth, iHeight, iDepth,

-						&pPixmapPriv->pbBits,

-						(BITMAPINFO **) &pPixmapPriv->pbmih);

-

-  winDebug ("winCreatePixmap () - Created a pixmap %08x, %dx%dx%d, for " \

-	  "screen: %08x\n",

-	  pPixmapPriv->hBitmap, iWidth, iHeight, iDepth, pScreen);

-

-  return pPixmap;

-}

-

-

-/* 

- * See Porting Layer Definition - p. 35

- *

- * See mfb/mfbpixmap.c - mfbDestroyPixmap()

- */

-

-Bool

-winDestroyPixmapNativeGDI (PixmapPtr pPixmap)

-{

-  winPrivPixmapPtr		pPixmapPriv = NULL;

-  

-  winDebug ("winDestroyPixmapNativeGDI ()\n");

-

-  /* Bail early if there is not a pixmap to destroy */

-  if (pPixmap == NULL)

-    {

-      ErrorF ("winDestroyPixmapNativeGDI () - No pixmap to destroy\n");

-      return TRUE;

-    }

-

-  /* Get a handle to the pixmap privates */

-  pPixmapPriv = winGetPixmapPriv (pPixmap);

-

-  winDebug ("winDestroyPixmapNativeGDI - pPixmapPriv->hBitmap: %08x\n",

-	  pPixmapPriv->hBitmap);

-

-  /* Decrement reference count, return if nonzero */

-  --pPixmap->refcnt;

-  if (pPixmap->refcnt != 0)

-    return TRUE;

-

-  /* Free GDI bitmap */

-  if (pPixmapPriv->hBitmap) DeleteObject (pPixmapPriv->hBitmap);

-  

-  /* Free the bitmap info header memory */

-  free(pPixmapPriv->pbmih);

-  pPixmapPriv->pbmih = NULL;

-

-  /* Free the pixmap memory */

-  free (pPixmap);

-  pPixmap = NULL;

-

-  return TRUE;

-}

-

-

-/* 

- * Not used yet

- */

-

-Bool

-winModifyPixmapHeaderNativeGDI (PixmapPtr pPixmap,

-				int iWidth, int iHeight,

-				int iDepth,

-				int iBitsPerPixel,

-				int devKind,

-				pointer pPixData)

-{

-  FatalError ("winModifyPixmapHeaderNativeGDI ()\n");

-  return TRUE;

-}

-

+/*
+ *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:	drewry, september 1986
+ *		Harold L Hunt II
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+
+/*
+ * Local prototypes
+ */
+
+#if 0
+static void
+ winXRotatePixmapNativeGDI(PixmapPtr pPix, int rw);
+
+static void
+ winYRotatePixmapNativeGDI(PixmapPtr pPix, int rh);
+
+static void
+
+winCopyRotatePixmapNativeGDI(PixmapPtr psrcPix, PixmapPtr *ppdstPix,
+                             int xrot, int yrot);
+#endif
+
+/* See Porting Layer Definition - p. 34 */
+/* See mfb/mfbpixmap.c - mfbCreatePixmap() */
+PixmapPtr
+winCreatePixmapNativeGDI(ScreenPtr pScreen,
+                         int iWidth, int iHeight,
+                         int iDepth, unsigned usage_hint)
+{
+    winPrivPixmapPtr pPixmapPriv = NULL;
+    PixmapPtr pPixmap = NULL;
+
+    /* Allocate pixmap memory */
+    pPixmap = AllocatePixmap(pScreen, 0);
+    if (!pPixmap) {
+        ErrorF("winCreatePixmapNativeGDI () - Couldn't allocate a pixmap\n");
+        return NullPixmap;
+    }
+
+    winDebug("winCreatePixmap () - w %d h %d d %d uh %d bw %d\n",
+             iWidth, iHeight, iDepth, usage_hint,
+             PixmapBytePad(iWidth, iDepth));
+
+    /* Setup pixmap values */
+    pPixmap->drawable.type = DRAWABLE_PIXMAP;
+    pPixmap->drawable.class = 0;
+    pPixmap->drawable.pScreen = pScreen;
+    pPixmap->drawable.depth = iDepth;
+    pPixmap->drawable.bitsPerPixel = BitsPerPixel(iDepth);
+    pPixmap->drawable.id = 0;
+    pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
+    pPixmap->drawable.x = 0;
+    pPixmap->drawable.y = 0;
+    pPixmap->drawable.width = iWidth;
+    pPixmap->drawable.height = iHeight;
+    pPixmap->devKind = 0;
+    pPixmap->refcnt = 1;
+    pPixmap->devPrivate.ptr = NULL;
+    pPixmap->usage_hint = usage_hint;
+
+    /* Pixmap privates are allocated by AllocatePixmap */
+    pPixmapPriv = winGetPixmapPriv(pPixmap);
+
+    /* Initialize pixmap privates */
+    pPixmapPriv->hBitmap = NULL;
+    pPixmapPriv->hdcSelected = NULL;
+    pPixmapPriv->pbBits = NULL;
+    pPixmapPriv->dwScanlineBytes = PixmapBytePad(iWidth, iDepth);
+
+    /* Check for zero width or height pixmaps */
+    if (iWidth == 0 || iHeight == 0) {
+        /* Don't allocate a real pixmap, just set fields and return */
+        return pPixmap;
+    }
+
+    /* Create a DIB for the pixmap */
+    pPixmapPriv->hBitmap = winCreateDIBNativeGDI(iWidth, iHeight, iDepth,
+                                                 &pPixmapPriv->pbBits,
+                                                 (BITMAPINFO **) & pPixmapPriv->
+                                                 pbmih);
+
+    winDebug("winCreatePixmap () - Created a pixmap %08x, %dx%dx%d, for "
+             "screen: %08x\n",
+             pPixmapPriv->hBitmap, iWidth, iHeight, iDepth, pScreen);
+
+    return pPixmap;
+}
+
+/* 
+ * See Porting Layer Definition - p. 35
+ *
+ * See mfb/mfbpixmap.c - mfbDestroyPixmap()
+ */
+
+Bool
+winDestroyPixmapNativeGDI(PixmapPtr pPixmap)
+{
+    winPrivPixmapPtr pPixmapPriv = NULL;
+
+    winDebug("winDestroyPixmapNativeGDI ()\n");
+
+    /* Bail early if there is not a pixmap to destroy */
+    if (pPixmap == NULL) {
+        ErrorF("winDestroyPixmapNativeGDI () - No pixmap to destroy\n");
+        return TRUE;
+    }
+
+    /* Get a handle to the pixmap privates */
+    pPixmapPriv = winGetPixmapPriv(pPixmap);
+
+    winDebug("winDestroyPixmapNativeGDI - pPixmapPriv->hBitmap: %08x\n",
+             pPixmapPriv->hBitmap);
+
+    /* Decrement reference count, return if nonzero */
+    --pPixmap->refcnt;
+    if (pPixmap->refcnt != 0)
+        return TRUE;
+
+    /* Free GDI bitmap */
+    if (pPixmapPriv->hBitmap)
+        DeleteObject(pPixmapPriv->hBitmap);
+
+    /* Free the bitmap info header memory */
+    free(pPixmapPriv->pbmih);
+    pPixmapPriv->pbmih = NULL;
+
+    /* Free the pixmap memory */
+    free(pPixmap);
+    pPixmap = NULL;
+
+    return TRUE;
+}
+
+/* 
+ * Not used yet
+ */
+
+Bool
+winModifyPixmapHeaderNativeGDI(PixmapPtr pPixmap,
+                               int iWidth, int iHeight,
+                               int iDepth,
+                               int iBitsPerPixel, int devKind, pointer pPixData)
+{
+    FatalError("winModifyPixmapHeaderNativeGDI ()\n");
+    return TRUE;
+}
+