Andrew Talbot : mapi32: Remove unneeded casts.
Alexandre Julliard
julliard at winehq.org
Fri Dec 21 07:28:25 CST 2007
Module: wine
Branch: master
Commit: d05a511d0b7bdd611ba711752de1603ac0375217
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05a511d0b7bdd611ba711752de1603ac0375217
Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date: Thu Dec 20 12:17:37 2007 +0000
mapi32: Remove unneeded casts.
---
dlls/mapi32/imalloc.c | 8 ++++----
dlls/mapi32/prop.c | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/mapi32/imalloc.c b/dlls/mapi32/imalloc.c
index 1562b7b..c5b4570 100644
--- a/dlls/mapi32/imalloc.c
+++ b/dlls/mapi32/imalloc.c
@@ -127,9 +127,9 @@ static LPVOID WINAPI IMAPIMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, DWORD cb)
return LocalAlloc(LMEM_FIXED, cb);
if (cb)
- return LocalReAlloc((HANDLE) pv, cb, LMEM_MOVEABLE);
+ return LocalReAlloc(pv, cb, LMEM_MOVEABLE);
- LocalFree((HANDLE) pv);
+ LocalFree(pv);
return NULL;
}
@@ -139,7 +139,7 @@ static LPVOID WINAPI IMAPIMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, DWORD cb)
static void WINAPI IMAPIMalloc_fnFree(LPMALLOC iface, LPVOID pv)
{
TRACE("(%p)->(%p)\n", iface, pv);
- LocalFree((HANDLE) pv);
+ LocalFree(pv);
}
/**************************************************************************
@@ -148,7 +148,7 @@ static void WINAPI IMAPIMalloc_fnFree(LPMALLOC iface, LPVOID pv)
static DWORD WINAPI IMAPIMalloc_fnGetSize(LPMALLOC iface, LPVOID pv)
{
TRACE("(%p)->(%p)\n", iface, pv);
- return LocalSize((HANDLE) pv);
+ return LocalSize(pv);
}
/**************************************************************************
diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c
index 484e64a..e58df4d 100644
--- a/dlls/mapi32/prop.c
+++ b/dlls/mapi32/prop.c
@@ -928,7 +928,7 @@ SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld,
LPVOID lpNew, ULONG *lpCount)
{
static const BOOL bBadPtr = TRUE; /* Windows bug - Assumes source is bad */
- LPSPropValue lpDest = (LPSPropValue)lpProps;
+ LPSPropValue lpDest = lpProps;
ULONG ulCount = cValues * sizeof(SPropValue);
ULONG ulLen, i;
int iter;
@@ -964,7 +964,7 @@ SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld,
break;
case PT_STRING8:
ulLen = bBadPtr ? 0 : lstrlenA(lpDest->Value.lpszA) + 1u;
- lpDest->Value.lpszA = (LPSTR)RELOC_PTR(lpDest->Value.lpszA);
+ lpDest->Value.lpszA = RELOC_PTR(lpDest->Value.lpszA);
if (bBadPtr)
ulLen = lstrlenA(lpDest->Value.lpszA) + 1u;
ulCount += ulLen;
@@ -999,7 +999,7 @@ SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld,
{
ULONG ulStrLen = bBadPtr ? 0 : lstrlenA(lpDest->Value.MVszA.lppszA[i]) + 1u;
- lpDest->Value.MVszA.lppszA[i] = (LPSTR)RELOC_PTR(lpDest->Value.MVszA.lppszA[i]);
+ lpDest->Value.MVszA.lppszA[i] = RELOC_PTR(lpDest->Value.MVszA.lppszA[i]);
if (bBadPtr)
ulStrLen = lstrlenA(lpDest->Value.MVszA.lppszA[i]) + 1u;
ulCount += ulStrLen;
More information about the wine-cvs
mailing list