From 120584d5c5e3efe8414e6b9029db55623f8cb9c3 Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Thu, 8 Jan 2009 00:36:51 +0100 Subject: [PATCH] mapi32: Remove superfluous casts. --- dlls/mapi32/imalloc.c | 2 +- dlls/mapi32/tests/imalloc.c | 3 +-- dlls/mapi32/tests/prop.c | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/mapi32/imalloc.c b/dlls/mapi32/imalloc.c index c5b4570da1a..a913eee022d 100644 --- a/dlls/mapi32/imalloc.c +++ b/dlls/mapi32/imalloc.c @@ -78,7 +78,7 @@ static HRESULT WINAPI IMAPIMalloc_fnQueryInterface(LPMALLOC iface, REFIID refiid if (IsEqualIID(refiid, &IID_IUnknown) || IsEqualIID(refiid, &IID_IMalloc)) { - *ppvObj = (LPMALLOC) &MAPI_IMalloc; + *ppvObj = &MAPI_IMalloc; TRACE("Returning IMalloc (%p)\n", *ppvObj); return S_OK; } diff --git a/dlls/mapi32/tests/imalloc.c b/dlls/mapi32/tests/imalloc.c index 63c66f27747..5e3a06014f3 100644 --- a/dlls/mapi32/tests/imalloc.c +++ b/dlls/mapi32/tests/imalloc.c @@ -64,8 +64,7 @@ static void test_IMalloc(void) /* Prove that native mapi uses LocalAlloc/LocalFree */ lpMem = IMalloc_Alloc(lpMalloc, 61); - ok (lpMem && IMalloc_GetSize(lpMalloc, lpMem) == - LocalSize((HANDLE)lpMem), + ok (lpMem && IMalloc_GetSize(lpMalloc, lpMem) == LocalSize(lpMem), "Expected non-null, same size, got %p, %s size\n", lpMem, lpMem ? "different" : "same"); diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index a2b92891934..0e979d15e08 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -93,11 +93,11 @@ static void test_PropCopyMore(void) if (!pPropCopyMore) return; - scode = pMAPIAllocateBuffer(sizeof(LPSPropValue), (LPVOID *)lpDest); + scode = pMAPIAllocateBuffer(sizeof(LPSPropValue), lpDest); if (FAILED(scode)) return; - scode = pMAPIAllocateMore(sizeof(LPSPropValue), lpDest, (LPVOID *)lpSrc); + scode = pMAPIAllocateMore(sizeof(LPSPropValue), lpDest, lpSrc); if (FAILED(scode)) return;