diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 7f21c8c6b..277afacc5 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,31 @@ +2008-09-24 Chris Sutcliffe + + * include/vfw.h (WM_CAP_SET_CALLBACK_ERRORA, WM_CAP_SET_CALLBACK_ERRORW, + WM_CAP_SET_CALLBACK_STATUS, WM_CAP_SET_CALLBACK_YIELD, + WM_CAP_SET_CALLBACK_FRAMEA, WM_CAP_SET_CALLBACK_FRAMEW, + WM_CAP_SET_CALLBACK_VIDEOSTREAM, WM_CAP_SET_CALLBACK_WAVESTREAM, + WM_CAP_GET_USER_DATA, WM_CAP_SET_USER_DATA, WM_CAP_DRIVER_CONNECT, + WM_CAP_DRIVER_DISCONNECT, WM_CAP_DRIVER_GET_NAMEA, WM_CAP_DRIVER_GET_NAMEW, + WM_CAP_DRIVER_GET_VERSIONA, WM_CAP_DRIVER_GET_VERSIONW, + WM_CAP_DRIVER_GET_CAPS, WM_CAP_FILE_SET_CAPTURE_FILEA, + WM_CAP_FILE_SET_CAPTURE_FILEW, WM_CAP_FILE_GET_CAPTURE_FILEA, + WM_CAP_FILE_GET_CAPTURE_FILEW, WM_CAP_FILE_ALLOCATE, WM_CAP_FILE_SAVEASA, + WM_CAP_FILE_SAVEASW, WM_CAP_FILE_SET_INFOCHUNK, WM_CAP_FILE_SAVEDIBA, + WM_CAP_FILE_SAVEDIBW, WM_CAP_EDIT_COPY, WM_CAP_SET_AUDIOFORMAT, + WM_CAP_GET_AUDIOFORMAT, WM_CAP_DLG_VIDEOFORMAT, WM_CAP_DLG_VIDEOSOURCE, + WM_CAP_DLG_VIDEODISPLAY, WM_CAP_GET_VIDEOFORMAT, WM_CAP_SET_VIDEOFORMAT, + WM_CAP_DLG_VIDEOCOMPRESSION, WM_CAP_SET_PREVIEW, WM_CAP_SET_OVERLAY, + WM_CAP_SET_PREVIEWRATE, WM_CAP_SET_SCALE, WM_CAP_GET_STATUS, + WM_CAP_SET_SCROLL, WM_CAP_GRAB_FRAME, WM_CAP_GRAB_FRAME_NOSTOP, + WM_CAP_SEQUENCE, WM_CAP_SEQUENCE_NOFILE, WM_CAP_SET_SEQUENCE_SETUP, + WM_CAP_GET_SEQUENCE_SETUP, WM_CAP_SET_MCI_DEVICEA, WM_CAP_SET_MCI_DEVICEW, + WM_CAP_GET_MCI_DEVICEA, WM_CAP_GET_MCI_DEVICEW, WM_CAP_STOP, WM_CAP_ABORT, + WM_CAP_SINGLE_FRAME_OPEN, WM_CAP_SINGLE_FRAME_CLOSE, WM_CAP_SINGLE_FRAME, + WM_CAP_PAL_OPENA, WM_CAP_PAL_OPENW, WM_CAP_PAL_SAVEA, WM_CAP_PAL_SAVEW, + WM_CAP_PAL_PASTE, WM_CAP_PAL_AUTOCREATE, WM_CAP_PAL_MANUALCREATE, + WM_CAP_SET_CALLBACK_CAPCONTROL): Define using WM_USER. + (capSendMessage): Don't undef. + 2008-09-21 Chris Sutcliffe * incude/sspi.h: include subauth.h to fix issue of UNICODE_STRING being diff --git a/winsup/w32api/include/vfw.h b/winsup/w32api/include/vfw.h index 8c8b8c5b8..83141e642 100644 --- a/winsup/w32api/include/vfw.h +++ b/winsup/w32api/include/vfw.h @@ -1131,77 +1131,71 @@ ICDecompressExQuery(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiSrc,LPVOID lpSr return ICSendMessage(hic,ICM_DECOMPRESSEX_QUERY,(DWORD)&ic,sizeof(ic)); } -#define WM_CAP_FIRSTA (WM_USER) -#define WM_CAP_FIRSTW (WM_USER + 100) - -#define WM_CAP_SET_CALLBACK_ERRORA (WM_CAP_FIRSTA + 2) -#define WM_CAP_SET_CALLBACK_ERRORW (WM_CAP_FIRSTW + 2) -#define WM_CAP_SET_CALLBACK_STATUS (WM_CAP_FIRSTA + 3) -#define WM_CAP_SET_CALLBACK_YIELD (WM_CAP_FIRSTA + 4) -#define WM_CAP_SET_CALLBACK_FRAMEA (WM_CAP_FIRSTA + 5) -#define WM_CAP_SET_CALLBACK_FRAMEW (WM_CAP_FIRSTW + 5) -#define WM_CAP_SET_CALLBACK_VIDEOSTREAM (WM_CAP_FIRSTA + 6) -#define WM_CAP_SET_CALLBACK_WAVESTREAM (WM_CAP_FIRSTA + 7) -#define WM_CAP_GET_USER_DATA (WM_CAP_FIRSTA + 8) -#define WM_CAP_SET_USER_DATA (WM_CAP_FIRSTA + 9) -#define WM_CAP_DRIVER_CONNECT (WM_CAP_FIRSTA + 10) -#define WM_CAP_DRIVER_DISCONNECT (WM_CAP_FIRSTA + 11) -#define WM_CAP_DRIVER_GET_NAMEA (WM_CAP_FIRSTA + 12) -#define WM_CAP_DRIVER_GET_NAMEW (WM_CAP_FIRSTW + 12) -#define WM_CAP_DRIVER_GET_VERSIONA (WM_CAP_FIRSTA + 13) -#define WM_CAP_DRIVER_GET_VERSIONW (WM_CAP_FIRSTW + 13) -#define WM_CAP_DRIVER_GET_CAPS (WM_CAP_FIRSTA + 14) -#define WM_CAP_FILE_SET_CAPTURE_FILEA (WM_CAP_FIRSTA + 20) -#define WM_CAP_FILE_SET_CAPTURE_FILEW (WM_CAP_FIRSTW + 20) -#define WM_CAP_FILE_GET_CAPTURE_FILEA (WM_CAP_FIRSTA + 21) -#define WM_CAP_FILE_GET_CAPTURE_FILEW (WM_CAP_FIRSTW + 21) -#define WM_CAP_FILE_ALLOCATE (WM_CAP_FIRSTA + 22) -#define WM_CAP_FILE_SAVEASA (WM_CAP_FIRSTA + 23) -#define WM_CAP_FILE_SAVEASW (WM_CAP_FIRSTW + 23) -#define WM_CAP_FILE_SET_INFOCHUNK (WM_CAP_FIRSTA + 24) -#define WM_CAP_FILE_SAVEDIBA (WM_CAP_FIRSTA + 25) -#define WM_CAP_FILE_SAVEDIBW (WM_CAP_FIRSTW + 25) -#define WM_CAP_EDIT_COPY (WM_CAP_FIRSTA + 30) -#define WM_CAP_SET_AUDIOFORMAT (WM_CAP_FIRSTA + 35) -#define WM_CAP_GET_AUDIOFORMAT (WM_CAP_FIRSTA + 36) -#define WM_CAP_DLG_VIDEOFORMAT (WM_CAP_FIRSTA + 41) -#define WM_CAP_DLG_VIDEOSOURCE (WM_CAP_FIRSTA + 42) -#define WM_CAP_DLG_VIDEODISPLAY (WM_CAP_FIRSTA + 43) -#define WM_CAP_GET_VIDEOFORMAT (WM_CAP_FIRSTA + 44) -#define WM_CAP_SET_VIDEOFORMAT (WM_CAP_FIRSTA + 45) -#define WM_CAP_DLG_VIDEOCOMPRESSION (WM_CAP_FIRSTA + 46) -#define WM_CAP_SET_PREVIEW (WM_CAP_FIRSTA + 50) -#define WM_CAP_SET_OVERLAY (WM_CAP_FIRSTA + 51) -#define WM_CAP_SET_PREVIEWRATE (WM_CAP_FIRSTA + 52) -#define WM_CAP_SET_SCALE (WM_CAP_FIRSTA + 53) -#define WM_CAP_GET_STATUS (WM_CAP_FIRSTA + 54) -#define WM_CAP_SET_SCROLL (WM_CAP_FIRSTA + 55) -#define WM_CAP_GRAB_FRAME (WM_CAP_FIRSTA + 60) -#define WM_CAP_GRAB_FRAME_NOSTOP (WM_CAP_FIRSTA + 61) -#define WM_CAP_SEQUENCE (WM_CAP_FIRSTA + 62) -#define WM_CAP_SEQUENCE_NOFILE (WM_CAP_FIRSTA + 63) -#define WM_CAP_SET_SEQUENCE_SETUP (WM_CAP_FIRSTA + 64) -#define WM_CAP_GET_SEQUENCE_SETUP (WM_CAP_FIRSTA + 65) -#define WM_CAP_SET_MCI_DEVICEA (WM_CAP_FIRSTA + 66) -#define WM_CAP_SET_MCI_DEVICEW (WM_CAP_FIRSTW + 66) -#define WM_CAP_GET_MCI_DEVICEA (WM_CAP_FIRSTA + 67) -#define WM_CAP_GET_MCI_DEVICEW (WM_CAP_FIRSTW + 67) -#define WM_CAP_STOP (WM_CAP_FIRSTA + 68) -#define WM_CAP_ABORT (WM_CAP_FIRSTA + 69) -#define WM_CAP_SINGLE_FRAME_OPEN (WM_CAP_FIRSTA + 70) -#define WM_CAP_SINGLE_FRAME_CLOSE (WM_CAP_FIRSTA + 71) -#define WM_CAP_SINGLE_FRAME (WM_CAP_FIRSTA + 72) -#define WM_CAP_PAL_OPENA (WM_CAP_FIRSTA + 80) -#define WM_CAP_PAL_OPENW (WM_CAP_FIRSTW + 80) -#define WM_CAP_PAL_SAVEA (WM_CAP_FIRSTA + 81) -#define WM_CAP_PAL_SAVEW (WM_CAP_FIRSTW + 81) -#define WM_CAP_PAL_PASTE (WM_CAP_FIRSTA + 82) -#define WM_CAP_PAL_AUTOCREATE (WM_CAP_FIRSTA + 83) -#define WM_CAP_PAL_MANUALCREATE (WM_CAP_FIRSTA + 84) -#define WM_CAP_SET_CALLBACK_CAPCONTROL (WM_CAP_FIRSTA + 85) - -#undef WM_CAP_FIRSTA -#undef WM_CAP_FIRSTW +#define WM_CAP_SET_CALLBACK_ERRORA (WM_USER + 2) +#define WM_CAP_SET_CALLBACK_ERRORW (WM_CAP_SET_CALLBACK_ERRORA + 100) +#define WM_CAP_SET_CALLBACK_STATUS (WM_USER + 3) +#define WM_CAP_SET_CALLBACK_YIELD (WM_USER + 4) +#define WM_CAP_SET_CALLBACK_FRAMEA (WM_USER + 5) +#define WM_CAP_SET_CALLBACK_FRAMEW (WM_CAP_SET_CALLBACK_FRAMEA + 100) +#define WM_CAP_SET_CALLBACK_VIDEOSTREAM (WM_USER + 6) +#define WM_CAP_SET_CALLBACK_WAVESTREAM (WM_USER + 7) +#define WM_CAP_GET_USER_DATA (WM_USER + 8) +#define WM_CAP_SET_USER_DATA (WM_USER + 9) +#define WM_CAP_DRIVER_CONNECT (WM_USER + 10) +#define WM_CAP_DRIVER_DISCONNECT (WM_USER + 11) +#define WM_CAP_DRIVER_GET_NAMEA (WM_USER + 12) +#define WM_CAP_DRIVER_GET_NAMEW (WM_CAP_DRIVER_GET_NAMEA + 100) +#define WM_CAP_DRIVER_GET_VERSIONA (WM_USER + 13) +#define WM_CAP_DRIVER_GET_VERSIONW (WM_CAP_DRIVER_GET_VERSIONA + 100) +#define WM_CAP_DRIVER_GET_CAPS (WM_USER + 14) +#define WM_CAP_FILE_SET_CAPTURE_FILEA (WM_USER + 20) +#define WM_CAP_FILE_SET_CAPTURE_FILEW (WM_CAP_FILE_SET_CAPTURE_FILEA + 100) +#define WM_CAP_FILE_GET_CAPTURE_FILEA (WM_USER + 21) +#define WM_CAP_FILE_GET_CAPTURE_FILEW (WM_CAP_FILE_GET_CAPTURE_FILEA + 100) +#define WM_CAP_FILE_ALLOCATE (WM_USER + 22) +#define WM_CAP_FILE_SAVEASA (WM_USER + 23) +#define WM_CAP_FILE_SAVEASW (WM_CAP_FILE_SAVEASA + 100) +#define WM_CAP_FILE_SET_INFOCHUNK (WM_USER + 24) +#define WM_CAP_FILE_SAVEDIBA (WM_USER + 25) +#define WM_CAP_FILE_SAVEDIBW (WM_CAP_FILE_SAVEDIBA + 100) +#define WM_CAP_EDIT_COPY (WM_USER + 30) +#define WM_CAP_SET_AUDIOFORMAT (WM_USER + 35) +#define WM_CAP_GET_AUDIOFORMAT (WM_USER + 36) +#define WM_CAP_DLG_VIDEOFORMAT (WM_USER + 41) +#define WM_CAP_DLG_VIDEOSOURCE (WM_USER + 42) +#define WM_CAP_DLG_VIDEODISPLAY (WM_USER + 43) +#define WM_CAP_GET_VIDEOFORMAT (WM_USER + 44) +#define WM_CAP_SET_VIDEOFORMAT (WM_USER + 45) +#define WM_CAP_DLG_VIDEOCOMPRESSION (WM_USER + 46) +#define WM_CAP_SET_PREVIEW (WM_USER + 50) +#define WM_CAP_SET_OVERLAY (WM_USER + 51) +#define WM_CAP_SET_PREVIEWRATE (WM_USER + 52) +#define WM_CAP_SET_SCALE (WM_USER + 53) +#define WM_CAP_GET_STATUS (WM_USER + 54) +#define WM_CAP_SET_SCROLL (WM_USER + 55) +#define WM_CAP_GRAB_FRAME (WM_USER + 60) +#define WM_CAP_GRAB_FRAME_NOSTOP (WM_USER + 61) +#define WM_CAP_SEQUENCE (WM_USER + 62) +#define WM_CAP_SEQUENCE_NOFILE (WM_USER + 63) +#define WM_CAP_SET_SEQUENCE_SETUP (WM_USER + 64) +#define WM_CAP_GET_SEQUENCE_SETUP (WM_USER + 65) +#define WM_CAP_SET_MCI_DEVICEA (WM_USER + 66) +#define WM_CAP_SET_MCI_DEVICEW (WM_CAP_SET_MCI_DEVICEA + 100) +#define WM_CAP_GET_MCI_DEVICEA (WM_USER + 67) +#define WM_CAP_GET_MCI_DEVICEW (WM_CAP_GET_MCI_DEVICEA + 100) +#define WM_CAP_STOP (WM_USER + 68) +#define WM_CAP_ABORT (WM_USER + 69) +#define WM_CAP_SINGLE_FRAME_OPEN (WM_USER + 70) +#define WM_CAP_SINGLE_FRAME_CLOSE (WM_USER + 71) +#define WM_CAP_SINGLE_FRAME (WM_USER + 72) +#define WM_CAP_PAL_OPENA (WM_USER + 80) +#define WM_CAP_PAL_OPENW (WM_CAP_PAL_OPENA + 100) +#define WM_CAP_PAL_SAVEA (WM_USER + 81) +#define WM_CAP_PAL_SAVEW (WM_CAP_PAL_SAVEA + 100) +#define WM_CAP_PAL_PASTE (WM_USER + 82) +#define WM_CAP_PAL_AUTOCREATE (WM_USER + 83) +#define WM_CAP_PAL_MANUALCREATE (WM_USER + 84) +#define WM_CAP_SET_CALLBACK_CAPCONTROL (WM_USER + 85) #ifdef UNICODE #define WM_CAP_SET_CALLBACK_ERROR WM_CAP_SET_CALLBACK_ERRORW @@ -1289,8 +1283,6 @@ ICDecompressExQuery(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiSrc,LPVOID lpSr #define capPaletteManual(hwnd,fGrab,iColors) ((BOOL) capSendMessage(hwnd,WM_CAP_PAL_MANUALCREATE,(WPARAM)(fGrab),(LPARAM)(DWORD)(iColors))) #define capSetCallbackOnCapControl(hwnd,fpProc) ((BOOL) capSendMessage(hwnd,WM_CAP_SET_CALLBACK_CAPCONTROL,0,(LPARAM)(LPVOID)(fpProc))) -#undef capSendMessage - /* AVICAP32 exports */ HWND VFWAPI capCreateCaptureWindowA (LPCSTR,DWORD,int,int,int,int,HWND,int); HWND VFWAPI capCreateCaptureWindowW (LPCWSTR,DWORD,int,int,int,int,HWND,int);