mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 08:49:15 +00:00
a11d7b1a68
Sun Mar 1 10:45:23 1998 Andreas Mohr <100.30936@germany.net> * [loader/ne_image.c] Fixed problem with weird DLLs (NE_FFLAGS_SINGLEDATA && DGROUP = 0). * [msdos/dosmem.c] Export address for __0000H, too. * [msdos/dpmi.c] Changed MemAlloc functions to return less fragmented addresses. Sat Feb 28 18:50:12 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [scheduler/process.c] [scheduler/sysdeps.c] Don't use %fs register before threading initialization. Sat Feb 28 14:04:56 1998 Kristian Nielsen <kristian.nielsen@risoe.dk> * [configure.in] [include/acconfig.h] Autoconf macro to check for non-reentrant X libraries. * [windows/winpos.c] In SetWindowPos32(), do not cause WM_SIZE messages when the SWP_NOSIZE flag is specified. This fixes the division-by-zero in Borland C++ 4.0 "Open Project" menu item. Sat Feb 28 13:11:26 1998 James Moody <013263m@dragon.acadiau.ca> * [ole/ole2nls.c] Changed "English" values from German to English. * [files/dos_fs.c] Fixed off-by-one month bug. Fri Feb 27 22:12:01 1998 Douglas Ridgway <ridgway@winehq.com> * [windows/win.c] Fix winelib class menu loading bug. * [include/module.h] [loader/module.c] LoadModule32 should be implemented in terms of CreateProcess. * [programs/view/*] Metafile viewer sample program. * [documentation/wine.texinfo] [documentation/Makefile.in] Improvements and additions, HTML target. Fri Feb 27 04:27:48 1998 Dimitrie O. Paun <dimi@cs.toronto.edu> * [*/*] Switched to the new debug messages interface. For more information please refer to documentation/debug-msgs. Because the new scheme introduces a new semantic level, I had to manually do through about 530 dprintf_xxx! The rest of about 2400 where transformed via a script. Because of the large number of changes that I had to do, some may have not come out as nicely as I wanted them. If this is the case, please let me know. There is a lot of work left to do: -- a few hundred printf's to be converted -- about 2300 fprintf's to be converted -- about 600 FIXME's to be transformed The problem is that in the above mentioned cases, a lot of manual intervention is required because a lot of the information is missing. There are also a lot of other things to be done to the interface and so forth. I have now ideas for a at least a month worth of full time work :) I will proceed with many changes in the next few releases, so please do not start modifing things because there will be a hell of a lot of conflicts. If you have ideas that you want to integrate or you want to work on different things, please coordinate with me. Thu Feb 26 13:04:29 1998 David Lee Lambert <lamber45@egr.msu.edu> * [ole/ole2nls.c] [include/windows.h] First try at OLE date- and time-formatting functions. Wed Feb 25 11:20:35 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de> * [files/*.c] Changed dos device handling, added 'CON' devicehandling. * [graphics/ddraw.c] Bug fixes, some additions. * [if1632/builtin.c][loader/module.c][library/winestub.c] Small hack so we don't need a dummy BUILTIN_LoadModule in winestub.c. * [ole/*][relay32/ole32.spec][if1632/storage.spec] storage.dll started. winword loads documents (saving doesn't work yet, dunno why). Several ole additions, some cleanups and bugfixes. IMalloc16 implemented. * [loader/pe_image.c] Added some comments, fixed circular dll references, fixed modref ordering, fixed tls allocation. * [memory/global.c] Added validity checks before every GET_ARENA_PTR. (several functions rely on Global* return values on invalid handles, like IsTask). Implemented GlobalUnlockFree16. * [memory/virtual.c] Replaced dprintf_virtual by fprintf, so we can do 'info map' again in the debugger. Increase read linesize for Linux2.1 cases. * [misc/cpu.c][misc/registry.c] Moved cpu registry initialization to misc/cpu.c. * [multimedia/dsound.c] Enhanced, replaced GETOSPACE bufferingcheck by SETFRAGMENT. * [relay32/crtdll.spec][relay32/ntdll.spec] Replaced some ptr by respective 'str' and 'wstr' arguments for libc functions. * [scheduler/thread.c] Added some sanity checks to stackallocation, tlshandling fixed. * [tools/build.c] Fixed cdecl argumenttype order (was reversed). * [win32/ordinals.c] Implemented KERNEL_449. * [windows/dinput.c] Some fixes, needs much more work. Tomb Raider2 works with keyboard ;) Tue Feb 24 20:46:37 1998 James Juran <jrj120@psu.edu> * [windows/win.c] Fixed USER32 ordinal numbers in documentation. Sat Feb 21 12:30:38 1998 John Richardson <jrichard@zko.dec.com> * [files/file.c] [include/k32obj.h] [memory/virtual.c] [scheduler/critsection.c] [scheduler/event.c] [scheduler/handle.c] [scheduler/k32obj.c] [scheduler/mutex.c] [scheduler/process.c] [scheduler/semaphore.c] [scheduler/thread.c] Added generic k32obj read and write routines for k32objs that support I/O. * [documentation/console] Updated console docs. * [win32/console.c] Make console work like a k32obj that supports I/O. * [include/windows.h] Make WriteFile and ReadFile take HANDLE32 for handle. Sun Feb 15 14:07:07 1998 Dimitrie O. Paun <dimi@mail.cs.toronto.edu> * [controls/menu.c] [misc/ver.c] [multimedia/dsound.c] [multimedia/joystick.c] [windows/dialog.c] Modified some dprintf_xxx's to prepare them for a new dprintf_ scheme. Basically, I changed the dprintf's that outputed a line with many dprintf calls to do just one dprintf call.
255 lines
8.9 KiB
C
255 lines
8.9 KiB
C
#ifndef __WINE_DSOUND_H
|
|
#define __WINE_DSOUND_H
|
|
|
|
#include "mmsystem.h"
|
|
|
|
DEFINE_GUID(CLSID_DirectSound, 0x47d4d946, 0x62e8, 0x11cf, 0x93, 0xbc, 0x44, 0x45, 0x53, 0x54, 0x0, 0x0);
|
|
|
|
DEFINE_GUID(IID_IDirectSound, 0x279AFA83,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
|
|
DEFINE_GUID(IID_IDirectSoundBuffer, 0x279AFA85,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
|
|
DEFINE_GUID(IID_IDirectSoundNotify, 0xB0210783,0x89cd,0x11d0,0xAF,0x08,0x00,0xA0,0xC9,0x25,0xCD,0x16);
|
|
DEFINE_GUID(IID_IDirectSound3DListener, 0x279AFA84,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
|
|
DEFINE_GUID(IID_IDirectSound3DBuffer, 0x279AFA86,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
|
|
DEFINE_GUID(IID_IDirectSoundCapture, 0xB0210781,0x89CD,0x11D0,0xAF,0x08,0x00,0xA0,0xC9,0x25,0xCD,0x16);
|
|
DEFINE_GUID(IID_IDirectSoundCaptureBuffer,0xB0210782,0x89CD,0x11D0,0xAF,0x08,0x00,0xA0,0xC9,0x25,0xCD,0x16);
|
|
DEFINE_GUID(IID_IKsPropertySet, 0x31EFAC30,0x515C,0x11D0,0xA9,0xAA,0x00,0xAA,0x00,0x61,0xBE,0x93);
|
|
|
|
|
|
|
|
typedef struct IDirectSound IDirectSound,*LPDIRECTSOUND;
|
|
typedef struct IDirectSoundNotify IDirectSoundNotify,*LPDIRECTSOUNDNOTIFY;
|
|
typedef struct IDirectSoundBuffer IDirectSoundBuffer,*LPDIRECTSOUNDBUFFER,**LPLPDIRECTSOUNDBUFFER;
|
|
|
|
#define _FACDS 0x878
|
|
#define MAKE_DSHRESULT(code) MAKE_HRESULT(1,_FACDS,code)
|
|
|
|
#define DS_OK 0
|
|
#define DSERR_ALLOCATED MAKE_DSHRESULT(10)
|
|
#define DSERR_CONTROLUNAVAIL MAKE_DSHRESULT(30)
|
|
#define DSERR_INVALIDPARAM E_INVALIDARG
|
|
#define DSERR_INVALIDCALL MAKE_DSHRESULT(50)
|
|
#define DSERR_GENERIC E_FAIL
|
|
#define DSERR_PRIOLEVELNEEDED MAKE_DSHRESULT(70)
|
|
#define DSERR_OUTOFMEMORY E_OUTOFMEMORY
|
|
#define DSERR_BADFORMAT MAKE_DSHRESULT(100)
|
|
#define DSERR_UNSUPPORTED E_NOTIMPL
|
|
#define DSERR_NODRIVER MAKE_DSHRESULT(120)
|
|
#define DSERR_ALREADYINITIALIZED MAKE_DSHRESULT(130)
|
|
#define DSERR_NOAGGREGATION CLASS_E_NOAGGREGATION
|
|
#define DSERR_BUFFERLOST MAKE_DSHRESULT(150)
|
|
#define DSERR_OTHERAPPHASPRIO MAKE_DSHRESULT(160)
|
|
#define DSERR_UNINITIALIZED MAKE_DSHRESULT(170)
|
|
|
|
#define DSCAPS_PRIMARYMONO 0x00000001
|
|
#define DSCAPS_PRIMARYSTEREO 0x00000002
|
|
#define DSCAPS_PRIMARY8BIT 0x00000004
|
|
#define DSCAPS_PRIMARY16BIT 0x00000008
|
|
#define DSCAPS_CONTINUOUSRATE 0x00000010
|
|
#define DSCAPS_EMULDRIVER 0x00000020
|
|
#define DSCAPS_CERTIFIED 0x00000040
|
|
#define DSCAPS_SECONDARYMONO 0x00000100
|
|
#define DSCAPS_SECONDARYSTEREO 0x00000200
|
|
#define DSCAPS_SECONDARY8BIT 0x00000400
|
|
#define DSCAPS_SECONDARY16BIT 0x00000800
|
|
|
|
#define DSSCL_NORMAL 1
|
|
#define DSSCL_PRIORITY 2
|
|
#define DSSCL_EXCLUSIVE 3
|
|
#define DSSCL_WRITEPRIMARY 4
|
|
|
|
typedef struct _DSCAPS
|
|
{
|
|
DWORD dwSize;
|
|
DWORD dwFlags;
|
|
DWORD dwMinSecondarySampleRate;
|
|
DWORD dwMaxSecondarySampleRate;
|
|
DWORD dwPrimaryBuffers;
|
|
DWORD dwMaxHwMixingAllBuffers;
|
|
DWORD dwMaxHwMixingStaticBuffers;
|
|
DWORD dwMaxHwMixingStreamingBuffers;
|
|
DWORD dwFreeHwMixingAllBuffers;
|
|
DWORD dwFreeHwMixingStaticBuffers;
|
|
DWORD dwFreeHwMixingStreamingBuffers;
|
|
DWORD dwMaxHw3DAllBuffers;
|
|
DWORD dwMaxHw3DStaticBuffers;
|
|
DWORD dwMaxHw3DStreamingBuffers;
|
|
DWORD dwFreeHw3DAllBuffers;
|
|
DWORD dwFreeHw3DStaticBuffers;
|
|
DWORD dwFreeHw3DStreamingBuffers;
|
|
DWORD dwTotalHwMemBytes;
|
|
DWORD dwFreeHwMemBytes;
|
|
DWORD dwMaxContigFreeHwMemBytes;
|
|
DWORD dwUnlockTransferRateHwBuffers;
|
|
DWORD dwPlayCpuOverheadSwBuffers;
|
|
DWORD dwReserved1;
|
|
DWORD dwReserved2;
|
|
} DSCAPS,*LPDSCAPS;
|
|
|
|
#define DSBPLAY_LOOPING 0x00000001
|
|
|
|
#define DSBSTATUS_PLAYING 0x00000001
|
|
#define DSBSTATUS_BUFFERLOST 0x00000002
|
|
#define DSBSTATUS_LOOPING 0x00000004
|
|
|
|
|
|
#define DSBLOCK_FROMWRITECURSOR 0x00000001
|
|
|
|
#define DSBCAPS_PRIMARYBUFFER 0x00000001
|
|
#define DSBCAPS_STATIC 0x00000002
|
|
#define DSBCAPS_LOCHARDWARE 0x00000004
|
|
#define DSBCAPS_LOCSOFTWARE 0x00000008
|
|
#define DSBCAPS_CTRLFREQUENCY 0x00000020
|
|
#define DSBCAPS_CTRLPAN 0x00000040
|
|
#define DSBCAPS_CTRLVOLUME 0x00000080
|
|
#define DSBCAPS_CTRLDEFAULT 0x000000E0 /* Pan + volume + frequency. */
|
|
#define DSBCAPS_CTRLALL 0x000000E0 /* All control capabilities */
|
|
#define DSBCAPS_STICKYFOCUS 0x00004000
|
|
#define DSBCAPS_GETCURRENTPOSITION2 0x00010000 /* More accurate play cursor under emulation*/
|
|
|
|
typedef struct _DSBCAPS
|
|
{
|
|
DWORD dwSize;
|
|
DWORD dwFlags;
|
|
DWORD dwBufferBytes;
|
|
DWORD dwUnlockTransferRate;
|
|
DWORD dwPlayCpuOverhead;
|
|
} DSBCAPS,*LPDSBCAPS;
|
|
|
|
#define DSSCL_NORMAL 1
|
|
#define DSSCL_PRIORITY 2
|
|
#define DSSCL_EXCLUSIVE 3
|
|
#define DSSCL_WRITEPRIMARY 4
|
|
|
|
typedef struct _DSBUFFERDESC
|
|
{
|
|
DWORD dwSize;
|
|
DWORD dwFlags;
|
|
DWORD dwBufferBytes;
|
|
DWORD dwReserved;
|
|
LPWAVEFORMATEX lpwfxFormat;
|
|
} DSBUFFERDESC,*LPDSBUFFERDESC;
|
|
|
|
typedef struct _DSBPOSITIONNOTIFY
|
|
{
|
|
DWORD dwOffset;
|
|
HANDLE32 hEventNotify;
|
|
} DSBPOSITIONNOTIFY,*LPDSBPOSITIONNOTIFY;
|
|
|
|
typedef const DSBPOSITIONNOTIFY *LPCDSBPOSITIONNOTIFY;
|
|
|
|
#define DSSPEAKER_HEADPHONE 1
|
|
#define DSSPEAKER_MONO 2
|
|
#define DSSPEAKER_QUAD 3
|
|
#define DSSPEAKER_STEREO 4
|
|
#define DSSPEAKER_SURROUND 5
|
|
|
|
|
|
typedef LPVOID* LPLPVOID;
|
|
|
|
typedef BOOL32 (CALLBACK *LPDSENUMCALLBACK32W)(LPGUID,LPWSTR,LPWSTR,LPVOID);
|
|
typedef BOOL32 (CALLBACK *LPDSENUMCALLBACK32A)(LPGUID,LPSTR,LPSTR,LPVOID);
|
|
|
|
extern HRESULT WINAPI DirectSoundCreate(LPGUID lpGUID,LPDIRECTSOUND * ppDS,IUnknown *pUnkOuter );
|
|
|
|
#define STDMETHOD(xfn) HRESULT (CALLBACK *fn##xfn)
|
|
#define STDMETHOD_(ret,xfn) ret (CALLBACK *fn##xfn)
|
|
#define PURE
|
|
#define FAR
|
|
#define THIS_ THIS,
|
|
|
|
#define THIS LPDIRECTSOUND this
|
|
typedef struct tagLPDIRECTSOUND_VTABLE
|
|
{
|
|
/*** IUnknown methods ***/
|
|
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
|
|
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
|
|
STDMETHOD_(ULONG,Release) (THIS) PURE;
|
|
/*** IDirectSound methods ***/
|
|
|
|
STDMETHOD( CreateSoundBuffer)(THIS_ LPDSBUFFERDESC, LPLPDIRECTSOUNDBUFFER, IUnknown FAR *) PURE;
|
|
STDMETHOD( GetCaps)(THIS_ LPDSCAPS ) PURE;
|
|
STDMETHOD( DuplicateSoundBuffer)(THIS_ LPDIRECTSOUNDBUFFER, LPLPDIRECTSOUNDBUFFER ) PURE;
|
|
STDMETHOD( SetCooperativeLevel)(THIS_ HWND32, DWORD ) PURE;
|
|
STDMETHOD( Compact)(THIS ) PURE;
|
|
STDMETHOD( GetSpeakerConfig)(THIS_ LPDWORD ) PURE;
|
|
STDMETHOD( SetSpeakerConfig)(THIS_ DWORD ) PURE;
|
|
STDMETHOD( Initialize)(THIS_ GUID FAR * ) PURE;
|
|
} *LPDIRECTSOUND_VTABLE;
|
|
|
|
struct IDirectSound {
|
|
LPDIRECTSOUND_VTABLE lpvtbl;
|
|
DWORD ref;
|
|
int nrofbuffers;
|
|
LPDIRECTSOUNDBUFFER *buffers;
|
|
WAVEFORMATEX wfx; /* current main waveformat */
|
|
};
|
|
#undef THIS
|
|
|
|
#define THIS LPDIRECTSOUNDBUFFER this
|
|
typedef struct tagLPDIRECTSOUNDBUFFER_VTABLE
|
|
{
|
|
/*** IUnknown methods ***/
|
|
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
|
|
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
|
|
STDMETHOD_(ULONG,Release) (THIS) PURE;
|
|
/*** IDirectSoundBuffer methods ***/
|
|
|
|
STDMETHOD( GetCaps)(THIS_ LPDSBCAPS ) PURE;
|
|
STDMETHOD(GetCurrentPosition)(THIS_ LPDWORD,LPDWORD ) PURE;
|
|
STDMETHOD( GetFormat)(THIS_ LPWAVEFORMATEX, DWORD, LPDWORD ) PURE;
|
|
STDMETHOD( GetVolume)(THIS_ LPLONG ) PURE;
|
|
STDMETHOD( GetPan)(THIS_ LPLONG ) PURE;
|
|
STDMETHOD( GetFrequency)(THIS_ LPDWORD ) PURE;
|
|
STDMETHOD( GetStatus)(THIS_ LPDWORD ) PURE;
|
|
STDMETHOD( Initialize)(THIS_ LPDIRECTSOUND, LPDSBUFFERDESC ) PURE;
|
|
STDMETHOD( Lock)(THIS_ DWORD,DWORD,LPVOID,LPDWORD,LPVOID,LPDWORD,DWORD ) PURE;
|
|
STDMETHOD( Play)(THIS_ DWORD,DWORD,DWORD ) PURE;
|
|
STDMETHOD(SetCurrentPosition)(THIS_ DWORD ) PURE;
|
|
STDMETHOD( SetFormat)(THIS_ LPWAVEFORMATEX ) PURE;
|
|
STDMETHOD( SetVolume)(THIS_ LONG ) PURE;
|
|
STDMETHOD( SetPan)(THIS_ LONG ) PURE;
|
|
STDMETHOD( SetFrequency)(THIS_ DWORD ) PURE;
|
|
STDMETHOD( Stop)(THIS ) PURE;
|
|
STDMETHOD( Unlock)(THIS_ LPVOID,DWORD,LPVOID,DWORD ) PURE;
|
|
STDMETHOD( Restore)(THIS ) PURE;
|
|
} *LPDIRECTSOUNDBUFFER_VTABLE;
|
|
|
|
struct IDirectSoundBuffer {
|
|
LPDIRECTSOUNDBUFFER_VTABLE lpvtbl;
|
|
WAVEFORMATEX wfx;
|
|
DWORD ref;
|
|
LPBYTE buffer;
|
|
DWORD playflags,playing,playpos,writepos,buflen;
|
|
LONG volume,pan;
|
|
LPDIRECTSOUND dsound;
|
|
DSBUFFERDESC dsbd;
|
|
LPDSBPOSITIONNOTIFY notifies;
|
|
int nrofnotifies;
|
|
double volfac;
|
|
};
|
|
#undef THIS
|
|
|
|
#define THIS LPDIRECTSOUNDNOTIFY this
|
|
typedef struct IDirectSoundNotify_VTable {
|
|
/* IUnknown methods */
|
|
STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
|
|
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
|
|
STDMETHOD_(ULONG,Release) (THIS) PURE;
|
|
|
|
/* IDirectSoundNotify methods */
|
|
STDMETHOD(SetNotificationPositions) (THIS_ DWORD, LPCDSBPOSITIONNOTIFY) PURE;
|
|
} *LPDIRECTSOUNDNOTIFY_VTABLE,IDirectSoundNotify_VTable;
|
|
|
|
struct IDirectSoundNotify {
|
|
LPDIRECTSOUNDNOTIFY_VTABLE lpvtbl;
|
|
DWORD ref;
|
|
LPDIRECTSOUNDBUFFER dsb;
|
|
};
|
|
#undef THIS
|
|
|
|
#undef STDMETHOD
|
|
#undef STDMETHOD_
|
|
#undef PURE
|
|
#undef FAR
|
|
#undef THIS_
|
|
#endif
|