From b40f374449cf5d1d25413ed7a82a2f9e4c894ead Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 14 Aug 2000 10:59:32 +0000 Subject: [PATCH] The include files for the windows codec loader. top level configure file. Original commit message from CVS: The include files for the windows codec loader. top level configure file. --- configure.in | 10 +++-- include/avifmt.h | 14 +++++-- include/registry.h | 17 +++++++-- include/wine/vfw.h | 15 +++++++- include/wine/winbase.h | 83 ------------------------------------------ include/wine/windef.h | 6 +-- 6 files changed, 47 insertions(+), 98 deletions(-) diff --git a/configure.in b/configure.in index 2d50067492..3bca5d7107 100644 --- a/configure.in +++ b/configure.in @@ -3,8 +3,8 @@ AC_INIT(gst/gstobject.h) AM_CONFIG_HEADER(config.h) STREAMER_MAJOR_VERSION=0 -STREAMER_MINOR_VERSION=0 -STREAMER_MICRO_VERSION=9.2 +STREAMER_MINOR_VERSION=9 +STREAMER_MICRO_VERSION=2 STREAMER_VERSION=$STREAMER_MAJOR_VERSION.$STREAMER_MINOR_VERSION.$STREAMER_MICRO_VERSION dnl libtool @@ -51,7 +51,7 @@ AM_PATH_GLIB(1.2.0,, glib gmodule gthread) dnl Put the glib flags into $LIBS and $CFLAGS since we always use them LIBS="$LIBS $GLIB_LIBS" -CFLAGS="$CFLAGS $GLIB_CFLAGS" +CFLAGS="$FLAGS $GLIB_CFLAGS" dnl Check for libxml AC_PATH_PROG(XML_CONFIG, xml-config, no) @@ -306,7 +306,7 @@ AM_CONDITIONAL(HAVE_LIBMMX, test "x$USE_LIBMMX" = "xyes") AM_CONDITIONAL(HAVE_ATOMIC_H, test "x$USE_ATOMIC_H" = "xyes") AM_CONDITIONAL(HAVE_XAUDIO, test "x$HAVE_XAUDIO" = "xyes") AM_CONDITIONAL(HAVE_CSSAUTH, test "x$HAVE_CSSAUTH" = "xyes") -AM_CONDITIONAL(HAVE_GTK_DOC, test "x$HAVE_GTK_DOC" = "xyes") +AM_CONDITIONAL(HAVE_GTK_DOC, $HAVE_GTK_DOC) dnl FIXME: having to AC_SUBST these is messy. Not sure if CPPFLAGS and LDFLAGS @@ -345,6 +345,7 @@ plugins/Makefile plugins/au/Makefile plugins/wav/Makefile plugins/avi/Makefile +plugins/avi/wincodec/Makefile plugins/jpeg/Makefile plugins/mp3decode/Makefile plugins/mp3decode/xa/Makefile @@ -357,6 +358,7 @@ plugins/mpeg2/ac3parse/Makefile plugins/mpeg2/ac3dec/Makefile plugins/mpeg2/video/Makefile plugins/mpeg2/mpeg2enc/Makefile +plugins/mpeg2/subtitles/Makefile plugins/mpeg1/Makefile plugins/mpeg1/mpeg_play/Makefile plugins/mpeg1/mpegaudio/Makefile diff --git a/include/avifmt.h b/include/avifmt.h index 07e2387c7e..d11a663a85 100644 --- a/include/avifmt.h +++ b/include/avifmt.h @@ -3,8 +3,10 @@ * AVIFMT - AVI file format definitions * ****************************************************************************/ - -#ifndef NOAVIFMT +#ifndef AVIFMT +#define AVIFMT + +#ifndef NOAVIFMT #ifndef __WINE_WINDEF_H #include @@ -217,6 +219,9 @@ typedef struct { #define AVIIF_NOTIME 0x00000100L // this frame doesn't take any time #define AVIIF_COMPUSE 0x0FFF0000L // these bits are for compressor use + +#define FOURCC_RIFF mmioFOURCC('R', 'I', 'F', 'F') +#define FOURCC_LIST mmioFOURCC('L', 'I', 'S', 'T') typedef struct { @@ -225,10 +230,13 @@ typedef struct DWORD dwChunkOffset; // Position of chunk DWORD dwChunkLength; // Length of chunk } AVIINDEXENTRY; + +#define AVISTREAMREAD_CONVENIENT (-1L) /* ** Palette change chunk ** ** Used in video streams. */ -#endif /* NOAVIFMT */ \ No newline at end of file +#endif /* NOAVIFMT */ +#endif diff --git a/include/registry.h b/include/registry.h index f101a9f8eb..94f45fc64a 100644 --- a/include/registry.h +++ b/include/registry.h @@ -1,15 +1,24 @@ +/******************************************************** + + Declaration of registry access functions + Copyright 2000 Eugene Smith (divx@euro.ru) + Last modified: 18.06.2000 + +*********************************************************/ + + #ifndef REGISTRY_H #define REGISTRY_H #ifdef __cplusplus extern "C" { #endif -long RegOpenKeyExA(long key, char* subkey, long reserved, long access, int* newkey); +long RegOpenKeyExA(long key, const char* subkey, long reserved, long access, int* newkey); long RegCloseKey(long key); -long RegQueryValueExA(long key, char* value, int* reserved, int* type, int* data, int* count); -long RegCreateKeyExA(long key, char* name, long reserved, +long RegQueryValueExA(long key, const char* value, int* reserved, int* type, int* data, int* count); +long RegCreateKeyExA(long key, const char* name, long reserved, void* classs, long options, long security, void* sec_attr, int* newkey, int* status) ; -long RegSetValueExA(long key, char* name, long v1, long v2, void* data, long size); +long RegSetValueExA(long key, const char* name, long v1, long v2, void* data, long size); #ifdef __cplusplus }; #endif diff --git a/include/wine/vfw.h b/include/wine/vfw.h index c75e1be047..94a672c8ed 100644 --- a/include/wine/vfw.h +++ b/include/wine/vfw.h @@ -215,13 +215,26 @@ long VFWAPIV ICCompress( #define ICCompressGetFormat(hic, lpbiInput, lpbiOutput) \ - ICSendMessage( \ + ICSendMessage( \ hic,ICM_COMPRESS_GET_FORMAT,(long)(void*)(lpbiInput), \ (long)(void*)(lpbiOutput) \ ) #define ICCompressGetFormatSize(hic,lpbi) ICCompressGetFormat(hic,lpbi,NULL) +#define ICGetDefaultKeyFrameRate(hic,lpint) \ + ICSendMessage( \ + hic, ICM_GETDEFAULTKEYFRAMERATE, \ + (long)(void*)(lpint), \ + 0 ) + +#define ICGetDefaultQuality(hic,lpint) \ + ICSendMessage( \ + hic, ICM_GETDEFAULTQUALITY, \ + (long)(void*)(lpint), \ + 0 ) + + #define ICCompressBegin(hic, lpbiInput, lpbiOutput) \ ICSendMessage( \ hic, ICM_COMPRESS_BEGIN, (long)(void*)(lpbiInput), \ diff --git a/include/wine/winbase.h b/include/wine/winbase.h index c801ddcc9a..ee12af3632 100644 --- a/include/wine/winbase.h +++ b/include/wine/winbase.h @@ -1768,88 +1768,6 @@ INT WINAPI lstrcmpiW(LPCWSTR,LPCWSTR); #define ZeroMemory RtlZeroMemory #define CopyMemory RtlCopyMemory -/* a few optimizations for i386/gcc */ - -#if defined(__i386__) && defined(__GNUC__) - -extern inline PVOID WINAPI InterlockedCompareExchange( PVOID *dest, PVOID xchg, PVOID compare ); -extern inline PVOID WINAPI InterlockedCompareExchange( PVOID *dest, PVOID xchg, PVOID compare ) -{ - PVOID ret; - __asm__ __volatile__( "lock; cmpxchgl %2,(%1)" - : "=a" (ret) : "r" (dest), "r" (xchg), "0" (compare) : "memory" ); - return ret; -} - -extern inline LONG WINAPI InterlockedExchange( PLONG dest, LONG val ); -extern inline LONG WINAPI InterlockedExchange( PLONG dest, LONG val ) -{ - LONG ret; - __asm__ __volatile__( "lock; xchgl %0,(%1)" - : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); - return ret; -} - -extern inline LONG WINAPI InterlockedExchangeAdd( PLONG dest, LONG incr ); -extern inline LONG WINAPI InterlockedExchangeAdd( PLONG dest, LONG incr ) -{ - LONG ret; - __asm__ __volatile__( "lock; xaddl %0,(%1)" - : "=r" (ret) : "r" (dest), "0" (incr) : "memory" ); - return ret; -} - -extern inline LONG WINAPI InterlockedIncrement( PLONG dest ); -extern inline LONG WINAPI InterlockedIncrement( PLONG dest ) -{ - return InterlockedExchangeAdd( dest, 1 ) + 1; -} - -extern inline LONG WINAPI InterlockedDecrement( PLONG dest ); -extern inline LONG WINAPI InterlockedDecrement( PLONG dest ) -{ - return InterlockedExchangeAdd( dest, -1 ) - 1; -} - -extern inline DWORD WINAPI GetLastError(void); -extern inline DWORD WINAPI GetLastError(void) -{ - DWORD ret; - __asm__ __volatile__( ".byte 0x64\n\tmovl 0x60,%0" : "=r" (ret) ); - return ret; -} - -extern inline DWORD WINAPI GetCurrentProcessId(void); -extern inline DWORD WINAPI GetCurrentProcessId(void) -{ - DWORD ret; - __asm__ __volatile__( ".byte 0x64\n\tmovl 0x20,%0" : "=r" (ret) ); - return ret; -} - -extern inline DWORD WINAPI GetCurrentThreadId(void); -extern inline DWORD WINAPI GetCurrentThreadId(void) -{ - DWORD ret; - __asm__ __volatile__( ".byte 0x64\n\tmovl 0x24,%0" : "=r" (ret) ); - return ret; -} - -extern inline void WINAPI SetLastError( DWORD err ); -extern inline void WINAPI SetLastError( DWORD err ) -{ - __asm__ __volatile__( ".byte 0x64\n\tmovl %0,0x60" : : "r" (err) : "memory" ); -} - -extern inline HANDLE WINAPI GetProcessHeap(void); -extern inline HANDLE WINAPI GetProcessHeap(void) -{ - HANDLE *pdb; - __asm__ __volatile__( ".byte 0x64\n\tmovl 0x30,%0" : "=r" (pdb) ); - return pdb[0x18 / sizeof(HANDLE)]; /* get dword at offset 0x18 in pdb */ -} - -#else /* __i386__ && __GNUC__ */ DWORD WINAPI GetCurrentProcessId(void); DWORD WINAPI GetCurrentThreadId(void); DWORD WINAPI GetLastError(void); @@ -1860,7 +1778,6 @@ LONG WINAPI InterlockedExchange(PLONG,LONG); LONG WINAPI InterlockedExchangeAdd(PLONG,LONG); LONG WINAPI InterlockedIncrement(PLONG); VOID WINAPI SetLastError(DWORD); -#endif /* __i386__ && __GNUC__ */ #ifdef __WINE__ #define GetCurrentProcess() ((HANDLE)0xffffffff) diff --git a/include/wine/windef.h b/include/wine/windef.h index ff272403bc..61830134c2 100644 --- a/include/wine/windef.h +++ b/include/wine/windef.h @@ -156,11 +156,11 @@ typedef unsigned char BYTE; typedef long LONG; typedef short SHORT; typedef unsigned short USHORT; -#ifdef CHAR -#warning CHAR defined as $(CHAR) -#endif typedef char CHAR; typedef unsigned char UCHAR; + +typedef LONG SCODE; + /* Some systems might have wchar_t, but we really need 16 bit characters */ typedef unsigned short WCHAR; typedef int WIN_BOOL;