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

List:       helix-video-dev
Subject:    [Video-dev] CN - Fixed function pointer prototype mismatch
From:       Jeff Leitner <jeffl () real ! com>
Date:       2006-10-04 21:05:33
Message-ID: 6.2.1.2.2.20061004140516.05fd8c98 () mailone ! real ! com
[Download RAW message or body]

Thanks Greg.  This has been checked in.

jeff

At 01:55 PM 10/4/2006, Greg Wright wrote:
>Looks good.
>--greg.
>
>
>Jeff Leitner wrote:
>>Modified by: jeffl@real.com
>>Reviewed by:
>>Date: 10/04/2006
>>Project: Video
>>Synopsis:
>>The incorrect calling convention is being used
>>Overview:
>>The function prototype doesn't match the calling convention of the 
>>function being called.
>>This code has been tested and built on Windows.
>>Files Modified:
>>video\sitelib\platform\win\windraw2.cpp
>>Image Size and Heap Use impact:
>>N/A
>>Platforms and Profiles Affected:
>>All
>>Platforms and Profiles Build Verified:
>>Windows, helix-client-all-defines
>>Platforms and Profiles Functionality verified:
>>Windows, helix-client-all-defines
>>Branch:
>>HEAD
>>hxclient_1_5_0_cayenne
>>Index: platform/win/windraw2.cpp
>>===================================================================
>>RCS file: /cvsroot/video/sitelib/platform/win/windraw2.cpp,v
>>retrieving revision 1.23.4.4
>>diff -u -w -r1.23.4.4 windraw2.cpp
>>--- platform/win/windraw2.cpp    15 Mar 2006 22:09:23 -0000    1.23.4.4
>>+++ platform/win/windraw2.cpp    4 Oct 2006 20:42:33 -0000
>>@@ -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,7 +207,7 @@
>>  } FINDDEVICEDATA;
>>
>>-static BOOL CALLBACK FindDeviceCallback (GUID* lpGUID, LPSTR lpszName,
>>+static BOOL WINAPI FindDeviceCallback (GUID* lpGUID, LPSTR lpszName,
>>                                           LPSTR lpszDevice, LPVOID lParam)
>>  {
>>      FINDDEVICEDATA *p = (FINDDEVICEDATA*) lParam;
>>
>>_______________________________________________
>>Video-dev mailing list
>>Video-dev@helixcommunity.org
>>http://lists.helixcommunity.org/mailman/listinfo/video-dev



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