commit 9ed61de9a2c41f2a6c0b207f70fd13b991a4d781
author Jakob Eriksson <jakov@vmlinux.org> Thu Mar 24 21:01:35 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Mar 24 21:01:35 2005 +0000
tree 0dde10e4f521255c538083a82ef7ad0ee532167b
parent 23d9ac25b27aea45c546932f9caae0b269800e10

Get rid of HeapAlloc casts.

dlls/ddraw/d3ddevice/mesa.c

diff --git a/dlls/ddraw/d3ddevice/mesa.c b/dlls/ddraw/d3ddevice/mesa.c
index 6445e90..4e4f575 100644
--- a/dlls/ddraw/d3ddevice/mesa.c
+++ b/dlls/ddraw/d3ddevice/mesa.c
@@ -3992,14 +3992,14 @@
     }
     
     /* Allocate memory for the matrices */
-    object->world_mat = (D3DMATRIX *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 16 * sizeof(float));
-    object->view_mat  = (D3DMATRIX *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 16 * sizeof(float));
-    object->proj_mat  = (D3DMATRIX *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 16 * sizeof(float));
+    object->world_mat = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 16 * sizeof(float));
+    object->view_mat  = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 16 * sizeof(float));
+    object->proj_mat  = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 16 * sizeof(float));
     memcpy(object->world_mat, id_mat, 16 * sizeof(float));
     memcpy(object->view_mat , id_mat, 16 * sizeof(float));
     memcpy(object->proj_mat , id_mat, 16 * sizeof(float));
     for (tex_num = 0; tex_num < MAX_TEXTURES; tex_num++) {
-        object->tex_mat[tex_num] = (D3DMATRIX *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 16 * sizeof(float));
+        object->tex_mat[tex_num] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 16 * sizeof(float));
 	memcpy(object->tex_mat[tex_num], id_mat, 16 * sizeof(float));
 	object->tex_mat_is_identity[tex_num] = TRUE;
     }
@@ -4011,7 +4011,7 @@
 
     /* allocate the clipping planes */
     object->max_clipping_planes = opengl_device_caps.wMaxUserClipPlanes;
-    object->clipping_planes = (d3d7clippingplane*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, object->max_clipping_planes * sizeof(d3d7clippingplane));
+    object->clipping_planes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, object->max_clipping_planes * sizeof(d3d7clippingplane));
 
     glHint(GL_FOG_HINT,GL_NICEST);
 

dlls/ddraw/dsurface/dib.c

diff --git a/dlls/ddraw/dsurface/dib.c b/dlls/ddraw/dsurface/dib.c
index b462c66..52c7ad6 100644
--- a/dlls/ddraw/dsurface/dib.c
+++ b/dlls/ddraw/dsurface/dib.c
@@ -78,22 +78,21 @@
     case 16:
     case 32:
 	/* Allocate extra space to store the RGB bit masks. */
-	b_info = (BITMAPINFO*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
-					sizeof(BITMAPINFOHEADER)
-					+ 3 * sizeof(DWORD));
+	b_info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
+                           sizeof(BITMAPINFOHEADER) + 3 * sizeof(DWORD));
 	break;
 
     case 24:
-	b_info = (BITMAPINFO*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
-					sizeof(BITMAPINFOHEADER));
+	b_info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
+                           sizeof(BITMAPINFOHEADER));
 	break;
 
     default:
 	/* Allocate extra space for a palette. */
-	b_info = (BITMAPINFO*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
-					sizeof(BITMAPINFOHEADER)
-					+ sizeof(RGBQUAD)
-					* (1 << This->surface_desc.u4.ddpfPixelFormat.u1.dwRGBBitCount));
+	b_info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
+                           sizeof(BITMAPINFOHEADER)
+                           + sizeof(RGBQUAD)
+                           * (1 << This->surface_desc.u4.ddpfPixelFormat.u1.dwRGBBitCount));
 	break;
     }