HeapAlloc casts

[Jakob Eriksson]

-------------- next part --------------
Index: dlls/comctl32/comctl32undoc.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl32undoc.c,v
retrieving revision 1.96
diff -u -r1.96 comctl32undoc.c
--- dlls/comctl32/comctl32undoc.c	20 Dec 2004 19:27:07 -0000	1.96
+++ dlls/comctl32/comctl32undoc.c	22 Mar 2005 08:51:31 -0000
@@ -1824,7 +1824,7 @@
 
     if (!hdpaNew) {
 	/* create a new DPA */
-	hdpaTemp = (HDPA)HeapAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
+	hdpaTemp = HeapAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
 				    sizeof(*hdpaTemp));
 	hdpaTemp->hHeap = hdpa->hHeap;
 	hdpaTemp->nGrow = hdpa->nGrow;
@@ -1844,8 +1844,7 @@
     nNewItems = hdpaTemp->nGrow *
 		((INT)((hdpa->nItemCount - 1) / hdpaTemp->nGrow) + 1);
     nSize = nNewItems * sizeof(LPVOID);
-    hdpaTemp->ptrs =
-	(LPVOID*)HeapAlloc (hdpaTemp->hHeap, HEAP_ZERO_MEMORY, nSize);
+    hdpaTemp->ptrs = HeapAlloc (hdpaTemp->hHeap, HEAP_ZERO_MEMORY, nSize);
     hdpaTemp->nMaxCount = nNewItems;
 
     /* clone the pointer array */
@@ -1985,9 +1984,9 @@
 	    INT nSize = nNewItems * sizeof(LPVOID);
 
 	    if (hdpa->ptrs)
-	        lpTemp = (LPVOID*)HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY, hdpa->ptrs, nSize);
+	        lpTemp = HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY, hdpa->ptrs, nSize);
 	    else
-		lpTemp = (LPVOID*)HeapAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY, nSize);
+		lpTemp = HeapAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY, nSize);
 	    
 	    if (!lpTemp)
 		return FALSE;
@@ -2046,7 +2045,7 @@
     if ((hdpa->nMaxCount - hdpa->nItemCount) >= hdpa->nGrow) {
 	INT nNewItems = max(hdpa->nGrow * 2, hdpa->nItemCount);
 	nSize = nNewItems * sizeof(LPVOID);
-	lpDest = (LPVOID)HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
+	lpDest = HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
 				      hdpa->ptrs, nSize);
 	if (!lpDest)
 	    return NULL;
@@ -2083,7 +2082,7 @@
 
     hdpa->nItemCount = 0;
     hdpa->nMaxCount = hdpa->nGrow * 2;
-    hdpa->ptrs = (LPVOID*)HeapAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
+    hdpa->ptrs = HeapAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
 				     hdpa->nMaxCount * sizeof(LPVOID));
 
     return TRUE;
@@ -2280,7 +2279,7 @@
     TRACE("(%d %p)\n", nGrow, hHeap);
 
     if (hHeap)
-	hdpa = (HDPA)HeapAlloc (hHeap, HEAP_ZERO_MEMORY, sizeof(*hdpa));
+	hdpa = HeapAlloc (hHeap, HEAP_ZERO_MEMORY, sizeof(*hdpa));
     else
 	hdpa = Alloc (sizeof(*hdpa));