Reviewed-by: Jamey Sharp <[email protected]> This seems like a good fix to include in RC2.
Jamey On Wed, Jun 16, 2010 at 10:07 AM, Jon TURNEY <[email protected]> wrote: > From: Colin Harrison <[email protected]> > > Fix some typos in devPrivates API changes in XWin code. > Move allocation of private keys as it's no longer valid to do them during > OsVendorInit() > > Signed-off-by: Jon TURNEY <[email protected]> > --- > > Some changes from Colin Harisson which fix things after the devPrivates API > change. > This should address the current tinderbox build failure on cygwin. > > hw/xwin/win.h | 2 +- > hw/xwin/winallpriv.c | 20 +++++++++++++++++--- > hw/xwin/winglobals.c | 7 ------- > 3 files changed, 18 insertions(+), 11 deletions(-) > > diff --git a/hw/xwin/win.h b/hw/xwin/win.h > index 05913d7..8c4b67f 100644 > --- a/hw/xwin/win.h > +++ b/hw/xwin/win.h > @@ -631,7 +631,7 @@ extern int g_fdMessageQueue; > extern DevPrivateKeyRec g_iScreenPrivateKeyRec; > #define g_iScreenPrivateKey (&g_iScreenPrivateKeyRec) > extern DevPrivateKeyRec g_iCmapPrivateKeyRec; > -#define g_iCmapPrivateKeyRec (&g_iCmapPrivateKeyRec) > +#define g_iCmapPrivateKey (&g_iCmapPrivateKeyRec) > extern DevPrivateKeyRec g_iGCPrivateKeyRec; > #define g_iGCPrivateKey (&g_iGCPrivateKeyRec) > extern DevPrivateKeyRec g_iPixmapPrivateKeyRec; > diff --git a/hw/xwin/winallpriv.c b/hw/xwin/winallpriv.c > index 6ecbff6..ef42d71 100644 > --- a/hw/xwin/winallpriv.c > +++ b/hw/xwin/winallpriv.c > @@ -74,25 +74,32 @@ winAllocatePrivates (ScreenPtr pScreen) > /* Intialize private structure members */ > pScreenPriv->fActive = TRUE; > > + /* Register our screen private */ > + if (!dixRegisterPrivateKey(g_iScreenPrivateKey, PRIVATE_SCREEN, 0)) > + { > + ErrorF ("winAllocatePrivates - AllocateScreenPrivate () failed\n"); > + return FALSE; > + } > + > /* Save the screen private pointer */ > winSetScreenPriv (pScreen, pScreenPriv); > > /* Reserve GC memory for our privates */ > - if (!dixRequestPrivateKey(g_iGCPrivateKey, PRIVATE_GC, sizeof > (winPrivGCRec))) > + if (!dixRegisterPrivateKey(g_iGCPrivateKey, PRIVATE_GC, sizeof > (winPrivGCRec))) > { > ErrorF ("winAllocatePrivates - AllocateGCPrivate () failed\n"); > return FALSE; > } > > /* Reserve Pixmap memory for our privates */ > - if (!dixRequestPrivateKey(g_iPixmapPrivateKey, PRIVATE_PIXMAP, sizeof > (winPrivPixmapRec))) > + if (!dixRegisterPrivateKey(g_iPixmapPrivateKey, PRIVATE_PIXMAP, sizeof > (winPrivPixmapRec))) > { > ErrorF ("winAllocatePrivates - AllocatePixmapPrivates () failed\n"); > return FALSE; > } > > /* Reserve Window memory for our privates */ > - if (!dixRequestPrivateKey(g_iWindowPrivateKey, PRIVATE_WINDOW, sizeof > (winPrivWinRec))) > + if (!dixRegisterPrivateKey(g_iWindowPrivateKey, PRIVATE_WINDOW, sizeof > (winPrivWinRec))) > { > ErrorF ("winAllocatePrivates () - AllocateWindowPrivates () failed\n"); > return FALSE; > @@ -161,6 +168,13 @@ winAllocateCmapPrivates (ColormapPtr pCmap) > /* Initialize the memory of the private structure */ > ZeroMemory (pCmapPriv, sizeof (winPrivCmapRec)); > > + /* Register our colourmap private */ > + if (!dixRegisterPrivateKey(g_iCmapPrivateKey, PRIVATE_COLORMAP, 0)) > + { > + ErrorF ("winAllocateCmapPrivates - AllocateCmapPrivate () failed\n"); > + return FALSE; > + } > + > /* Save the cmap private pointer */ > winSetCmapPriv (pCmap, pCmapPriv); > > diff --git a/hw/xwin/winglobals.c b/hw/xwin/winglobals.c > index 2cc53f2..f3f01d7 100644 > --- a/hw/xwin/winglobals.c > +++ b/hw/xwin/winglobals.c > @@ -126,13 +126,6 @@ Atom g_atomLastOwnedSelection = > None; > void > winInitializeGlobals (void) > { > - if (!dixRegisterPrivateKey(&g_iScreenPrivateKeyRec, PRIVATE_SCREEN, 0) || > - !dixRegisterPrivateKey(&g_iCmapPrivateKeyRec, PRIVATE_COLORMAP, 0) || > - !dixRegisterPrivateKey(&g_iGCPrivateKeyRec, PRIVATE_GC, 0) || > - !dixRegisterPrivateKey(&g_iPixmapPrivateKeyRec, PRIVATE_PIXMAP, 0) || > - !dixRegisterPrivateKey(&g_iWindowPrivateKeyRec, PRIVATE_WINDOW, 0)) { > - FatalError("cannot register private key"); > - } > g_dwCurrentThreadID = GetCurrentThreadId (); > g_hwndKeyboardFocus = NULL; > #ifdef XWIN_CLIPBOARD > -- > 1.7.0.4 > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
