1 --- tigervnc-1.2.0/unix/xserver/hw/vnc/vncExtInit.cc~ 2011-11-07 13:51:34.000000000 +0100
2 +++ tigervnc-1.2.0/unix/xserver/hw/vnc/vncExtInit.cc 2012-03-23 14:06:29.207547404 +0100
4 ev.window = cur->window;
5 ev.time = GetTimeInMillis();
6 if (cur->client->swapped) {
8 - swaps(&ev.sequenceNumber, n);
9 - swapl(&ev.window, n);
11 + swaps(&ev.sequenceNumber);
15 WriteToClient(cur->client, sizeof(xVncExtClientCutTextNotifyEvent),
18 ev.sequenceNumber = cur->client->sequence;
19 ev.window = cur->window;
20 if (cur->client->swapped) {
22 - swaps(&ev.sequenceNumber, n);
23 - swapl(&ev.window, n);
24 + swaps(&ev.sequenceNumber);
27 WriteToClient(cur->client, sizeof(xVncExtQueryConnectNotifyEvent),
30 ev.window = cur->window;
31 ev.selection = selection;
32 if (cur->client->swapped) {
34 - swaps(&ev.sequenceNumber, n);
35 - swapl(&ev.window, n);
36 - swapl(&ev.selection, n);
37 + swaps(&ev.sequenceNumber);
39 + swapl(&ev.selection);
41 WriteToClient(cur->client, sizeof(xVncExtSelectionChangeNotifyEvent),
44 param.buf[stuff->paramLen] = 0;
46 xVncExtSetParamReply rep;
54 if (client->swapped) {
55 - swaps(&rep.sequenceNumber, n);
56 - swapl(&rep.length, n);
57 + swaps(&rep.sequenceNumber);
60 WriteToClient(client, sizeof(xVncExtSetParamReply), (char *)&rep);
61 return (client->noClientException);
64 static int SProcVncExtSetParam(ClientPtr client)
67 REQUEST(xVncExtSetParamReq);
68 - swaps(&stuff->length, n);
69 + swaps(&stuff->length);
70 REQUEST_AT_LEAST_SIZE(xVncExtSetParamReq);
71 return ProcVncExtSetParam(client);
74 param.buf[stuff->paramLen] = 0;
76 xVncExtGetParamReply rep;
79 rep.sequenceNumber = client->sequence;
82 rep.length = (len + 3) >> 2;
84 if (client->swapped) {
85 - swaps(&rep.sequenceNumber, n);
86 - swapl(&rep.length, n);
87 - swaps(&rep.valueLen, n);
88 + swaps(&rep.sequenceNumber);
90 + swaps(&rep.valueLen);
92 WriteToClient(client, sizeof(xVncExtGetParamReply), (char *)&rep);
96 static int SProcVncExtGetParam(ClientPtr client)
99 REQUEST(xVncExtGetParamReq);
100 - swaps(&stuff->length, n);
101 + swaps(&stuff->length);
102 REQUEST_AT_LEAST_SIZE(xVncExtGetParamReq);
103 return ProcVncExtGetParam(client);
106 param.buf[stuff->paramLen] = 0;
108 xVncExtGetParamDescReply rep;
111 rep.sequenceNumber = client->sequence;
114 rep.length = (len + 3) >> 2;
116 if (client->swapped) {
117 - swaps(&rep.sequenceNumber, n);
118 - swapl(&rep.length, n);
119 - swaps(&rep.descLen, n);
120 + swaps(&rep.sequenceNumber);
121 + swapl(&rep.length);
122 + swaps(&rep.descLen);
124 WriteToClient(client, sizeof(xVncExtGetParamDescReply), (char *)&rep);
128 static int SProcVncExtGetParamDesc(ClientPtr client)
131 REQUEST(xVncExtGetParamDescReq);
132 - swaps(&stuff->length, n);
133 + swaps(&stuff->length);
134 REQUEST_AT_LEAST_SIZE(xVncExtGetParamDescReq);
135 return ProcVncExtGetParamDesc(client);
138 REQUEST_SIZE_MATCH(xVncExtListParamsReq);
140 xVncExtListParamsReply rep;
143 rep.sequenceNumber = client->sequence;
146 rep.length = (len + 3) >> 2;
147 rep.nParams = nParams;
148 if (client->swapped) {
149 - swaps(&rep.sequenceNumber, n);
150 - swapl(&rep.length, n);
151 - swaps(&rep.nParams, n);
152 + swaps(&rep.sequenceNumber);
153 + swapl(&rep.length);
154 + swaps(&rep.nParams);
156 WriteToClient(client, sizeof(xVncExtListParamsReply), (char *)&rep);
157 rdr::U8* data = new rdr::U8[len];
160 static int SProcVncExtListParams(ClientPtr client)
163 REQUEST(xVncExtListParamsReq);
164 - swaps(&stuff->length, n);
165 + swaps(&stuff->length);
166 REQUEST_SIZE_MATCH(xVncExtListParamsReq);
167 return ProcVncExtListParams(client);
169 @@ -778,11 +767,10 @@
171 static int SProcVncExtSetServerCutText(ClientPtr client)
174 REQUEST(xVncExtSetServerCutTextReq);
175 - swaps(&stuff->length, n);
176 + swaps(&stuff->length);
177 REQUEST_AT_LEAST_SIZE(xVncExtSetServerCutTextReq);
178 - swapl(&stuff->textLen, n);
179 + swapl(&stuff->textLen);
180 return ProcVncExtSetServerCutText(client);
183 @@ -792,15 +780,14 @@
184 REQUEST_SIZE_MATCH(xVncExtGetClientCutTextReq);
186 xVncExtGetClientCutTextReply rep;
189 rep.length = (clientCutTextLen + 3) >> 2;
190 rep.sequenceNumber = client->sequence;
191 rep.textLen = clientCutTextLen;
192 if (client->swapped) {
193 - swaps(&rep.sequenceNumber, n);
194 - swapl(&rep.length, n);
195 - swapl(&rep.textLen, n);
196 + swaps(&rep.sequenceNumber);
197 + swapl(&rep.length);
198 + swapl(&rep.textLen);
200 WriteToClient(client, sizeof(xVncExtGetClientCutTextReply), (char *)&rep);
204 static int SProcVncExtGetClientCutText(ClientPtr client)
207 REQUEST(xVncExtGetClientCutTextReq);
208 - swaps(&stuff->length, n);
209 + swaps(&stuff->length);
210 REQUEST_SIZE_MATCH(xVncExtGetClientCutTextReq);
211 return ProcVncExtGetClientCutText(client);
213 @@ -842,12 +828,11 @@
215 static int SProcVncExtSelectInput(ClientPtr client)
218 REQUEST(xVncExtSelectInputReq);
219 - swaps(&stuff->length, n);
220 + swaps(&stuff->length);
221 REQUEST_SIZE_MATCH(xVncExtSelectInputReq);
222 - swapl(&stuff->window, n);
223 - swapl(&stuff->mask, n);
224 + swapl(&stuff->window);
225 + swapl(&stuff->mask);
226 return ProcVncExtSelectInput(client);
231 rep.sequenceNumber = client->sequence;
232 if (client->swapped) {
234 - swaps(&rep.sequenceNumber, n);
235 - swapl(&rep.length, n);
236 + swaps(&rep.sequenceNumber);
237 + swapl(&rep.length);
239 WriteToClient(client, sizeof(xVncExtConnectReply), (char *)&rep);
240 return (client->noClientException);
243 static int SProcVncExtConnect(ClientPtr client)
246 REQUEST(xVncExtConnectReq);
247 - swaps(&stuff->length, n);
248 + swaps(&stuff->length);
249 REQUEST_AT_LEAST_SIZE(xVncExtConnectReq);
250 return ProcVncExtConnect(client);
255 xVncExtGetQueryConnectReply rep;
258 rep.sequenceNumber = client->sequence;
259 rep.timeout = qcTimeout;
260 @@ -934,11 +916,11 @@
261 rep.opaqueId = (CARD32)(long)queryConnectId;
262 rep.length = (rep.userLen + rep.addrLen + 3) >> 2;
263 if (client->swapped) {
264 - swaps(&rep.sequenceNumber, n);
265 - swapl(&rep.userLen, n);
266 - swapl(&rep.addrLen, n);
267 - swapl(&rep.timeout, n);
268 - swapl(&rep.opaqueId, n);
269 + swaps(&rep.sequenceNumber);
270 + swapl(&rep.userLen);
271 + swapl(&rep.addrLen);
272 + swapl(&rep.timeout);
273 + swapl(&rep.opaqueId);
275 WriteToClient(client, sizeof(xVncExtGetQueryConnectReply), (char *)&rep);
279 static int SProcVncExtGetQueryConnect(ClientPtr client)
282 REQUEST(xVncExtGetQueryConnectReq);
283 - swaps(&stuff->length, n);
284 + swaps(&stuff->length);
285 REQUEST_SIZE_MATCH(xVncExtGetQueryConnectReq);
286 return ProcVncExtGetQueryConnect(client);
290 static int SProcVncExtApproveConnect(ClientPtr client)
293 REQUEST(xVncExtApproveConnectReq);
294 - swaps(&stuff->length, n);
295 - swapl(&stuff->opaqueId, n);
296 + swaps(&stuff->length);
297 + swapl(&stuff->opaqueId);
298 REQUEST_SIZE_MATCH(xVncExtApproveConnectReq);
299 return ProcVncExtApproveConnect(client);
301 --- tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h~ 2012-03-23 13:48:15.281937484 +0100
302 +++ tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h 2012-03-23 14:08:49.217553722 +0100
305 #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (11 * 100000) + (99 * 1000))
307 +#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (12 * 100000) + (99 * 1000))
310 #error "X.Org newer than 1.10 is not supported"