Michael Stefaniuc : oleaut32: Remove superfluous casts of void pointers to other pointer types.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ab7e33641b36fb1e78d9e9af4851090022dc095e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ab7e33641b36fb1e78d9e9af48...

Author: Michael Stefaniuc 
Date:   Wed Jun 27 00:12:48 2007 +0200

oleaut32: Remove superfluous casts of void pointers to other pointer types.

---

dlls/oleaut32/tests/tmarshal.c   |    4 ++--
 dlls/oleaut32/tests/usrmarshal.c |   10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c
index f7400e4..c96fb33 100644
--- a/dlls/oleaut32/tests/tmarshal.c
+++ b/dlls/oleaut32/tests/tmarshal.c
@@ -579,7 +579,7 @@ static HRESULT register_current_module_typelib(void)

static IWidget *Widget_Create(void)
 {
-    Widget *This = (Widget *)HeapAlloc(GetProcessHeap(), 0, sizeof(*This));
+    Widget *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This));
     HRESULT hr;
     ITypeLib *pTypeLib;

@@ -698,7 +698,7 @@ static IKindaEnumWidget *KindaEnumWidget_Create(void)
 {
     KindaEnum *This;

-    This = (KindaEnum *)HeapAlloc(GetProcessHeap(), 0, sizeof(*This));
+    This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This));
     if (!This) return NULL;
     This->lpVtbl = &KindaEnumWidget_VTable;
     This->refs = 1;
diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c
index 21714c4..633a382 100644
--- a/dlls/oleaut32/tests/usrmarshal.c
+++ b/dlls/oleaut32/tests/usrmarshal.c
@@ -192,7 +192,7 @@ static void test_marshal_LPSAFEARRAY(void)
     ok(size == 68, "size should be 68 bytes, not %ld\n", size);
     size = LPSAFEARRAY_UserSize(&umcb.Flags, 0, &lpsa);
     ok(size == 64, "size should be 64 bytes, not %ld\n", size);
-    buffer = (unsigned char *)HeapAlloc(GetProcessHeap(), 0, size);
+    buffer = HeapAlloc(GetProcessHeap(), 0, size);
     LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa);

check_safearray(buffer, lpsa);
@@ -215,7 +215,7 @@ static void test_marshal_LPSAFEARRAY(void)

size = LPSAFEARRAY_UserSize(&umcb.Flags, 0, &lpsa);
     ok(size == 4, "size should be 4 bytes, not %ld\n", size);
-    buffer = (unsigned char *)HeapAlloc(GetProcessHeap(), 0, size);
+    buffer = HeapAlloc(GetProcessHeap(), 0, size);
     LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa);
     check_safearray(buffer, lpsa);

@@ -238,7 +238,7 @@ static void test_marshal_LPSAFEARRAY(void)
     ok(size == 128, "size should be 128 bytes, not %ld\n", size);
     size = LPSAFEARRAY_UserSize(&umcb.Flags, 0, &lpsa);
     ok(size == 128, "size should be 128 bytes, not %ld\n", size);
-    buffer = (unsigned char *)HeapAlloc(GetProcessHeap(), 0, size);
+    buffer = HeapAlloc(GetProcessHeap(), 0, size);
     LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa);

check_safearray(buffer, lpsa);
@@ -260,7 +260,7 @@ static void test_marshal_LPSAFEARRAY(void)

size = LPSAFEARRAY_UserSize(&umcb.Flags, 0, &lpsa);
     ok(size == 432, "size %ld\n", size);
-    buffer = (unsigned char *)HeapAlloc(GetProcessHeap(), 0, size);
+    buffer = HeapAlloc(GetProcessHeap(), 0, size);
     LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa);
     check_safearray(buffer, lpsa);
     HeapFree(GetProcessHeap(), 0, buffer);
@@ -283,7 +283,7 @@ static void test_marshal_LPSAFEARRAY(void)
     size = LPSAFEARRAY_UserSize(&umcb.Flags, 0, &lpsa);
     todo_wine
     ok(size == 1388, "size %ld\n", size);
-    buffer = (unsigned char *)HeapAlloc(GetProcessHeap(), 0, size);
+    buffer = HeapAlloc(GetProcessHeap(), 0, size);
     LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa);
     check_safearray(buffer, lpsa);
     HeapFree(GetProcessHeap(), 0, buffer);