diff options
| -rw-r--r-- | dix/colormap.c | 2 | ||||
| -rw-r--r-- | dix/devices.c | 2 | ||||
| -rw-r--r-- | dix/dispatch.c | 2 | ||||
| -rw-r--r-- | dix/extension.c | 2 | ||||
| -rw-r--r-- | dix/gc.c | 2 | ||||
| -rw-r--r-- | dix/main.c | 3 | ||||
| -rw-r--r-- | dix/window.c | 2 |
7 files changed, 15 insertions, 0 deletions
diff --git a/dix/colormap.c b/dix/colormap.c index 73b666971..515557030 100644 --- a/dix/colormap.c +++ b/dix/colormap.c @@ -63,6 +63,7 @@ SOFTWARE. #include "scrnintstr.h" #include "resource.h" #include "windowstr.h" +#include "privates.h" extern XID clientErrorValue; extern int colormapPrivateCount; @@ -474,6 +475,7 @@ FreeColormap (pointer value, XID mid) } } + dixFreePrivates(*DEVPRIV_PTR(pmap)); if (pmap->devPrivates) xfree(pmap->devPrivates); diff --git a/dix/devices.c b/dix/devices.c index e51d1b339..4a7ec4d92 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -69,6 +69,7 @@ SOFTWARE. #ifdef XKB #include <xkbsrv.h> #endif +#include "privates.h" #include "xace.h" #include "dispatch.h" @@ -502,6 +503,7 @@ CloseDevice(DeviceIntPtr dev) XkbRemoveResourceClient((DevicePtr)dev,dev->xkb_interest->resource); #endif + dixFreePrivates(*DEVPRIV_PTR(dev)); if (dev->devPrivates) xfree(dev->devPrivates); diff --git a/dix/dispatch.c b/dix/dispatch.c index 68499f1ec..4fb680fb4 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -134,6 +134,7 @@ int ProcInitialConnection(); #include "panoramiX.h" #include "panoramiXsrv.h" #endif +#include "privates.h" #include "xace.h" #ifdef XAPPGROUP #include "appgroup.h" @@ -3651,6 +3652,7 @@ CloseDownClient(ClientPtr client) #ifdef SMART_SCHEDULE SmartLastClient = NullClient; #endif + dixFreePrivates(*DEVPRIV_PTR(client)); xfree(client); while (!clients[currentMaxClients-1]) diff --git a/dix/extension.c b/dix/extension.c index 88dff15e2..b338c810d 100644 --- a/dix/extension.c +++ b/dix/extension.c @@ -59,6 +59,7 @@ SOFTWARE. #include "gcstruct.h" #include "scrnintstr.h" #include "dispatch.h" +#include "privates.h" #include "xace.h" #define EXTENSION_BASE 128 @@ -290,6 +291,7 @@ CloseDownExtensions() for (j = extensions[i]->num_aliases; --j >= 0;) xfree(extensions[i]->aliases[j]); xfree(extensions[i]->aliases); + dixFreePrivates(*DEVPRIV_PTR(extensions[i])); xfree(extensions[i]); } xfree(extensions); @@ -61,6 +61,7 @@ SOFTWARE. #include "scrnintstr.h" #include "region.h" +#include "privates.h" #include "dix.h" #include <assert.h> @@ -903,6 +904,7 @@ FreeGC(pointer value, XID gid) (*pGC->funcs->DestroyGC) (pGC); if (pGC->dash != DefaultDash) xfree(pGC->dash); + dixFreePrivates(*DEVPRIV_PTR(pGC)); xfree(pGC); return(Success); } diff --git a/dix/main.c b/dix/main.c index 852cbcb62..b5db193ba 100644 --- a/dix/main.c +++ b/dix/main.c @@ -103,6 +103,7 @@ Equipment Corporation. #include "site.h" #include "dixfont.h" #include "extnsionst.h" +#include "privates.h" #ifdef XPRINT #include "DiPrint.h" #endif @@ -496,6 +497,7 @@ main(int argc, char *argv[], char *envp[]) FreeAuditTimer(); + dixFreePrivates(*DEVPRIV_PTR(serverClient)); xfree(serverClient->devPrivates); serverClient->devPrivates = NULL; @@ -801,6 +803,7 @@ FreeScreen(ScreenPtr pScreen) xfree(pScreen->WindowPrivateSizes); xfree(pScreen->GCPrivateSizes); xfree(pScreen->PixmapPrivateSizes); + dixFreePrivates(*DEVPRIV_PTR(pScreen)); xfree(pScreen->devPrivates); xfree(pScreen); } diff --git a/dix/window.c b/dix/window.c index 9967053e0..b50594797 100644 --- a/dix/window.c +++ b/dix/window.c @@ -126,6 +126,7 @@ Equipment Corporation. #ifdef XAPPGROUP #include "appgroup.h" #endif +#include "privates.h" #include "xace.h" /****** @@ -975,6 +976,7 @@ DeleteWindow(pointer value, XID wid) if (pWin->prevSib) pWin->prevSib->nextSib = pWin->nextSib; } + dixFreePrivates(*DEVPRIV_PTR(pWin)); xfree(pWin); return Success; } |