aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-06-23 07:03:58 +0000
committermarha <marha@users.sourceforge.net>2010-06-23 07:03:58 +0000
commit345335d61c71c245846d679d568a8b5eca1a5ca9 (patch)
tree7b878ae84134fa091dd2bdc2695251e609209ebe /xorg-server/hw/xwin
parentfbbbbe88405440920f4baa5a3107ec0b9a6f8cb7 (diff)
parentc356d5298f18cd103ef7caad015d98d2022044ac (diff)
downloadvcxsrv-345335d61c71c245846d679d568a8b5eca1a5ca9.tar.gz
vcxsrv-345335d61c71c245846d679d568a8b5eca1a5ca9.tar.bz2
vcxsrv-345335d61c71c245846d679d568a8b5eca1a5ca9.zip
svn merge "^/branches/released" .
Diffstat (limited to 'xorg-server/hw/xwin')
-rw-r--r--xorg-server/hw/xwin/winallpriv.c9
-rw-r--r--xorg-server/hw/xwin/winglobals.c7
2 files changed, 8 insertions, 8 deletions
diff --git a/xorg-server/hw/xwin/winallpriv.c b/xorg-server/hw/xwin/winallpriv.c
index 6a6dc60db..f4078207e 100644
--- a/xorg-server/hw/xwin/winallpriv.c
+++ b/xorg-server/hw/xwin/winallpriv.c
@@ -72,7 +72,7 @@ winAllocatePrivates (ScreenPtr pScreen)
/* Intialize private structure members */
pScreenPriv->fActive = TRUE;
- /* Reserve screen memory for our privates */
+ /* Register our screen private */
if (!dixRegisterPrivateKey(g_iScreenPrivateKey, PRIVATE_SCREEN, 0))
{
ErrorF ("winAllocatePrivates - dixRegisterPrivateKey () failed\n");
@@ -162,6 +162,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/xorg-server/hw/xwin/winglobals.c b/xorg-server/hw/xwin/winglobals.c
index b698270b7..80a6c9feb 100644
--- a/xorg-server/hw/xwin/winglobals.c
+++ b/xorg-server/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