svn merge ^/branches/released .

1 files changed, 20 insertions, 13 deletions

diff --git a/xorg-server/dix/privates.c b/xorg-server/dix/privates.c
index 09014b6e6..3c743deb3 100644
--- a/xorg-server/dix/privates.c
+++ b/xorg-server/dix/privates.c
@@ -256,28 +256,35 @@ dixRegisterPrivateKey(DevPrivateKey key, DevPrivateType type, unsigned size)
     return TRUE;

 }

 

-/*

- * Allocate a new private key.

- *

- * This manages the storage of the key object itself, freeing it when the

- * privates system is restarted at server reset time. All other keys

- * are expected to be statically allocated as the privates must be

- * reset after all objects have been freed

- */

-DevPrivateKey

-dixCreatePrivateKey(DevPrivateType type, unsigned size)

+Bool

+dixRegisterScreenPrivateKey(DevScreenPrivateKey screenKey, ScreenPtr pScreen, DevPrivateType type, unsigned size)

 {

     DevPrivateKey	key;

 

+    if (!dixRegisterPrivateKey(&screenKey->screenKey, PRIVATE_SCREEN, 0))

+	return FALSE;

+    key = dixGetPrivate(&pScreen->devPrivates, &screenKey->screenKey);

+    if (key != NULL) {

+	assert(key->size == size);

+	assert(key->type == type);

+	return TRUE;

+    }

     key = calloc(sizeof (DevPrivateKeyRec), 1);

     if (!key)

-	return NULL;

+	return FALSE;

     if (!dixRegisterPrivateKey(key, type, size)) {

 	free(key);

-	return NULL;

+	return FALSE;

     }

     key->allocated = TRUE;

-    return key;

+    dixSetPrivate(&pScreen->devPrivates, &screenKey->screenKey, key);

+    return TRUE;

+}

+

+DevPrivateKey

+_dixGetScreenPrivateKey(const DevScreenPrivateKey key, ScreenPtr pScreen)

+{

+    return dixGetPrivate(&pScreen->devPrivates, &key->screenKey);

 }

 

 /*