Alexandre Julliard : msvideo: Pass the correct function address for 32-> 16 callbacks.
Alexandre Julliard
julliard at winehq.org
Mon Oct 5 09:54:29 CDT 2009
Module: wine
Branch: master
Commit: 4e276bf42a973bea57c6b2a12bcc8fe2782f5350
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e276bf42a973bea57c6b2a12bcc8fe2782f5350
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Oct 5 14:56:12 2009 +0200
msvideo: Pass the correct function address for 32->16 callbacks.
---
dlls/msvideo.dll16/msvideo16.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c
index faa8e62..6970278 100644
--- a/dlls/msvideo.dll16/msvideo16.c
+++ b/dlls/msvideo.dll16/msvideo16.c
@@ -670,7 +670,7 @@ BOOL16 VFWAPI ICInfo16(DWORD fccType, DWORD fccHandler, ICINFO16 *lpicinfo)
*
*
*/
-static LRESULT CALLBACK IC_Callback3216(DWORD pfn16, HIC hic, HDRVR hdrv, UINT msg, DWORD lp1, DWORD lp2)
+static LRESULT CALLBACK IC_Callback3216(DWORD pfn16, HIC hic, HDRVR hdrv, UINT msg, LPARAM lp1, LPARAM lp2)
{
WORD args[8];
DWORD ret = 0;
@@ -781,7 +781,7 @@ HIC16 VFWAPI ICOpenFunction16(DWORD fccType, DWORD fccHandler, UINT16 wMode, FAR
LeaveCriticalSection(&msvideo_cs);
return 0;
}
- if ((hic32 = ICOpenFunction(fccType, fccHandler, wMode, IC_Callback3216)))
+ if ((hic32 = ICOpenFunction(fccType, fccHandler, wMode, (DRIVERPROC)thunk)))
thunk->hIC16 = HIC_16(hic32);
else
thunk->pfn16 = 0;
More information about the wine-cvs
mailing list