svn merge ^/branches/released .

5 files changed, 12 insertions, 10 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86Config.c b/xorg-server/hw/xfree86/common/xf86Config.c
index 1dea47feb..bd90e6ca3 100644
--- a/xorg-server/hw/xfree86/common/xf86Config.c
+++ b/xorg-server/hw/xfree86/common/xf86Config.c
@@ -1787,9 +1787,11 @@ configScreen(confScreenPtr screenp, XF86ConfScreenPtr conf_screen, int scrnum,
     XF86ConfDisplayPtr dispptr;

     XF86ConfAdaptorLinkPtr conf_adaptor;

     Bool defaultMonitor = FALSE;

+    XF86ConfScreenRec local_conf_screen;

 

     if (!conf_screen) {

-        conf_screen = xnfcalloc(1, sizeof(XF86ConfScreenRec));

+        memset(&local_conf_screen, 0, sizeof(local_conf_screen));

+        conf_screen = &local_conf_screen;

         conf_screen->scrn_identifier = "Default Screen Section";

         xf86Msg(X_DEFAULT, "No screen section available. Using defaults.\n");

     }

diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
index 0aa6f2cf4..a6266e725 100644
--- a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
+++ b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
@@ -369,13 +369,13 @@ VGAarbiterClearToBackground (
 }

 

 static PixmapPtr

-VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned usage_hint)

+VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned class)

 {

     PixmapPtr pPix;

 

     SCREEN_PROLOG ( CreatePixmap);

     VGAGet(pScreen);

-    pPix = (*pScreen->CreatePixmap) (pScreen, w, h, depth, usage_hint);

+    pPix = (*pScreen->CreatePixmap) (pScreen, w, h, depth, class);

     VGAPut();

     SCREEN_EPILOG (CreatePixmap, VGAarbiterCreatePixmap);

 

diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h b/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
index 13fde5e79..0f8416b71 100644
--- a/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
+++ b/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
@@ -155,7 +155,7 @@ static void VGAarbiterCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,
 static void VGAarbiterClearToBackground (WindowPtr pWin, int x, int y, int w,

     int h, Bool generateExposures);

 static PixmapPtr VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h,

-    int depth, unsigned int usage_hint);

+    int depth, unsigned int class);

 static Bool  VGAarbiterCreateGC(GCPtr pGC);

 static Bool VGAarbiterSaveScreen(ScreenPtr pScreen, Bool unblank);

 static void VGAarbiterStoreColors (ColormapPtr pmap, int ndef, xColorItem

diff --git a/xorg-server/hw/xfree86/vbe/vbe.c b/xorg-server/hw/xfree86/vbe/vbe.c
index 5120b3199..082cfae4f 100644
--- a/xorg-server/hw/xfree86/vbe/vbe.c
+++ b/xorg-server/hw/xfree86/vbe/vbe.c
@@ -395,7 +395,7 @@ VBEGetVBEInfo(vbeInfoPtr pVbe)
     i = 0;

     while (modes[i] != 0xffff)

 	i++;

-    block->VideoModePtr = malloc(sizeof(CARD16) * i + 1);

+    block->VideoModePtr = malloc(sizeof(CARD16) * (i + 1));

     memcpy(block->VideoModePtr, modes, sizeof(CARD16) * i);

     block->VideoModePtr[i] = 0xffff;

 

diff --git a/xorg-server/hw/xfree86/xaa/xaaInit.c b/xorg-server/hw/xfree86/xaa/xaaInit.c
index ff1dd3d8b..c0617149a 100644
--- a/xorg-server/hw/xfree86/xaa/xaaInit.c
+++ b/xorg-server/hw/xfree86/xaa/xaaInit.c
@@ -34,7 +34,7 @@ static void XAAGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h,
 static void XAAGetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt,

 			int *pwidth, int nspans, char *pdstStart);

 static PixmapPtr XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth,

-				 unsigned usage_hint);

+				 unsigned class);

 static Bool XAADestroyPixmap(PixmapPtr pPixmap);

 static Bool XAAEnterVT (int index, int flags);

 static void XAALeaveVT (int index, int flags);

@@ -331,7 +331,7 @@ XAAInitializeOffscreenDepths (ScreenPtr pScreen)
 }

 

 static PixmapPtr 

-XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned usage_hint)

+XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned class)

 {

     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);

     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

@@ -346,7 +346,7 @@ XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned usage_hint)
 	XAAInitializeOffscreenDepths (pScreen);

 

     if(pScrn->vtSema &&

-	(usage_hint != CREATE_PIXMAP_USAGE_GLYPH_PICTURE) &&

+	(class != CREATE_PIXMAP_USAGE_GLYPH_PICTURE) &&

 	(infoRec->offscreenDepths & (1 << (depth - 1))) &&

 	(size >= MIN_OFFPIX_SIZE) && !SwitchedOut &&

 	(!infoRec->maxOffPixWidth || (w <= infoRec->maxOffPixWidth)) &&

@@ -379,7 +379,7 @@ XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned usage_hint)
 	}

 

 	XAA_SCREEN_PROLOGUE (pScreen, CreatePixmap);

-	pPix = (*pScreen->CreatePixmap) (pScreen, 0, 0, depth, usage_hint);

+	pPix = (*pScreen->CreatePixmap) (pScreen, 0, 0, depth, class);

 	XAA_SCREEN_EPILOGUE (pScreen, CreatePixmap, XAACreatePixmap);

 

 	if (!pPix) {

@@ -411,7 +411,7 @@ XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned usage_hint)
     }

 BAILOUT:

     XAA_SCREEN_PROLOGUE (pScreen, CreatePixmap);

-    pPix = (*pScreen->CreatePixmap) (pScreen, w, h, depth, usage_hint);

+    pPix = (*pScreen->CreatePixmap) (pScreen, w, h, depth, class);

     XAA_SCREEN_EPILOGUE (pScreen, CreatePixmap, XAACreatePixmap);

 

     if(pPix) {