Module: wine Branch: master Commit: ca8d5a7922e7ecc4a6a74a24b340c918aab62250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8d5a7922e7ecc4a6a74a24b3...
Author: Michael Stefaniuc mstefani@redhat.de Date: Sun Jan 11 00:16:25 2009 +0100
msvfw32: Remove superfluous pointer casts.
---
dlls/msvfw32/mciwnd.c | 2 +- dlls/msvfw32/msvideo16.c | 2 +- dlls/msvfw32/msvideo_main.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/msvfw32/mciwnd.c b/dlls/msvfw32/mciwnd.c index f6ca6cd..61b13aa 100644 --- a/dlls/msvfw32/mciwnd.c +++ b/dlls/msvfw32/mciwnd.c @@ -309,7 +309,7 @@ static LRESULT MCIWND_Create(HWND hWnd, LPCREATESTRUCTW cs) /* MCI wnd class is prepared to be embedded as an MDI child window */ if (cs->dwExStyle & WS_EX_MDICHILD) { - MDICREATESTRUCTW *mdics = (MDICREATESTRUCTW *)cs->lpCreateParams; + MDICREATESTRUCTW *mdics = cs->lpCreateParams; lParam = mdics->lParam; } else diff --git a/dlls/msvfw32/msvideo16.c b/dlls/msvfw32/msvideo16.c index 221542c..c873da5 100644 --- a/dlls/msvfw32/msvideo16.c +++ b/dlls/msvfw32/msvideo16.c @@ -602,7 +602,7 @@ static void MSVIDEO_UnmapMsg16To32(UINT msg, LPVOID data16, LPDWORD lParam1, LPD case ICM_GETINFO: { ICINFO *ici = (ICINFO*)(*lParam1); - ICINFO16 *ici16 = (ICINFO16*)data16; + ICINFO16 *ici16 = data16;
UNCOPY(ici, fccType); UNCOPY(ici, fccHandler); diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 247c00e..7483218 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -175,7 +175,7 @@ DWORD WINAPI VideoForWindowsVersion(void)
static BOOL ICInfo_enum_handler(const char *drv, unsigned int nr, void *param) { - ICINFO *lpicinfo = (ICINFO *)param; + ICINFO *lpicinfo = param; DWORD fccHandler = mmioStringToFOURCCA(drv + 5, 0);
/* exact match of fccHandler or nth driver found */ @@ -521,7 +521,7 @@ static HIC try_driver(driver_info_t *info)
static BOOL ICLocate_enum_handler(const char *drv, unsigned int nr, void *param) { - driver_info_t *info = (driver_info_t *)param; + driver_info_t *info = param; info->fccHandler = mmioStringToFOURCCA(drv + 5, 0); info->hic = try_driver(info); return info->hic != 0; @@ -1299,7 +1299,7 @@ HANDLE VFWAPI ICImageDecompress( pHdr = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,cbHdr+sizeof(RGBQUAD)*256); if ( pHdr == NULL ) goto err; - if ( ICDecompressGetFormat( hic, lpbiIn, (BITMAPINFO*)pHdr ) != ICERR_OK ) + if ( ICDecompressGetFormat( hic, lpbiIn, pHdr ) != ICERR_OK ) goto err; lpbiOut = (BITMAPINFO*)pHdr; if ( lpbiOut->bmiHeader.biBitCount <= 8 && @@ -1337,7 +1337,7 @@ HANDLE VFWAPI ICImageDecompress( WARN( "out of memory\n" ); goto err; } - pMem = (BYTE*)GlobalLock( hMem ); + pMem = GlobalLock( hMem ); if ( pMem == NULL ) goto err; memcpy( pMem, lpbiOut, cbHdr ); @@ -1368,7 +1368,7 @@ err: */ LPVOID VFWAPI ICSeqCompressFrame(PCOMPVARS pc, UINT uiFlags, LPVOID lpBits, BOOL *pfKey, LONG *plSize) { - ICCOMPRESS* icComp = (ICCOMPRESS *)pc->lpState; + ICCOMPRESS* icComp = pc->lpState; DWORD ret; TRACE("(%p, 0x%08x, %p, %p, %p)\n", pc, uiFlags, lpBits, pfKey, plSize);
@@ -1490,7 +1490,7 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) TRACE(" -- %x\n", ret); if (ret == ICERR_OK) { - ICCOMPRESS* icComp = (ICCOMPRESS *)pc->lpState; + ICCOMPRESS* icComp = pc->lpState; /* Initialise some variables */ pc->lFrame = 0; pc->lKeyCount = 0;