ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Remove unneeded address-of operators from array names.

Browse Source
This commit is contained in:
Andrew Talbot 2008-07-11 10:41:42 +01:00 committed by Alexandre Julliard
parent 0f75796a28
commit 741b65c200
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/ntdll/cdrom.c
View File

@ -567,7 +567,7 @@ static int CDROM_GetInterfaceInfo(int fd, UCHAR* iface, UCHAR* port, UCHAR* devi
{ {
#ifdef SCSI_IOCTL_GET_IDLUN #ifdef SCSI_IOCTL_GET_IDLUN
UINT32 idlun[2]; UINT32 idlun[2];
if (ioctl(fd, SCSI_IOCTL_GET_IDLUN, &idlun) != -1) if (ioctl(fd, SCSI_IOCTL_GET_IDLUN, idlun) != -1)
{ {
*port = (idlun[0] >> 24) & 0xff; *port = (idlun[0] >> 24) & 0xff;
*iface = ((idlun[0] >> 16) & 0xff) + 2; *iface = ((idlun[0] >> 16) & 0xff) + 2;

2
dlls/ntdll/heap.c
View File

@ -1106,7 +1106,7 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c
processHeap = subheap->heap; /* assume the first heap we create is the process main heap */ processHeap = subheap->heap; /* assume the first heap we create is the process main heap */
list_init( &processHeap->entry ); list_init( &processHeap->entry );
/* make sure structure alignment is correct */ /* make sure structure alignment is correct */
assert( (ULONG_PTR)&processHeap->freeList % ALIGNMENT == 0 ); assert( (ULONG_PTR)processHeap->freeList % ALIGNMENT == 0 );
} }
return (HANDLE)subheap->heap; return (HANDLE)subheap->heap;

10
dlls/ntdll/nt.c
View File

@ -170,11 +170,11 @@ NTSTATUS WINAPI NtAdjustPrivilegesToken(
req->get_modified_state = (PreviousState != NULL); req->get_modified_state = (PreviousState != NULL);
if (!DisableAllPrivileges) if (!DisableAllPrivileges)
{ {
wine_server_add_data( req, &NewState->Privileges, wine_server_add_data( req, NewState->Privileges,
NewState->PrivilegeCount * sizeof(NewState->Privileges[0]) ); NewState->PrivilegeCount * sizeof(NewState->Privileges[0]) );
} }
if (PreviousState && BufferLength >= FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges )) if (PreviousState && BufferLength >= FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges ))
wine_server_set_reply( req, &PreviousState->Privileges, wine_server_set_reply( req, PreviousState->Privileges,
BufferLength - FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges ) ); BufferLength - FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges ) );
ret = wine_server_call( req ); ret = wine_server_call( req );
if (PreviousState) if (PreviousState)
@ -347,7 +347,7 @@ NTSTATUS WINAPI NtQueryInformationToken(
TOKEN_PRIVILEGES *tpriv = tokeninfo; TOKEN_PRIVILEGES *tpriv = tokeninfo;
req->handle = token; req->handle = token;
if (tpriv && tokeninfolength > FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges )) if (tpriv && tokeninfolength > FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges ))
wine_server_set_reply( req, &tpriv->Privileges, tokeninfolength - FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges ) ); wine_server_set_reply( req, tpriv->Privileges, tokeninfolength - FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges ) );
status = wine_server_call( req ); status = wine_server_call( req );
if (retlen) *retlen = FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges ) + reply->len; if (retlen) *retlen = FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges ) + reply->len;
if (tpriv) tpriv->PrivilegeCount = reply->len / sizeof(LUID_AND_ATTRIBUTES); if (tpriv) tpriv->PrivilegeCount = reply->len / sizeof(LUID_AND_ATTRIBUTES);
@ -471,9 +471,9 @@ NTSTATUS WINAPI NtPrivilegeCheck(
{ {
req->handle = ClientToken; req->handle = ClientToken;
req->all_required = ((RequiredPrivileges->Control & PRIVILEGE_SET_ALL_NECESSARY) ? TRUE : FALSE); req->all_required = ((RequiredPrivileges->Control & PRIVILEGE_SET_ALL_NECESSARY) ? TRUE : FALSE);
wine_server_add_data( req, &RequiredPrivileges->Privilege, wine_server_add_data( req, RequiredPrivileges->Privilege,
RequiredPrivileges->PrivilegeCount * sizeof(RequiredPrivileges->Privilege[0]) ); RequiredPrivileges->PrivilegeCount * sizeof(RequiredPrivileges->Privilege[0]) );
wine_server_set_reply( req, &RequiredPrivileges->Privilege, wine_server_set_reply( req, RequiredPrivileges->Privilege,
RequiredPrivileges->PrivilegeCount * sizeof(RequiredPrivileges->Privilege[0]) ); RequiredPrivileges->PrivilegeCount * sizeof(RequiredPrivileges->Privilege[0]) );
status = wine_server_call( req ); status = wine_server_call( req );

2
dlls/ntdll/sec.c
View File

@ -1577,7 +1577,7 @@ NtAccessCheck(
wine_server_add_data( req, sacl, sd.sacl_len ); wine_server_add_data( req, sacl, sd.sacl_len );
wine_server_add_data( req, dacl, sd.dacl_len ); wine_server_add_data( req, dacl, sd.dacl_len );
wine_server_set_reply( req, &PrivilegeSet->Privilege, *ReturnLength - FIELD_OFFSET( PRIVILEGE_SET, Privilege ) ); wine_server_set_reply( req, PrivilegeSet->Privilege, *ReturnLength - FIELD_OFFSET( PRIVILEGE_SET, Privilege ) );
status = wine_server_call( req ); status = wine_server_call( req );