From 6bb46e31e7dd1b97abcf05258336a1b64a8a80f9 Mon Sep 17 00:00:00 2001 From: Kevin Koltzau Date: Mon, 22 Aug 2005 09:19:16 +0000 Subject: [PATCH] Fix 'cast from pointer to integer of different size' warnings in 64bit. --- dlls/msvideo/msvfw32.spec | 2 +- dlls/msvideo/msvideo_main.c | 20 ++++----- dlls/msvideo/msvideo_private.h | 2 +- include/vfw.h | 78 +++++++++++++++++----------------- 4 files changed, 51 insertions(+), 51 deletions(-) diff --git a/dlls/msvideo/msvfw32.spec b/dlls/msvideo/msvfw32.spec index dde1b9d2480..3fdd2f63eea 100644 --- a/dlls/msvideo/msvfw32.spec +++ b/dlls/msvideo/msvfw32.spec @@ -40,7 +40,7 @@ @ stdcall ICOpen(long long long) @ stdcall ICOpenFunction(long long long ptr) @ stdcall ICRemove(long long long) -@ stdcall ICSendMessage(long long long long) +@ stdcall ICSendMessage(long long ptr ptr) @ stdcall ICSeqCompressFrame(ptr long ptr ptr ptr) @ stdcall ICSeqCompressFrameEnd(ptr) @ stdcall ICSeqCompressFrameStart(ptr ptr) diff --git a/dlls/msvideo/msvideo_main.c b/dlls/msvideo/msvideo_main.c index 96df00f99d3..92c8cc5f9bf 100644 --- a/dlls/msvideo/msvideo_main.c +++ b/dlls/msvideo/msvideo_main.c @@ -436,7 +436,7 @@ HIC MSVIDEO_OpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, /* return value is not checked */ MSVIDEO_SendMessage(whic, DRV_ENABLE, 0L, 0L); - whic->driverId = (DWORD)MSVIDEO_SendMessage(whic, DRV_OPEN, 0, (DWORD)&icopen); + whic->driverId = (DWORD)MSVIDEO_SendMessage(whic, DRV_OPEN, 0, (DWORD_PTR)&icopen); /* FIXME: What should we put here? */ whic->hdrv = NULL; @@ -481,7 +481,7 @@ LRESULT VFWAPI ICGetInfo(HIC hic, ICINFO *picinfo, DWORD cb) */ if (cb >= sizeof(ICINFO)) picinfo->szDriver[0] = '\0'; - ret = ICSendMessage(hic, ICM_GETINFO, (DWORD)picinfo, cb); + ret = ICSendMessage(hic, ICM_GETINFO, (DWORD_PTR)picinfo, cb); /* (WS) When szDriver was not supplied by the driver itself, apparently * Windows will set its value equal to the driver file name. This can @@ -517,7 +517,7 @@ static HIC try_driver(driver_info_t *info) if ((hic = ICOpen(info->fccType, info->fccHandler, info->wMode))) { - if (!ICSendMessage(hic, info->querymsg, (DWORD)info->lpbiIn, (DWORD)info->lpbiOut)) + if (!ICSendMessage(hic, info->querymsg, (DWORD_PTR)info->lpbiIn, (DWORD_PTR)info->lpbiOut)) return hic; ICClose(hic); } @@ -671,7 +671,7 @@ ICCompress( iccmp.dwQuality = dwQuality; iccmp.lpbiPrev = lpbiPrev; iccmp.lpPrev = lpPrev; - return ICSendMessage(hic,ICM_COMPRESS,(DWORD)&iccmp,sizeof(iccmp)); + return ICSendMessage(hic,ICM_COMPRESS,(DWORD_PTR)&iccmp,sizeof(iccmp)); } /*********************************************************************** @@ -694,7 +694,7 @@ DWORD VFWAPIV ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat, icd.lpbiOutput = lpbi; icd.lpOutput = lpBits; icd.ckid = 0; - ret = ICSendMessage(hic,ICM_DECOMPRESS,(DWORD)&icd,sizeof(ICDECOMPRESS)); + ret = ICSendMessage(hic,ICM_DECOMPRESS,(DWORD_PTR)&icd,sizeof(ICDECOMPRESS)); TRACE("lpBits[0] == %lx\n",((LPDWORD)lpBits)[0]); @@ -773,7 +773,7 @@ void VFWAPI ICCompressorFree(PCOMPVARS pc) * * */ -LRESULT MSVIDEO_SendMessage(WINE_HIC* whic, UINT msg, DWORD lParam1, DWORD lParam2) +LRESULT MSVIDEO_SendMessage(WINE_HIC* whic, UINT msg, DWORD_PTR lParam1, DWORD_PTR lParam2) { LRESULT ret; @@ -857,7 +857,7 @@ LRESULT MSVIDEO_SendMessage(WINE_HIC* whic, UINT msg, DWORD lParam1, DWORD lPara /*********************************************************************** * ICSendMessage [MSVFW32.@] */ -LRESULT VFWAPI ICSendMessage(HIC hic, UINT msg, DWORD lParam1, DWORD lParam2) +LRESULT VFWAPI ICSendMessage(HIC hic, UINT msg, DWORD_PTR lParam1, DWORD_PTR lParam2) { WINE_HIC* whic = MSVIDEO_GetHicPtr(hic); @@ -908,7 +908,7 @@ DWORD VFWAPIV ICDrawBegin( icdb.dySrc = dySrc; icdb.dwRate = dwRate; icdb.dwScale = dwScale; - return ICSendMessage(hic,ICM_DRAW_BEGIN,(DWORD)&icdb,sizeof(icdb)); + return ICSendMessage(hic,ICM_DRAW_BEGIN,(DWORD_PTR)&icdb,sizeof(icdb)); } /*********************************************************************** @@ -925,7 +925,7 @@ DWORD VFWAPIV ICDraw(HIC hic, DWORD dwFlags, LPVOID lpFormat, LPVOID lpData, DWO icd.cbData = cbData; icd.lTime = lTime; - return ICSendMessage(hic,ICM_DRAW,(DWORD)&icd,sizeof(icd)); + return ICSendMessage(hic,ICM_DRAW,(DWORD_PTR)&icd,sizeof(icd)); } /*********************************************************************** @@ -1241,7 +1241,7 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) pc->cbSize, pc->dwFlags, pc->hic, pc->fccType, pc->fccHandler, pc->lpbiIn, pc->lpbiOut, pc->lKey, pc->lDataRate, pc->lQ); - ret = ICSendMessage(pc->hic, ICM_COMPRESS_BEGIN, (DWORD)pc->lpbiIn, (DWORD)pc->lpbiOut); + ret = ICSendMessage(pc->hic, ICM_COMPRESS_BEGIN, (DWORD_PTR)pc->lpbiIn, (DWORD_PTR)pc->lpbiOut); TRACE(" -- %lx\n", ret); if (ret == ICERR_OK) { diff --git a/dlls/msvideo/msvideo_private.h b/dlls/msvideo/msvideo_private.h index bf0544f2f5e..72c3af2923f 100644 --- a/dlls/msvideo/msvideo_private.h +++ b/dlls/msvideo/msvideo_private.h @@ -48,7 +48,7 @@ typedef struct tagWINE_HIC { } WINE_HIC; HIC MSVIDEO_OpenFunction(DWORD, DWORD, UINT, DRIVERPROC, DWORD); -LRESULT MSVIDEO_SendMessage(WINE_HIC*, UINT, DWORD, DWORD); +LRESULT MSVIDEO_SendMessage(WINE_HIC*, UINT, DWORD_PTR, DWORD_PTR); WINE_HIC* MSVIDEO_GetHicPtr(HIC); extern LRESULT (CALLBACK *pFnCallTo16)(HDRVR, HIC, UINT, LPARAM, LPARAM); diff --git a/include/vfw.h b/include/vfw.h index b6c46b77185..eb348298f96 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -187,28 +187,28 @@ DWORD VFWAPIV ICCompress( #define ICCompressGetFormat(hic, lpbiInput, lpbiOutput) \ ICSendMessage( \ - hic,ICM_COMPRESS_GET_FORMAT,(DWORD)(LPVOID)(lpbiInput), \ - (DWORD)(LPVOID)(lpbiOutput) \ + hic,ICM_COMPRESS_GET_FORMAT,(DWORD_PTR)(LPVOID)(lpbiInput), \ + (DWORD_PTR)(LPVOID)(lpbiOutput) \ ) #define ICCompressGetFormatSize(hic,lpbi) ICCompressGetFormat(hic,lpbi,NULL) #define ICCompressBegin(hic, lpbiInput, lpbiOutput) \ ICSendMessage( \ - hic, ICM_COMPRESS_BEGIN, (DWORD)(LPVOID)(lpbiInput), \ - (DWORD)(LPVOID)(lpbiOutput) \ + hic, ICM_COMPRESS_BEGIN, (DWORD_PTR)(LPVOID)(lpbiInput), \ + (DWORD_PTR)(LPVOID)(lpbiOutput) \ ) #define ICCompressGetSize(hic, lpbiInput, lpbiOutput) \ ICSendMessage( \ - hic, ICM_COMPRESS_GET_SIZE, (DWORD)(LPVOID)(lpbiInput), \ - (DWORD)(LPVOID)(lpbiOutput) \ + hic, ICM_COMPRESS_GET_SIZE, (DWORD_PTR)(LPVOID)(lpbiInput), \ + (DWORD_PTR)(LPVOID)(lpbiOutput) \ ) #define ICCompressQuery(hic, lpbiInput, lpbiOutput) \ ICSendMessage( \ - hic, ICM_COMPRESS_QUERY, (DWORD)(LPVOID)(lpbiInput), \ - (DWORD)(LPVOID)(lpbiOutput) \ + hic, ICM_COMPRESS_QUERY, (DWORD_PTR)(LPVOID)(lpbiInput), \ + (DWORD_PTR)(LPVOID)(lpbiOutput) \ ) #define ICCompressEnd(hic) ICSendMessage(hic, ICM_COMPRESS_END, 0, 0) @@ -295,17 +295,17 @@ typedef struct { #define ICMF_ABOUT_QUERY 0x00000001 #define ICQueryAbout(hic) \ - (ICSendMessage(hic,ICM_ABOUT,(DWORD)-1,ICMF_ABOUT_QUERY)==ICERR_OK) + (ICSendMessage(hic,ICM_ABOUT,(DWORD_PTR)-1,ICMF_ABOUT_QUERY)==ICERR_OK) -#define ICAbout(hic, hwnd) ICSendMessage(hic,ICM_ABOUT,(DWORD)(UINT)(hwnd),0) +#define ICAbout(hic, hwnd) ICSendMessage(hic,ICM_ABOUT,(DWORD_PTR)(UINT_PTR)(hwnd),0) /* ICM_CONFIGURE */ #define ICMF_CONFIGURE_QUERY 0x00000001 #define ICQueryConfigure(hic) \ - (ICSendMessage(hic,ICM_CONFIGURE,(DWORD)-1,ICMF_CONFIGURE_QUERY)==ICERR_OK) + (ICSendMessage(hic,ICM_CONFIGURE,(DWORD_PTR)-1,ICMF_CONFIGURE_QUERY)==ICERR_OK) #define ICConfigure(hic,hwnd) \ - ICSendMessage(hic,ICM_CONFIGURE,(DWORD)(UINT)(hwnd),0) + ICSendMessage(hic,ICM_CONFIGURE,(DWORD_PTR)(UINT_PTR)(hwnd),0) /* Decompression stuff */ #define ICDECOMPRESS_HURRYUP 0x80000000 /* don't draw just buffer (hurry up!) */ @@ -346,20 +346,20 @@ DWORD VFWAPIV ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat,L #define ICDecompressBegin(hic, lpbiInput, lpbiOutput) \ ICSendMessage( \ - hic, ICM_DECOMPRESS_BEGIN, (DWORD)(LPVOID)(lpbiInput), \ - (DWORD)(LPVOID)(lpbiOutput) \ + hic, ICM_DECOMPRESS_BEGIN, (DWORD_PTR)(LPVOID)(lpbiInput), \ + (DWORD_PTR)(LPVOID)(lpbiOutput) \ ) #define ICDecompressQuery(hic, lpbiInput, lpbiOutput) \ ICSendMessage( \ - hic,ICM_DECOMPRESS_QUERY, (DWORD)(LPVOID)(lpbiInput), \ - (DWORD) (LPVOID)(lpbiOutput) \ + hic,ICM_DECOMPRESS_QUERY, (DWORD_PTR)(LPVOID)(lpbiInput), \ + (DWORD_PTR) (LPVOID)(lpbiOutput) \ ) #define ICDecompressGetFormat(hic, lpbiInput, lpbiOutput) \ ((LONG)ICSendMessage( \ - hic,ICM_DECOMPRESS_GET_FORMAT, (DWORD)(LPVOID)(lpbiInput), \ - (DWORD)(LPVOID)(lpbiOutput) \ + hic,ICM_DECOMPRESS_GET_FORMAT, (DWORD_PTR)(LPVOID)(lpbiInput), \ + (DWORD_PTR)(LPVOID)(lpbiOutput) \ )) #define ICDecompressGetFormatSize(hic, lpbi) \ @@ -367,19 +367,19 @@ DWORD VFWAPIV ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat,L #define ICDecompressGetPalette(hic, lpbiInput, lpbiOutput) \ ICSendMessage( \ - hic, ICM_DECOMPRESS_GET_PALETTE, (DWORD)(LPVOID)(lpbiInput), \ - (DWORD)(LPVOID)(lpbiOutput) \ + hic, ICM_DECOMPRESS_GET_PALETTE, (DWORD_PTR)(LPVOID)(lpbiInput), \ + (DWORD_PTR)(LPVOID)(lpbiOutput) \ ) #define ICDecompressSetPalette(hic,lpbiPalette) \ ICSendMessage( \ hic,ICM_DECOMPRESS_SET_PALETTE, \ - (DWORD)(LPVOID)(lpbiPalette),0 \ + (DWORD_PTR)(LPVOID)(lpbiPalette),0 \ ) #define ICDecompressEnd(hic) ICSendMessage(hic, ICM_DECOMPRESS_END, 0, 0) -LRESULT VFWAPI ICSendMessage(HIC hic, UINT msg, DWORD dw1, DWORD dw2); +LRESULT VFWAPI ICSendMessage(HIC hic, UINT msg, DWORD_PTR dw1, DWORD_PTR dw2); inline static LRESULT VFWAPI ICDecompressEx(HIC hic, DWORD dwFlags, LPBITMAPINFOHEADER lpbiSrc, LPVOID lpSrc, @@ -402,7 +402,7 @@ inline static LRESULT VFWAPI ICDecompressEx(HIC hic, DWORD dwFlags, ic.yDst = yDst; ic.dxDst = dxDst; ic.dyDst = dyDst; - return ICSendMessage(hic, ICM_DECOMPRESSEX, (DWORD)&ic, sizeof(ic)); + return ICSendMessage(hic, ICM_DECOMPRESSEX, (DWORD_PTR)&ic, sizeof(ic)); } inline static LRESULT VFWAPI ICDecompressExBegin(HIC hic, DWORD dwFlags, @@ -431,7 +431,7 @@ inline static LRESULT VFWAPI ICDecompressExBegin(HIC hic, DWORD dwFlags, ic.yDst = yDst; ic.dxDst = dxDst; ic.dyDst = dyDst; - return ICSendMessage(hic, ICM_DECOMPRESSEX_BEGIN, (DWORD)&ic, sizeof(ic)); + return ICSendMessage(hic, ICM_DECOMPRESSEX_BEGIN, (DWORD_PTR)&ic, sizeof(ic)); } inline static LRESULT VFWAPI ICDecompressExQuery(HIC hic, DWORD dwFlags, LPBITMAPINFOHEADER lpbiSrc, @@ -459,7 +459,7 @@ inline static LRESULT VFWAPI ICDecompressExQuery(HIC hic, DWORD dwFlags, ic.yDst = yDst; ic.dxDst = dxDst; ic.dyDst = dyDst; - return ICSendMessage(hic, ICM_DECOMPRESSEX_QUERY, (DWORD)&ic, sizeof(ic)); + return ICSendMessage(hic, ICM_DECOMPRESSEX_QUERY, (DWORD_PTR)&ic, sizeof(ic)); } #define ICDecompressExEnd(hic) \ @@ -507,28 +507,28 @@ HIC VFWAPI ICGetDisplayFormat(HIC hic, LPBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHE #define ICINSTALL_DRIVERW 0x8002 #define ICGetState(hic, pv, cb) \ - ICSendMessage(hic, ICM_GETSTATE, (DWORD)(LPVOID)(pv), (DWORD)(cb)) + ICSendMessage(hic, ICM_GETSTATE, (DWORD_PTR)(LPVOID)(pv), (DWORD_PTR)(cb)) #define ICSetState(hic, pv, cb) \ - ICSendMessage(hic, ICM_SETSTATE, (DWORD)(LPVOID)(pv), (DWORD)(cb)) + ICSendMessage(hic, ICM_SETSTATE, (DWORD_PTR)(LPVOID)(pv), (DWORD_PTR)(cb)) #define ICGetStateSize(hic) \ ICGetState(hic, NULL, 0) inline static DWORD ICGetDefaultQuality(HIC hic) { DWORD dwICValue; - ICSendMessage(hic, ICM_GETDEFAULTQUALITY, (DWORD)(LPVOID)&dwICValue, sizeof(DWORD)); + ICSendMessage(hic, ICM_GETDEFAULTQUALITY, (DWORD_PTR)(LPVOID)&dwICValue, sizeof(DWORD)); return dwICValue; } inline static DWORD ICGetDefaultKeyFrameRate(HIC hic) { DWORD dwICValue; - ICSendMessage(hic, ICM_GETDEFAULTKEYFRAMERATE, (DWORD)(LPVOID)&dwICValue, sizeof(DWORD)); + ICSendMessage(hic, ICM_GETDEFAULTKEYFRAMERATE, (DWORD_PTR)(LPVOID)&dwICValue, sizeof(DWORD)); return dwICValue; } #define ICDrawWindow(hic, prc) \ - ICSendMessage(hic, ICM_DRAW_WINDOW, (DWORD)(LPVOID)(prc), sizeof(RECT)) + ICSendMessage(hic, ICM_DRAW_WINDOW, (DWORD_PTR)(LPVOID)(prc), sizeof(RECT)) /* As passed to ICM_DRAW_SUGGESTFORMAT */ typedef struct { @@ -618,17 +618,17 @@ inline static LRESULT VFWAPI ICDrawSuggestFormat(HIC hic, LPBITMAPINFOHEADER lpb ic.dxDst = dxDst; ic.dyDst = dyDst; ic.hicDecompressor = hicDecomp; - return ICSendMessage(hic, ICM_DRAW_SUGGESTFORMAT, (DWORD)&ic, sizeof(ic)); + return ICSendMessage(hic, ICM_DRAW_SUGGESTFORMAT, (DWORD_PTR)&ic, sizeof(ic)); } #define ICDrawQuery(hic, lpbiInput) \ - ICSendMessage(hic, ICM_DRAW_QUERY, (DWORD)(LPVOID)(lpbiInput), 0L) + ICSendMessage(hic, ICM_DRAW_QUERY, (DWORD_PTR)(LPVOID)(lpbiInput), 0L) #define ICDrawChangePalette(hic, lpbiInput) \ - ICSendMessage(hic, ICM_DRAW_CHANGEPALETTE, (DWORD)(LPVOID)(lpbiInput), 0L) + ICSendMessage(hic, ICM_DRAW_CHANGEPALETTE, (DWORD_PTR)(LPVOID)(lpbiInput), 0L) #define ICGetBuffersWanted(hic, lpdwBuffers) \ - ICSendMessage(hic, ICM_GETBUFFERSWANTED, (DWORD)(LPVOID)(lpdwBuffers), 0) + ICSendMessage(hic, ICM_GETBUFFERSWANTED, (DWORD_PTR)(LPVOID)(lpdwBuffers), 0) #define ICDrawEnd(hic) \ ICSendMessage(hic, ICM_DRAW_END, 0, 0) @@ -637,7 +637,7 @@ inline static LRESULT VFWAPI ICDrawSuggestFormat(HIC hic, LPBITMAPINFOHEADER lpb ICSendMessage(hic, ICM_DRAW_START, 0, 0) #define ICDrawStartPlay(hic, lFrom, lTo) \ - ICSendMessage(hic, ICM_DRAW_START_PLAY, (DWORD)(lFrom), (DWORD)(lTo)) + ICSendMessage(hic, ICM_DRAW_START_PLAY, (DWORD_PTR)(lFrom), (DWORD_PTR)(lTo)) #define ICDrawStop(hic) \ ICSendMessage(hic, ICM_DRAW_STOP, 0, 0) @@ -646,13 +646,13 @@ inline static LRESULT VFWAPI ICDrawSuggestFormat(HIC hic, LPBITMAPINFOHEADER lpb ICSendMessage(hic, ICM_DRAW_STOP_PLAY, 0, 0) #define ICDrawGetTime(hic, lplTime) \ - ICSendMessage(hic, ICM_DRAW_GETTIME, (DWORD)(LPVOID)(lplTime), 0) + ICSendMessage(hic, ICM_DRAW_GETTIME, (DWORD_PTR)(LPVOID)(lplTime), 0) #define ICDrawSetTime(hic, lTime) \ - ICSendMessage(hic, ICM_DRAW_SETTIME, (DWORD)lTime, 0) + ICSendMessage(hic, ICM_DRAW_SETTIME, (DWORD_PTR)lTime, 0) #define ICDrawRealize(hic, hdc, fBackground) \ - ICSendMessage(hic, ICM_DRAW_REALIZE, (DWORD)(UINT)(HDC)(hdc), (DWORD)(BOOL)(fBackground)) + ICSendMessage(hic, ICM_DRAW_REALIZE, (DWORD_PTR)(UINT_PTR)(HDC)(hdc), (DWORD_PTR)(BOOL)(fBackground)) #define ICDrawFlush(hic) \ ICSendMessage(hic, ICM_DRAW_FLUSH, 0, 0) @@ -670,7 +670,7 @@ inline static LRESULT VFWAPI ICSetStatusProc(HIC hic, DWORD dwFlags, LRESULT lPa /* FIXME: see comment in ICSETSTATUSPROC definition */ ic.zStatus = fpfnStatus; - return ICSendMessage(hic, ICM_SET_STATUS_PROC, (DWORD)&ic, sizeof(ic)); + return ICSendMessage(hic, ICM_SET_STATUS_PROC, (DWORD_PTR)&ic, sizeof(ic)); } typedef struct {