From 9b5d26ed8b7b581891d004fb13331794cf8716d4 Mon Sep 17 00:00:00 2001
From: Andrew Talbot <andrew.talbot@talbotville.com>
Date: Sat, 12 Jul 2008 20:37:27 +0100
Subject: [PATCH] winex11.drv: Remove unneeded address-of operators from array
 names.

---
 dlls/winex11.drv/wintab.c  | 14 +++++++-------
 dlls/winex11.drv/xrender.c |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c
index 4a77c1b2446..5793e2c3f5c 100644
--- a/dlls/winex11.drv/wintab.c
+++ b/dlls/winex11.drv/wintab.c
@@ -1129,7 +1129,7 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput)
                             sizeof(LOGCONTEXTW));
                     break;
                 case CTX_NAME:
-                    rc = CopyTabletData(lpOutput, &gSysContext.lcName,
+                    rc = CopyTabletData(lpOutput, gSysContext.lcName,
                          (strlenW(gSysContext.lcName)+1) * sizeof(WCHAR));
                     break;
                 case CTX_OPTIONS:
@@ -1293,7 +1293,7 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput)
                 switch (nIndex)
                 {
                     case CSR_NAME:
-                        rc = CopyTabletData(lpOutput, &tgtcursor->NAME,
+                        rc = CopyTabletData(lpOutput, tgtcursor->NAME,
                                             (strlenW(tgtcursor->NAME)+1) * sizeof(WCHAR));
                         break;
                     case CSR_ACTIVE:
@@ -1318,15 +1318,15 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput)
                                             tgtcursor->cchBTNNAMES*sizeof(WCHAR));
                         break;
                     case CSR_BUTTONMAP:
-                        rc = CopyTabletData(lpOutput,&tgtcursor->BUTTONMAP,
+                        rc = CopyTabletData(lpOutput,tgtcursor->BUTTONMAP,
                                             sizeof(BYTE)*32);
                         break;
                     case CSR_SYSBTNMAP:
-                        rc = CopyTabletData(lpOutput,&tgtcursor->SYSBTNMAP,
+                        rc = CopyTabletData(lpOutput,tgtcursor->SYSBTNMAP,
                                             sizeof(BYTE)*32);
                         break;
                     case CSR_NPBTNMARKS:
-                        rc = CopyTabletData(lpOutput,&tgtcursor->NPBTNMARKS,
+                        rc = CopyTabletData(lpOutput,tgtcursor->NPBTNMARKS,
                                             sizeof(UINT)*2);
                         break;
                     case CSR_NPBUTTON:
@@ -1342,7 +1342,7 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput)
                                             sizeof(BYTE));
                         break;
                     case CSR_TPBTNMARKS:
-                        rc = CopyTabletData(lpOutput,&tgtcursor->TPBTNMARKS,
+                        rc = CopyTabletData(lpOutput,tgtcursor->TPBTNMARKS,
                                             sizeof(UINT)*2);
                         break;
                     case CSR_TPRESPONSE:
@@ -1458,7 +1458,7 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput)
                     */
                     break;
                 case DVC_ORIENTATION:
-                    rc = CopyTabletData(lpOutput,&gSysDevice.ORIENTATION,
+                    rc = CopyTabletData(lpOutput,gSysDevice.ORIENTATION,
                                         sizeof(AXIS)*3);
                     break;
                 case DVC_ROTATION:
diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c
index 554ce251788..c7dac70293c 100644
--- a/dlls/winex11.drv/xrender.c
+++ b/dlls/winex11.drv/xrender.c
@@ -502,7 +502,7 @@ static void lfsz_calc_hash(LFANDSIZE *plfsz)
   hash ^= plfsz->devsize.cy;
   for(i = 0, ptr = (DWORD*)&plfsz->lf; i < 7; i++, ptr++)
     hash ^= *ptr;
-  for(i = 0, ptr = (DWORD*)&plfsz->lf.lfFaceName; i < LF_FACESIZE/2; i++, ptr++) {
+  for(i = 0, ptr = (DWORD*)plfsz->lf.lfFaceName; i < LF_FACESIZE/2; i++, ptr++) {
     WCHAR *pwc = (WCHAR *)ptr;
     if(!*pwc) break;
     hash ^= *ptr;