mirror of
git://source.winehq.org/git/wine.git
synced 2024-07-21 18:04:15 +00:00
msvfw32: Enable compilation with long types.
Signed-off-by: Eric Pouech <eric.pouech@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
f58d93bdc9
commit
4d9519f5e2
|
@ -1,4 +1,3 @@
|
|||
EXTRADEFS = -DWINE_NO_LONG_TYPES
|
||||
MODULE = msvfw32.dll
|
||||
IMPORTLIB = msvfw32
|
||||
IMPORTS = winmm version comctl32 user32 gdi32 advapi32
|
||||
|
|
|
@ -187,7 +187,7 @@ BOOL VFWAPI DrawDibBegin(HDRAWDIB hdd,
|
|||
TRACE("(%p,%p,%d,%d,%p,%d,%d,0x%08x)\n",
|
||||
hdd, hdc, dxDst, dyDst, lpbi, dxSrc, dySrc, wFlags);
|
||||
|
||||
TRACE("lpbi: %d,%d/%d,%d,%d,%d,%d,%d,%d,%d,%d\n",
|
||||
TRACE("lpbi: %ld,%ld/%ld,%d,%d,%ld,%ld,%ld,%ld,%ld,%ld\n",
|
||||
lpbi->biSize, lpbi->biWidth, lpbi->biHeight, lpbi->biPlanes,
|
||||
lpbi->biBitCount, lpbi->biCompression, lpbi->biSizeImage,
|
||||
lpbi->biXPelsPerMeter, lpbi->biYPelsPerMeter, lpbi->biClrUsed,
|
||||
|
@ -208,7 +208,7 @@ BOOL VFWAPI DrawDibBegin(HDRAWDIB hdd,
|
|||
whdd->hic = ICOpen(ICTYPE_VIDEO, lpbi->biCompression, ICMODE_DECOMPRESS);
|
||||
if (!whdd->hic)
|
||||
{
|
||||
WARN("Could not open IC. biCompression == 0x%08x\n", lpbi->biCompression);
|
||||
WARN("Could not open IC. biCompression == 0x%08lx\n", lpbi->biCompression);
|
||||
ret = FALSE;
|
||||
}
|
||||
|
||||
|
@ -236,8 +236,8 @@ BOOL VFWAPI DrawDibBegin(HDRAWDIB hdd,
|
|||
if (ICDecompressBegin(whdd->hic, lpbi, whdd->lpbiOut) != ICERR_OK)
|
||||
ret = FALSE;
|
||||
|
||||
TRACE("biSizeImage == %d\n", whdd->lpbiOut->biSizeImage);
|
||||
TRACE("biCompression == %d\n", whdd->lpbiOut->biCompression);
|
||||
TRACE("biSizeImage == %ld\n", whdd->lpbiOut->biSizeImage);
|
||||
TRACE("biCompression == %ld\n", whdd->lpbiOut->biCompression);
|
||||
TRACE("biBitCount == %d\n", whdd->lpbiOut->biBitCount);
|
||||
}
|
||||
}
|
||||
|
@ -265,7 +265,7 @@ BOOL VFWAPI DrawDibBegin(HDRAWDIB hdd,
|
|||
/*whdd->lpvbuf = HeapAlloc(GetProcessHeap(), 0, whdd->lpbiOut->biSizeImage);*/
|
||||
|
||||
whdd->hMemDC = CreateCompatibleDC(hdc);
|
||||
TRACE("Creating: %d, %p\n", whdd->lpbiOut->biSize, whdd->lpvbits);
|
||||
TRACE("Creating: %ld, %p\n", whdd->lpbiOut->biSize, whdd->lpvbits);
|
||||
whdd->hDib = CreateDIBSection(whdd->hMemDC, (BITMAPINFO *)whdd->lpbiOut, DIB_RGB_COLORS, &(whdd->lpvbits), 0, 0);
|
||||
if (whdd->hDib)
|
||||
{
|
||||
|
@ -274,7 +274,7 @@ BOOL VFWAPI DrawDibBegin(HDRAWDIB hdd,
|
|||
else
|
||||
{
|
||||
ret = FALSE;
|
||||
TRACE("Error: %d\n", GetLastError());
|
||||
TRACE("Error: %ld\n", GetLastError());
|
||||
}
|
||||
whdd->hOldDib = SelectObject(whdd->hMemDC, whdd->hDib);
|
||||
}
|
||||
|
@ -381,7 +381,7 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc,
|
|||
{
|
||||
DWORD flags = 0;
|
||||
|
||||
TRACE("Compression == 0x%08x\n", lpbi->biCompression);
|
||||
TRACE("Compression == 0x%08lx\n", lpbi->biCompression);
|
||||
|
||||
if (wFlags & DDF_NOTKEYFRAME)
|
||||
flags |= ICDECOMPRESS_NOTKEYFRAME;
|
||||
|
@ -414,7 +414,7 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc,
|
|||
* DrawDibStart [MSVFW32.@]
|
||||
*/
|
||||
BOOL VFWAPI DrawDibStart(HDRAWDIB hdd, DWORD rate) {
|
||||
FIXME("(%p, %d), stub\n", hdd, rate);
|
||||
FIXME("(%p, %ld), stub\n", hdd, rate);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
@ -463,7 +463,7 @@ BOOL VFWAPI DrawDibSetPalette(HDRAWDIB hdd, HPALETTE hpal)
|
|||
*/
|
||||
LPVOID VFWAPI DrawDibGetBuffer(HDRAWDIB hdd, LPBITMAPINFOHEADER lpbi, DWORD dwSize, DWORD dwFlags)
|
||||
{
|
||||
FIXME("(%p, %p, 0x%08x, 0x%08x), stub\n", hdd, lpbi, dwSize, dwFlags);
|
||||
FIXME("(%p, %p, 0x%08lx, 0x%08lx), stub\n", hdd, lpbi, dwSize, dwFlags);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
@ -102,7 +102,7 @@ BOOL VFWAPIV MCIWndRegisterClass(void)
|
|||
HWND VFWAPIV MCIWndCreateW(HWND hwndParent, HINSTANCE hInstance,
|
||||
DWORD dwStyle, LPCWSTR szFile)
|
||||
{
|
||||
TRACE("%p %p %x %s\n", hwndParent, hInstance, dwStyle, debugstr_w(szFile));
|
||||
TRACE("%p %p %lx %s\n", hwndParent, hInstance, dwStyle, debugstr_w(szFile));
|
||||
|
||||
MCIWndRegisterClass();
|
||||
|
||||
|
@ -446,7 +446,7 @@ static LRESULT WINAPI MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lPa
|
|||
{
|
||||
MCIWndInfo *mwi;
|
||||
|
||||
TRACE("%p %04x %08lx %08lx\n", hWnd, wMsg, wParam, lParam);
|
||||
TRACE("%p %04x %08Ix %08Ix\n", hWnd, wMsg, wParam, lParam);
|
||||
|
||||
mwi = (MCIWndInfo*)GetWindowLongPtrW(hWnd, 0);
|
||||
if (!mwi && wMsg != WM_CREATE)
|
||||
|
@ -751,7 +751,7 @@ end_of_mci_open:
|
|||
MCIWND_notify_error(mwi);
|
||||
return 0;
|
||||
}
|
||||
TRACE("MCIWNDM_GETLENGTH: %ld\n", mci_status.dwReturn);
|
||||
TRACE("MCIWNDM_GETLENGTH: %Id\n", mci_status.dwReturn);
|
||||
return mci_status.dwReturn;
|
||||
}
|
||||
|
||||
|
@ -768,7 +768,7 @@ end_of_mci_open:
|
|||
MCIWND_notify_error(mwi);
|
||||
return 0;
|
||||
}
|
||||
TRACE("MCIWNDM_GETSTART: %ld\n", mci_status.dwReturn);
|
||||
TRACE("MCIWNDM_GETSTART: %Id\n", mci_status.dwReturn);
|
||||
return mci_status.dwReturn;
|
||||
}
|
||||
|
||||
|
@ -778,7 +778,7 @@ end_of_mci_open:
|
|||
|
||||
start = SendMessageW(hWnd, MCIWNDM_GETSTART, 0, 0);
|
||||
length = SendMessageW(hWnd, MCIWNDM_GETLENGTH, 0, 0);
|
||||
TRACE("MCIWNDM_GETEND: %ld\n", start + length);
|
||||
TRACE("MCIWNDM_GETEND: %Id\n", start + length);
|
||||
return (start + length);
|
||||
}
|
||||
|
||||
|
@ -871,7 +871,7 @@ end_of_mci_open:
|
|||
{
|
||||
MCI_PLAY_PARMS mci_play;
|
||||
|
||||
TRACE("MCIWNDM_PLAYFROM %08lx\n", lParam);
|
||||
TRACE("MCIWNDM_PLAYFROM %08Ix\n", lParam);
|
||||
|
||||
mci_play.dwCallback = (DWORD_PTR)hWnd;
|
||||
mci_play.dwFrom = lParam;
|
||||
|
@ -893,7 +893,7 @@ end_of_mci_open:
|
|||
{
|
||||
MCI_PLAY_PARMS mci_play;
|
||||
|
||||
TRACE("MCIWNDM_PLAYTO %08lx\n", lParam);
|
||||
TRACE("MCIWNDM_PLAYTO %08Ix\n", lParam);
|
||||
|
||||
mci_play.dwCallback = (DWORD_PTR)hWnd;
|
||||
mci_play.dwTo = lParam;
|
||||
|
@ -916,7 +916,7 @@ end_of_mci_open:
|
|||
MCI_PLAY_PARMS mci_play;
|
||||
DWORD flags = MCI_NOTIFY;
|
||||
|
||||
TRACE("MCIWNDM_PLAYREVERSE %08lx\n", lParam);
|
||||
TRACE("MCIWNDM_PLAYREVERSE %08Ix\n", lParam);
|
||||
|
||||
mci_play.dwCallback = (DWORD_PTR)hWnd;
|
||||
mci_play.dwFrom = lParam;
|
||||
|
@ -1054,7 +1054,7 @@ end_of_mci_open:
|
|||
return mwi->inactive_timer;
|
||||
|
||||
case MCIWNDM_CHANGESTYLES:
|
||||
TRACE("MCIWNDM_CHANGESTYLES mask %08lx, set %08lx\n", wParam, lParam);
|
||||
TRACE("MCIWNDM_CHANGESTYLES mask %08Ix, set %08Ix\n", wParam, lParam);
|
||||
/* FIXME: update the visual window state as well:
|
||||
* add/remove trackbar, autosize, etc.
|
||||
*/
|
||||
|
@ -1063,7 +1063,7 @@ end_of_mci_open:
|
|||
return 0;
|
||||
|
||||
case MCIWNDM_GETSTYLES:
|
||||
TRACE("MCIWNDM_GETSTYLES: %08x\n", mwi->dwStyle & 0xffff);
|
||||
TRACE("MCIWNDM_GETSTYLES: %08lx\n", mwi->dwStyle & 0xffff);
|
||||
return mwi->dwStyle & 0xffff;
|
||||
|
||||
case MCIWNDM_GETDEVICEA:
|
||||
|
@ -1124,7 +1124,7 @@ end_of_mci_open:
|
|||
{
|
||||
MCI_STATUS_PARMS mci_status;
|
||||
|
||||
TRACE("MCIWNDM_GETTIMEFORMAT %08lx %08lx\n", wParam, lParam);
|
||||
TRACE("MCIWNDM_GETTIMEFORMAT %08Ix %08Ix\n", wParam, lParam);
|
||||
|
||||
/* get format string if requested */
|
||||
if (wParam && lParam)
|
||||
|
@ -1241,7 +1241,7 @@ end_of_mci_open:
|
|||
return 0;
|
||||
|
||||
case MCIWNDM_SETZOOM:
|
||||
TRACE("MCIWNDM_SETZOOM %ld\n", lParam);
|
||||
TRACE("MCIWNDM_SETZOOM %Id\n", lParam);
|
||||
mwi->zoom = lParam;
|
||||
|
||||
if (mwi->mci && !(mwi->dwStyle & MCIWNDF_NOAUTOSIZEWINDOW))
|
||||
|
|
|
@ -66,7 +66,7 @@ static inline const char *wine_dbgstr_fcc( DWORD fcc )
|
|||
if (isalnum(fcc_str[0]) && isalnum(fcc_str[1]) && isalnum(fcc_str[2])
|
||||
&& (isalnum(fcc_str[3]) || isspace(fcc_str[3])))
|
||||
return wine_dbg_sprintf("%s", fcc_str);
|
||||
return wine_dbg_sprintf("0x%08x", fcc);
|
||||
return wine_dbg_sprintf("0x%08lx", fcc);
|
||||
}
|
||||
|
||||
static const char *wine_dbgstr_icerr( int ret )
|
||||
|
@ -117,7 +117,7 @@ HMODULE MSVFW32_hModule;
|
|||
|
||||
BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
|
||||
{
|
||||
TRACE("%p,%x,%p\n", hinst, reason, reserved);
|
||||
TRACE("%p,%lx,%p\n", hinst, reason, reserved);
|
||||
|
||||
switch(reason)
|
||||
{
|
||||
|
@ -138,7 +138,7 @@ static LRESULT MSVIDEO_SendMessage(WINE_HIC* whic, UINT msg, DWORD_PTR lParam1,
|
|||
{
|
||||
LRESULT ret;
|
||||
|
||||
#define XX(x) case x: TRACE("(%p,"#x",0x%08lx,0x%08lx)\n",whic,lParam1,lParam2); break
|
||||
#define XX(x) case x: TRACE("(%p,"#x",0x%08Ix,0x%08Ix)\n",whic,lParam1,lParam2); break
|
||||
|
||||
switch (msg) {
|
||||
/* DRV_* */
|
||||
|
@ -199,7 +199,7 @@ static LRESULT MSVIDEO_SendMessage(WINE_HIC* whic, UINT msg, DWORD_PTR lParam1,
|
|||
XX(ICM_DECOMPRESSEX_END);
|
||||
XX(ICM_SET_STATUS_PROC);
|
||||
default:
|
||||
FIXME("(%p,0x%08x,0x%08lx,0x%08lx) unknown message\n",whic,msg,lParam1,lParam2);
|
||||
FIXME("(%p,0x%08x,0x%08Ix,0x%08Ix) unknown message\n",whic,msg,lParam1,lParam2);
|
||||
}
|
||||
|
||||
#undef XX
|
||||
|
@ -350,7 +350,7 @@ BOOL VFWAPI ICInstall(DWORD type, DWORD handler, LPARAM lparam, char *desc, UINT
|
|||
{
|
||||
struct reg_driver *driver;
|
||||
|
||||
TRACE("type %s, handler %s, lparam %#lx, desc %s, flags %#x.\n",
|
||||
TRACE("type %s, handler %s, lparam %#Ix, desc %s, flags %#x.\n",
|
||||
wine_dbgstr_fcc(type), wine_dbgstr_fcc(handler), lparam, debugstr_a(desc), flags);
|
||||
|
||||
LIST_FOR_EACH_ENTRY(driver, ®_driver_list, struct reg_driver, entry)
|
||||
|
@ -596,7 +596,7 @@ LRESULT VFWAPI ICGetInfo(HIC hic, ICINFO *picinfo, DWORD cb)
|
|||
LRESULT ret;
|
||||
WINE_HIC* whic = MSVIDEO_GetHicPtr(hic);
|
||||
|
||||
TRACE("(%p,%p,%d)\n", hic, picinfo, cb);
|
||||
TRACE("(%p,%p,%ld)\n", hic, picinfo, cb);
|
||||
|
||||
if (!whic) return ICERR_BADHANDLE;
|
||||
if (!picinfo) return MMSYSERR_INVALPARAM;
|
||||
|
@ -802,7 +802,7 @@ ICCompress(
|
|||
{
|
||||
ICCOMPRESS iccmp;
|
||||
|
||||
TRACE("(%p,%d,%p,%p,%p,%p,...)\n",hic,dwFlags,lpbiOutput,lpData,lpbiInput,lpBits);
|
||||
TRACE("(%p,%ld,%p,%p,%p,%p,...)\n",hic,dwFlags,lpbiOutput,lpData,lpbiInput,lpBits);
|
||||
|
||||
iccmp.dwFlags = dwFlags;
|
||||
|
||||
|
@ -830,7 +830,7 @@ DWORD VFWAPIV ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat,
|
|||
ICDECOMPRESS icd;
|
||||
DWORD ret;
|
||||
|
||||
TRACE("(%p,%d,%p,%p,%p,%p)\n",hic,dwFlags,lpbiFormat,lpData,lpbi,lpBits);
|
||||
TRACE("(%p,%ld,%p,%p,%p,%p)\n",hic,dwFlags,lpbiFormat,lpData,lpbi,lpBits);
|
||||
|
||||
icd.dwFlags = dwFlags;
|
||||
icd.lpbiInput = lpbiFormat;
|
||||
|
@ -886,7 +886,7 @@ static BOOL enum_compressors(HWND list, COMPVARS *pcv, BOOL enum_all)
|
|||
{
|
||||
if (ICCompressQuery(hic, pcv->lpbiIn, NULL) != ICERR_OK)
|
||||
{
|
||||
TRACE("fccHandler %s doesn't support input DIB format %d\n",
|
||||
TRACE("fccHandler %s doesn't support input DIB format %ld\n",
|
||||
wine_dbgstr_fcc(icinfo.fccHandler), pcv->lpbiIn->bmiHeader.biCompression);
|
||||
ICClose(hic);
|
||||
continue;
|
||||
|
@ -1200,7 +1200,7 @@ DWORD VFWAPIV ICDrawBegin(
|
|||
|
||||
ICDRAWBEGIN icdb;
|
||||
|
||||
TRACE("(%p,%d,%p,%p,%p,%u,%u,%u,%u,%p,%u,%u,%u,%u,%d,%d)\n",
|
||||
TRACE("(%p,%ld,%p,%p,%p,%u,%u,%u,%u,%p,%u,%u,%u,%u,%ld,%ld)\n",
|
||||
hic, dwFlags, hpal, hwnd, hdc, xDst, yDst, dxDst, dyDst,
|
||||
lpbi, xSrc, ySrc, dxSrc, dySrc, dwRate, dwScale);
|
||||
|
||||
|
@ -1228,7 +1228,7 @@ DWORD VFWAPIV ICDrawBegin(
|
|||
DWORD VFWAPIV ICDraw(HIC hic, DWORD dwFlags, LPVOID lpFormat, LPVOID lpData, DWORD cbData, LONG lTime) {
|
||||
ICDRAW icd;
|
||||
|
||||
TRACE("(%p,%d,%p,%p,%d,%d)\n",hic,dwFlags,lpFormat,lpData,cbData,lTime);
|
||||
TRACE("(%p,%ld,%p,%p,%ld,%ld)\n",hic,dwFlags,lpFormat,lpData,cbData,lTime);
|
||||
|
||||
icd.dwFlags = dwFlags;
|
||||
icd.lpFormat = lpFormat;
|
||||
|
@ -1287,7 +1287,7 @@ HANDLE VFWAPI ICImageCompress(
|
|||
LPBITMAPINFO lpbiOut, LONG lQuality,
|
||||
LONG* plSize)
|
||||
{
|
||||
FIXME("(%p,%08x,%p,%p,%p,%d,%p)\n",
|
||||
FIXME("(%p,%08x,%p,%p,%p,%ld,%p)\n",
|
||||
hic, uiFlags, lpbiIn, lpBits, lpbiOut, lQuality, plSize);
|
||||
|
||||
return NULL;
|
||||
|
@ -1389,7 +1389,7 @@ HANDLE VFWAPI ICImageDecompress(
|
|||
goto err;
|
||||
bInDecompress = TRUE;
|
||||
|
||||
TRACE( "cbHdr %d, biSizeImage %d\n", cbHdr, biSizeImage );
|
||||
TRACE( "cbHdr %ld, biSizeImage %ld\n", cbHdr, biSizeImage );
|
||||
|
||||
hMem = GlobalAlloc( GMEM_MOVEABLE|GMEM_ZEROINIT, cbHdr + biSizeImage );
|
||||
if ( hMem == NULL )
|
||||
|
@ -1434,7 +1434,7 @@ LPVOID VFWAPI ICSeqCompressFrame(PCOMPVARS pc, UINT uiFlags, LPVOID lpBits, BOOL
|
|||
|
||||
if (pc->cbState != sizeof(ICCOMPRESS))
|
||||
{
|
||||
ERR("Invalid cbState %i\n", pc->cbState);
|
||||
ERR("Invalid cbState %li\n", pc->cbState);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -1475,7 +1475,7 @@ LPVOID VFWAPI ICSeqCompressFrame(PCOMPVARS pc, UINT uiFlags, LPVOID lpBits, BOOL
|
|||
pc->lpBitsPrev = oldout;
|
||||
pc->lpBitsOut = oldprev;
|
||||
|
||||
TRACE("returning: %p, compressed frame size %u\n", icComp->lpOutput, *plSize);
|
||||
TRACE("returning: %p, compressed frame size %lu\n", icComp->lpOutput, *plSize);
|
||||
return icComp->lpOutput;
|
||||
}
|
||||
return NULL;
|
||||
|
@ -1579,12 +1579,12 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn)
|
|||
}
|
||||
}
|
||||
|
||||
TRACE("Input: %ux%u, fcc %s, bpp %u, size %u\n",
|
||||
TRACE("Input: %lux%lu, fcc %s, bpp %u, size %lu\n",
|
||||
pc->lpbiIn->bmiHeader.biWidth, pc->lpbiIn->bmiHeader.biHeight,
|
||||
wine_dbgstr_fcc(pc->lpbiIn->bmiHeader.biCompression),
|
||||
pc->lpbiIn->bmiHeader.biBitCount,
|
||||
pc->lpbiIn->bmiHeader.biSizeImage);
|
||||
TRACE("Output: %ux%u, fcc %s, bpp %u, size %u\n",
|
||||
TRACE("Output: %lux%lu, fcc %s, bpp %u, size %lu\n",
|
||||
pc->lpbiOut->bmiHeader.biWidth, pc->lpbiOut->bmiHeader.biHeight,
|
||||
wine_dbgstr_fcc(pc->lpbiOut->bmiHeader.biCompression),
|
||||
pc->lpbiOut->bmiHeader.biBitCount,
|
||||
|
@ -1599,13 +1599,13 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn)
|
|||
goto error;
|
||||
|
||||
TRACE("Compvars:\n"
|
||||
"\tsize: %i\n"
|
||||
"\tflags: 0x%x\n"
|
||||
"\tsize: %lu\n"
|
||||
"\tflags: 0x%lx\n"
|
||||
"\thic: %p\n"
|
||||
"\ttype: %s\n"
|
||||
"\thandler: %s\n"
|
||||
"\tin/out: %p/%p\n"
|
||||
"\tkey/data/quality: %i/%i/%i\n",
|
||||
"\tkey/data/quality: %li/%li/%li\n",
|
||||
pc->cbSize, pc->dwFlags, pc->hic, wine_dbgstr_fcc(pc->fccType),
|
||||
wine_dbgstr_fcc(pc->fccHandler), pc->lpbiIn, pc->lpbiOut, pc->lKey,
|
||||
pc->lDataRate, pc->lQ);
|
||||
|
|
Loading…
Reference in a new issue