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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 741b65c200d3b075835eb277e31078595accbc11
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=741b65c200d3b075835eb277e3...

Author: Andrew Talbot <andrew.talbot(a)talbotville.com>
Date:   Fri Jul 11 10:41:42 2008 +0100

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

---

 dlls/ntdll/cdrom.c |    2 +-
 dlls/ntdll/heap.c  |    2 +-
 dlls/ntdll/nt.c    |   10 +++++-----
 dlls/ntdll/sec.c   |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c
index 47bda87..f6fed81 100644
--- a/dlls/ntdll/cdrom.c
+++ b/dlls/ntdll/cdrom.c
@@ -567,7 +567,7 @@ static int CDROM_GetInterfaceInfo(int fd, UCHAR* iface, UCHAR* port, UCHAR* devi
     {
 #ifdef SCSI_IOCTL_GET_IDLUN
         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;
             *iface = ((idlun[0] >> 16) & 0xff) + 2;
diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index 2b87e10..d57db49 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -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 */
         list_init( &processHeap->entry );
         /* make sure structure alignment is correct */
-        assert( (ULONG_PTR)&processHeap->freeList % ALIGNMENT == 0 );
+        assert( (ULONG_PTR)processHeap->freeList % ALIGNMENT == 0 );
     }
 
     return (HANDLE)subheap->heap;
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index c241e94..18b8309 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -170,11 +170,11 @@ NTSTATUS WINAPI NtAdjustPrivilegesToken(
         req->get_modified_state = (PreviousState != NULL);
         if (!DisableAllPrivileges)
         {
-            wine_server_add_data( req, &NewState->Privileges,
+            wine_server_add_data( req, NewState->Privileges,
                                   NewState->PrivilegeCount * sizeof(NewState->Privileges[0]) );
         }
         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 ) );
         ret = wine_server_call( req );
         if (PreviousState)
@@ -347,7 +347,7 @@ NTSTATUS WINAPI NtQueryInformationToken(
             TOKEN_PRIVILEGES *tpriv = tokeninfo;
             req->handle = token;
             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 );
             if (retlen) *retlen = FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges ) + reply->len;
             if (tpriv) tpriv->PrivilegeCount = reply->len / sizeof(LUID_AND_ATTRIBUTES);
@@ -471,9 +471,9 @@ NTSTATUS WINAPI NtPrivilegeCheck(
     {
         req->handle = ClientToken;
         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]) );
-        wine_server_set_reply( req, &RequiredPrivileges->Privilege,
+        wine_server_set_reply( req, RequiredPrivileges->Privilege,
             RequiredPrivileges->PrivilegeCount * sizeof(RequiredPrivileges->Privilege[0]) );
 
         status = wine_server_call( req );
diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c
index 7dad537..af3a138 100644
--- a/dlls/ntdll/sec.c
+++ b/dlls/ntdll/sec.c
@@ -1577,7 +1577,7 @@ NtAccessCheck(
         wine_server_add_data( req, sacl, sd.sacl_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 );