diff options
| author | marha <marha@users.sourceforge.net> | 2010-11-15 16:51:22 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-11-15 16:51:22 +0000 |
| commit | f586b49ae23c573681b939ca44b3f418c83c84b2 (patch) | |
| tree | ffafe2da4517c5121ab4a8c64966e72829147215 /xorg-server/miext/rootless | |
| parent | 728ff03357b2dfd7048ab093183a239a0ba044c4 (diff) | |
| parent | 3a82f8a35b2c6d094cf9d0d5a3ccb9dd9b85f626 (diff) | |
| download | vcxsrv-f586b49ae23c573681b939ca44b3f418c83c84b2.tar.gz vcxsrv-f586b49ae23c573681b939ca44b3f418c83c84b2.tar.bz2 vcxsrv-f586b49ae23c573681b939ca44b3f418c83c84b2.zip | |
svn merge "^/branches/released" .
Solved mouse motion bug in new version of dix/getevents.c
Diffstat (limited to 'xorg-server/miext/rootless')
| -rw-r--r-- | xorg-server/miext/rootless/rootlessScreen.c | 3 | ||||
| -rw-r--r-- | xorg-server/miext/rootless/rootlessWindow.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/xorg-server/miext/rootless/rootlessScreen.c b/xorg-server/miext/rootless/rootlessScreen.c index fd396e464..364a75ac8 100644 --- a/xorg-server/miext/rootless/rootlessScreen.c +++ b/xorg-server/miext/rootless/rootlessScreen.c @@ -92,8 +92,7 @@ RootlessUpdateScreenPixmap(ScreenPtr pScreen) rowbytes = PixmapBytePad(pScreen->width, pScreen->rootDepth);
if (s->pixmap_data_size < rowbytes) {
- if (s->pixmap_data != NULL)
- free(s->pixmap_data);
+ free(s->pixmap_data);
s->pixmap_data_size = rowbytes;
s->pixmap_data = malloc(s->pixmap_data_size);
diff --git a/xorg-server/miext/rootless/rootlessWindow.c b/xorg-server/miext/rootless/rootlessWindow.c index 7c822e34a..ef0d42e4c 100644 --- a/xorg-server/miext/rootless/rootlessWindow.c +++ b/xorg-server/miext/rootless/rootlessWindow.c @@ -1146,10 +1146,8 @@ FinishFrameResize(WindowPtr pWin, Bool gravity, int oldX, int oldY, }
}
- if (gResizeDeathBits != NULL) {
- free(gResizeDeathBits);
- gResizeDeathBits = NULL;
- }
+ free(gResizeDeathBits);
+ gResizeDeathBits = NULL;
if (gravity) {
pScreen->CopyWindow = gResizeOldCopyWindowProc;
|