diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-18 08:33:31 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-18 08:33:31 +0200 |
| commit | 2ff5448bcca8cba4b62026d5493cb08aaf2838d8 (patch) | |
| tree | 355bad312548535d148aa058c089aefc81e10ab3 /xorg-server/Xext | |
| parent | d09d7be8bbbb39926f44834023d7120535155829 (diff) | |
| download | vcxsrv-2ff5448bcca8cba4b62026d5493cb08aaf2838d8.tar.gz vcxsrv-2ff5448bcca8cba4b62026d5493cb08aaf2838d8.tar.bz2 vcxsrv-2ff5448bcca8cba4b62026d5493cb08aaf2838d8.zip | |
fontconfig mesa xserver git update 18 Jul 2012
Diffstat (limited to 'xorg-server/Xext')
| -rw-r--r-- | xorg-server/Xext/panoramiX.c | 5 | ||||
| -rw-r--r-- | xorg-server/Xext/xvmc.c | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/xorg-server/Xext/panoramiX.c b/xorg-server/Xext/panoramiX.c index 5653c08e1..1c7197d5d 100644 --- a/xorg-server/Xext/panoramiX.c +++ b/xorg-server/Xext/panoramiX.c @@ -1056,11 +1056,12 @@ int ProcXineramaQueryScreens(ClientPtr client) { /* REQUEST(xXineramaQueryScreensReq); */ + CARD32 number = (noPanoramiXExtension) ? 0 : PanoramiXNumScreens; xXineramaQueryScreensReply rep = { .type = X_Reply, .sequenceNumber = client->sequence, - .length = bytes_to_int32(rep.number * sz_XineramaScreenInfo), - .number = (noPanoramiXExtension) ? 0 : PanoramiXNumScreens + .length = bytes_to_int32(number * sz_XineramaScreenInfo), + .number = number }; REQUEST_SIZE_MATCH(xXineramaQueryScreensReq); diff --git a/xorg-server/Xext/xvmc.c b/xorg-server/Xext/xvmc.c index 8d93cc3b0..5f0123b32 100644 --- a/xorg-server/Xext/xvmc.c +++ b/xorg-server/Xext/xvmc.c @@ -135,6 +135,7 @@ ProcXvMCListSurfaceTypes(ClientPtr client) xvmcSurfaceInfo info; XvMCAdaptorPtr adaptor = NULL; XvMCSurfaceInfoPtr surface; + int num_surfaces; REQUEST(xvmcListSurfaceTypesReq); REQUEST_SIZE_MATCH(xvmcListSurfaceTypesReq); @@ -154,16 +155,17 @@ ProcXvMCListSurfaceTypes(ClientPtr client) } } + num_surfaces = (adaptor) ? adaptor->num_surfaces : 0; rep = (xvmcListSurfaceTypesReply) { .type = X_Reply, .sequenceNumber = client->sequence, - .num = (adaptor) ? adaptor->num_surfaces : 0, - .length = bytes_to_int32(rep.num * sizeof(xvmcSurfaceInfo)), + .num = num_surfaces, + .length = bytes_to_int32(num_surfaces * sizeof(xvmcSurfaceInfo)), }; WriteToClient(client, sizeof(xvmcListSurfaceTypesReply), &rep); - for (i = 0; i < rep.num; i++) { + for (i = 0; i < num_surfaces; i++) { surface = adaptor->surfaces[i]; info.surface_type_id = surface->surface_type_id; info.chroma_format = surface->chroma_format; |