Skip to content

W
wine-winehq
Commit 9b5d26ed authored by Andrew Talbot's avatar Andrew Talbot Committed by Alexandre Julliard
Browse files
Options

winex11.drv: Remove unneeded address-of operators from array names.

parent 1fd750cf
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
dlls/winex11.drv/wintab.c
View file @ 9b5d26ed
...@@ -1129,7 +1129,7 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) ...@@ -1129,7 +1129,7 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput)
sizeof(LOGCONTEXTW)); sizeof(LOGCONTEXTW));
break; break;
case CTX_NAME: case CTX_NAME:
rc = CopyTabletData(lpOutput, &gSysContext.lcName, rc = CopyTabletData(lpOutput, gSysContext.lcName,
(strlenW(gSysContext.lcName)+1) * sizeof(WCHAR)); (strlenW(gSysContext.lcName)+1) * sizeof(WCHAR));
break; break;
case CTX_OPTIONS: case CTX_OPTIONS:
...@@ -1293,7 +1293,7 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) ...@@ -1293,7 +1293,7 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput)
switch (nIndex) switch (nIndex)
{ {
case CSR_NAME: case CSR_NAME:
rc = CopyTabletData(lpOutput, &tgtcursor->NAME, rc = CopyTabletData(lpOutput, tgtcursor->NAME,
(strlenW(tgtcursor->NAME)+1) * sizeof(WCHAR)); (strlenW(tgtcursor->NAME)+1) * sizeof(WCHAR));
break; break;
case CSR_ACTIVE: case CSR_ACTIVE:
...@@ -1318,15 +1318,15 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) ...@@ -1318,15 +1318,15 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput)
tgtcursor->cchBTNNAMES*sizeof(WCHAR)); tgtcursor->cchBTNNAMES*sizeof(WCHAR));
break; break;
case CSR_BUTTONMAP: case CSR_BUTTONMAP:
rc = CopyTabletData(lpOutput,&tgtcursor->BUTTONMAP, rc = CopyTabletData(lpOutput,tgtcursor->BUTTONMAP,
sizeof(BYTE)*32); sizeof(BYTE)*32);
break; break;
case CSR_SYSBTNMAP: case CSR_SYSBTNMAP:
rc = CopyTabletData(lpOutput,&tgtcursor->SYSBTNMAP, rc = CopyTabletData(lpOutput,tgtcursor->SYSBTNMAP,
sizeof(BYTE)*32); sizeof(BYTE)*32);
break; break;
case CSR_NPBTNMARKS: case CSR_NPBTNMARKS:
rc = CopyTabletData(lpOutput,&tgtcursor->NPBTNMARKS, rc = CopyTabletData(lpOutput,tgtcursor->NPBTNMARKS,
sizeof(UINT)*2); sizeof(UINT)*2);
break; break;
case CSR_NPBUTTON: case CSR_NPBUTTON:
...@@ -1342,7 +1342,7 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) ...@@ -1342,7 +1342,7 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput)
sizeof(BYTE)); sizeof(BYTE));
break; break;
case CSR_TPBTNMARKS: case CSR_TPBTNMARKS:
rc = CopyTabletData(lpOutput,&tgtcursor->TPBTNMARKS, rc = CopyTabletData(lpOutput,tgtcursor->TPBTNMARKS,
sizeof(UINT)*2); sizeof(UINT)*2);
break; break;
case CSR_TPRESPONSE: case CSR_TPRESPONSE:
...@@ -1458,7 +1458,7 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) ...@@ -1458,7 +1458,7 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput)
*/ */
break; break;
case DVC_ORIENTATION: case DVC_ORIENTATION:
rc = CopyTabletData(lpOutput,&gSysDevice.ORIENTATION, rc = CopyTabletData(lpOutput,gSysDevice.ORIENTATION,
sizeof(AXIS)*3); sizeof(AXIS)*3);
break; break;
case DVC_ROTATION: case DVC_ROTATION:
......
dlls/winex11.drv/xrender.c
View file @ 9b5d26ed
...@@ -502,7 +502,7 @@ static void lfsz_calc_hash(LFANDSIZE *plfsz) ...@@ -502,7 +502,7 @@ static void lfsz_calc_hash(LFANDSIZE *plfsz)
hash ^= plfsz->devsize.cy; hash ^= plfsz->devsize.cy;
for(i = 0, ptr = (DWORD*)&plfsz->lf; i < 7; i++, ptr++) for(i = 0, ptr = (DWORD*)&plfsz->lf; i < 7; i++, ptr++)
hash ^= *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; WCHAR *pwc = (WCHAR *)ptr;
if(!*pwc) break; if(!*pwc) break;
hash ^= *ptr; hash ^= *ptr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment