2003-08-26 Danny Smith <dannysmith@users.sourceforge.net>

* lib/test.c: Add vfw.h to includes.
	* include/mmsystem.h: Add #ifndef guard to definition of
	mmioFOURCC macro.
	* include/vfw.h: Protect __OBJC__ from COM declarations.

2003-08-26  Filip Navara  <xnavara@volny.cz>

	* include/vfw.h: New file.
This commit is contained in:
Danny Smith 2003-08-26 06:54:55 +00:00
parent c01c82c07c
commit 311d0d67b9
4 changed files with 1145 additions and 1 deletions

View File

@ -1,3 +1,14 @@
2003-08-26 Danny Smith <dannysmith@users.sourceforge.net>
* lib/test.c: Add vfw.h to includes.
* include/mmsystem.h: Add #ifndef guard to definition of
mmioFOURCC macro.
* include/vfw.h: Protect __OBJC__ from COM declarations.
2003-08-26 Filip Navara <xnavara@volny.cz>
* include/vfw.h: New file.
2003-08-26 Filip Navara <xnavara@volny.cz>
* include/ddk/winddk.h (RTL_REGISTRY_*): Add defines.

View File

@ -22,6 +22,9 @@ extern "C" {
#define TIME_MIDI 16
#define TIME_TICKS 32
#define MAKEFOURCC(c0,c1,c2,c3) ((DWORD)(BYTE)(c0)|((DWORD)(BYTE)(c1)<<8)|((DWORD)(BYTE)(c2)<<16)|((DWORD)(BYTE)(c3)<<24))
#ifndef mmioFOURCC
#define mmioFOURCC(c0,c1,c2,c3) MAKEFOURCC(c0,c1,c2,c3)
#endif
#define MM_JOY1MOVE 0x3A0
#define MM_JOY2MOVE 0x3A1
#define MM_JOY1ZMOVE 0x3A2
@ -525,7 +528,6 @@ extern "C" {
#define FOURCC_DOS mmioFOURCC('D', 'O', 'S', ' ')
#define FOURCC_MEM mmioFOURCC('M', 'E', 'M', ' ')
#define MMIO_DEFAULTBUFFER 8192
#define mmioFOURCC(c0,c1,c2,c3) MAKEFOURCC(c0,c1,c2,c3)
#define MCIERR_INVALID_DEVICE_ID (MCIERR_BASE+1)
#define MCIERR_UNRECOGNIZED_KEYWORD (MCIERR_BASE+3)
#define MCIERR_UNRECOGNIZED_COMMAND (MCIERR_BASE+5)

1130
winsup/w32api/include/vfw.h Normal file

File diff suppressed because it is too large Load Diff

View File

@ -77,6 +77,7 @@
#include <snmp.h>
#include <winsnmp.h>
#include <mgmtapi.h>
#include <vfw.h>
#ifndef __OBJC__ /* problems with BOOL */
#include <ole2.h>