comctl32: Remove unneeded address-of operators from array names

Andrew Talbot andrew.talbot at talbotville.com
Mon Jul 7 16:40:28 CDT 2008


Changelog:
    comctl32: Remove unneeded address-of operators from array names.

diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index 660edde..a673b1b 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -658,11 +658,11 @@ ImageList_Create (INT cx, INT cy, UINT flags,
         himl->hbmMask = 0;
 
     /* create blending brushes */
-    hbmTemp = CreateBitmap (8, 8, 1, 1, &aBitBlend25);
+    hbmTemp = CreateBitmap (8, 8, 1, 1, aBitBlend25);
     himl->hbrBlend25 = CreatePatternBrush (hbmTemp);
     DeleteObject (hbmTemp);
 
-    hbmTemp = CreateBitmap (8, 8, 1, 1, &aBitBlend50);
+    hbmTemp = CreateBitmap (8, 8, 1, 1, aBitBlend50);
     himl->hbrBlend50 = CreatePatternBrush (hbmTemp);
     DeleteObject (hbmTemp);
 
diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c
index a9647cd..f3d54b1 100644
--- a/dlls/comctl32/monthcal.c
+++ b/dlls/comctl32/monthcal.c
@@ -1498,8 +1498,8 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam)
 
     MONTHCAL_CopyTime(&ht.st, &selArray[0]);
     MONTHCAL_CopyTime(&ht.st, &selArray[1]);
-    MONTHCAL_SetSelRange(infoPtr, (LPARAM)&selArray);
-    MONTHCAL_SetCurSel(infoPtr, (LPARAM)&selArray);
+    MONTHCAL_SetSelRange(infoPtr, (LPARAM)selArray);
+    MONTHCAL_SetCurSel(infoPtr, (LPARAM)selArray);
     TRACE("MCHT_CALENDARDATE\n");
     nmsc.nmhdr.hwndFrom = infoPtr->hwndSelf;
     nmsc.nmhdr.idFrom   = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID);
@@ -1647,7 +1647,7 @@ MONTHCAL_MouseMove(MONTHCAL_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
     SYSTEMTIME selArray[2];
     int i;
 
-    MONTHCAL_GetSelRange(infoPtr, (LPARAM)&selArray);
+    MONTHCAL_GetSelRange(infoPtr, (LPARAM)selArray);
     i = 0;
     if(infoPtr->firstSelDay==selArray[0].wDay) i=1;
     TRACE("oldRange:%d %d %d %d\n", infoPtr->firstSelDay, selArray[0].wDay, selArray[1].wDay, i);
@@ -1677,7 +1677,7 @@ MONTHCAL_MouseMove(MONTHCAL_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
         selArray[0].wDay = tempday;
       }
 
-      MONTHCAL_SetSelRange(infoPtr, (LPARAM)&selArray);
+      MONTHCAL_SetSelRange(infoPtr, (LPARAM)selArray);
     }
   }
 
diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c
index fb2191b..5368835 100644
--- a/dlls/comctl32/tooltips.c
+++ b/dlls/comctl32/tooltips.c
@@ -368,7 +368,7 @@ static void TOOLTIPS_GetDispInfoA(HWND hwnd, TOOLTIPS_INFO *infoPtr, TTTOOL_INFO
     ttnmdi.hdr.hwndFrom = hwnd;
     ttnmdi.hdr.idFrom = toolPtr->uId;
     ttnmdi.hdr.code = TTN_GETDISPINFOA; /* == TTN_NEEDTEXTA */
-    ttnmdi.lpszText = (LPSTR)&ttnmdi.szText;
+    ttnmdi.lpszText = (LPSTR)ttnmdi.szText;
     ttnmdi.uFlags = toolPtr->uFlags;
     ttnmdi.lParam = toolPtr->lParam;
 
@@ -424,7 +424,7 @@ static void TOOLTIPS_GetDispInfoW(HWND hwnd, TOOLTIPS_INFO *infoPtr, TTTOOL_INFO
     ttnmdi.hdr.hwndFrom = hwnd;
     ttnmdi.hdr.idFrom = toolPtr->uId;
     ttnmdi.hdr.code = TTN_GETDISPINFOW; /* == TTN_NEEDTEXTW */
-    ttnmdi.lpszText = (LPWSTR)&ttnmdi.szText;
+    ttnmdi.lpszText = (LPWSTR)ttnmdi.szText;
     ttnmdi.uFlags = toolPtr->uFlags;
     ttnmdi.lParam = toolPtr->lParam;
 



More information about the wine-patches mailing list