[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-video-cvs
Subject:    [Video-cvs] sitelib/platform/win windraw2.cpp,1.28,1.29
From:       jeffl () helixcommunity ! org
Date:       2006-10-04 21:19:45
[Download RAW message or body]

Update of /cvsroot/video/sitelib/platform/win
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv10741

Modified Files:
	windraw2.cpp 
Log Message:
Fixed function prototype mismatches


Index: windraw2.cpp
===================================================================
RCS file: /cvsroot/video/sitelib/platform/win/windraw2.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- windraw2.cpp	15 Mar 2006 22:11:05 -0000	1.28
+++ windraw2.cpp	4 Oct 2006 21:19:43 -0000	1.29
@@ -191,8 +191,8 @@
 #endif
 
 
-typedef HRESULT (*PDRAWCREATE) (IID *,LPDIRECTDRAW *, LPUNKNOWN);
-typedef HRESULT (*PDRAWENUM) (LPDDENUMCALLBACKA, LPVOID);
+typedef HRESULT (WINAPI* PDRAWCREATE) (IID *,LPDIRECTDRAW *, LPUNKNOWN);
+typedef HRESULT (WINAPI* PDRAWENUM) (LPDDENUMCALLBACKA, LPVOID);
 
 /*
  * FindDeviceCallback functions:
@@ -207,8 +207,8 @@
 } FINDDEVICEDATA;
 
 
-static HXBOOL CALLBACK FindDeviceCallback (GUID* lpGUID, LPSTR lpszName,
-					 LPSTR lpszDevice, LPVOID lParam)
+static BOOL WINAPI FindDeviceCallback (GUID* lpGUID, LPSTR lpszName,
+                                         LPSTR lpszDevice, LPVOID lParam)
 {
     FINDDEVICEDATA *p = (FINDDEVICEDATA*) lParam;
     
@@ -226,8 +226,8 @@
     return TRUE;
 }
 
-static HXBOOL CALLBACK FindDeviceCallbackEx (GUID* lpGUID, LPSTR lpszName,
-					   LPSTR lpszDevice, LPVOID lParam, HMONITOR hMonitor)
+static BOOL WINAPI FindDeviceCallbackEx (GUID* lpGUID, LPSTR lpszName,
+                                           LPSTR lpszDevice, LPVOID lParam, HMONITOR hMonitor)
 {
     FINDDEVICEDATA *p = (FINDDEVICEDATA*) lParam;
     



[prev in list] [next in list] [prev in thread] [next in thread]