frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'origin' into randr-1.2

This commit is contained in:
Keith Packard 2006-11-07 01:21:28 -08:00
parent 028bbdc041 3d39c02fe6
commit c20d3bf753
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Xext/security.c
View File

@ -1122,11 +1122,11 @@ CALLBACK(SecurityClientStateCallback)
switch (client->clientState) switch (client->clientState)
{ {
case ClientStateInitial: case ClientStateInitial:
TRUSTLEVEL(serverClient) = XSecurityClientTrusted; TRUSTLEVEL(client) = XSecurityClientTrusted;
AUTHID(serverClient) = None; AUTHID(client) = None;
break; break;
case ClientStateRunning: case ClientStateRunning:
{ {
XID authId = AuthorizationIDOfClient(client); XID authId = AuthorizationIDOfClient(client);
SecurityAuthorizationPtr pAuth; SecurityAuthorizationPtr pAuth;
@ -1146,8 +1146,8 @@ CALLBACK(SecurityClientStateCallback)
} }
break; break;
} }
case ClientStateGone: case ClientStateGone:
case ClientStateRetained: /* client disconnected */ case ClientStateRetained: /* client disconnected */
{ {
SecurityAuthorizationPtr pAuth; SecurityAuthorizationPtr pAuth;
@ -1167,7 +1167,7 @@ CALLBACK(SecurityClientStateCallback)
} }
break; break;
} }
default: break; default: break;
} }
} /* SecurityClientStateCallback */ } /* SecurityClientStateCallback */

1
dix/dispatch.c
View File

@ -3682,7 +3682,6 @@ extern unsigned totalClientSize;
void InitClient(ClientPtr client, int i, pointer ospriv) void InitClient(ClientPtr client, int i, pointer ospriv)
{ {
bzero(client, totalClientSize);
client->index = i; client->index = i;
client->sequence = 0; client->sequence = 0;
client->clientAsMask = ((Mask)i) << CLIENTOFFSET; client->clientAsMask = ((Mask)i) << CLIENTOFFSET;

2
hw/kdrive/vesa/vbe.c
View File

@ -101,7 +101,7 @@ VbeReportVib(Vm86InfoPtr vi, VbeInfoBlock *vib)
} }
ErrorF(")\n"); ErrorF(")\n");
ErrorF("DAC is %s, controller is %sVGA compatible%s\n", ErrorF("DAC is %s, controller is %sVGA compatible%s\n",
(vib->Capabilities[0]&1)?"fixed":"switchable", (vib->Capabilities[0]&1)?"switchable":"fixed",
(vib->Capabilities[0]&2)?"not ":"", (vib->Capabilities[0]&2)?"not ":"",
(vib->Capabilities[0]&3)?", RAMDAC causes snow":""); (vib->Capabilities[0]&3)?", RAMDAC causes snow":"");
ErrorF("Total memory: %lu kilobytes\n", 64L*vib->TotalMemory); ErrorF("Total memory: %lu kilobytes\n", 64L*vib->TotalMemory);

31
hw/kdrive/vesa/vm86.c
View File

@ -235,13 +235,9 @@ Vm86DoInterrupt(Vm86InfoPtr vi, int num)
OsBlockSignals (); OsBlockSignals ();
code = vm86_loop(vi); code = vm86_loop(vi);
OsReleaseSignals (); OsReleaseSignals ();
if(code < 0) { if(code != 0)
ErrorF("vm86 failed (errno %d)\n", errno);
return -1; return -1;
} else if(code != 0) { else
ErrorF("vm86 returned 0x%04X\n", code);
return -1;
} else
return 0; return 0;
} }
@ -269,14 +265,10 @@ Vm86DoPOST(Vm86InfoPtr vi)
OsBlockSignals (); OsBlockSignals ();
code = vm86_loop(vi); code = vm86_loop(vi);
OsReleaseSignals (); OsReleaseSignals ();
if(code < 0) { if(code != 0)
ErrorF("vm86 failed (errno %d)\n", errno);
return -1; return -1;
} else if(code != 0) { else
ErrorF("vm86 returned 0x%04X\n", code); return 0;
return -1;
} else
return 0;
} }
#define DEBUG_VBE 0 #define DEBUG_VBE 0
@ -573,8 +565,17 @@ vm86_loop(Vm86InfoPtr vi)
Vm86Debug(vi); Vm86Debug(vi);
return -1; return -1;
default: default:
ErrorF("Unexpected result code 0x%X from vm86\n", code); if(code < 0) {
Vm86Debug(vi); if(errno == ENOSYS) {
ErrorF("No vm86 support. Are you running on AMD64?\n");
} else {
ErrorF("vm86 failed (errno = %d).\n", errno);
Vm86Debug(vi);
}
} else {
ErrorF("Unexpected result code 0x%X from vm86\n", code);
Vm86Debug(vi);
}
return -1; return -1;
} }
} }