[PATCH 2/7] dsound: Add support for loading openal, try 2
Maarten Lankhorst
m.b.lankhorst at gmail.com
Thu Dec 3 02:47:00 CST 2009
---
configure.ac | 15 ++-
dlls/dsound/Makefile.in | 1 +
dlls/dsound/capture.c | 11 +-
dlls/dsound/dsound_main.c | 258 ++++++++++++++++++++++++++++++++++++++++--
dlls/dsound/dsound_private.h | 127 ++++++++++++++++++++-
dlls/openal32/Makefile.in | 2 +-
include/config.h.in | 58 +++++----
7 files changed, 421 insertions(+), 51 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6e4d892..9a4b2f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -633,8 +633,9 @@ case $host_os in
fi
if test "$ac_cv_header_OpenAL_al_h" = "yes"
then
- AC_SUBST(LIBOPENAL,"-framework OpenAL")
- ac_cv_lib_openal_alGetSource3i=yes
+ AC_SUBST(FRAMEWORK_OPENAL,"-framework OpenAL")
+ AC_DEFINE_UNQUOTED(HAVE_OPENAL,1,[Define to 1 if OpenAL is available])
+ ac_cv_lib_openal=yes
fi
if test "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes"
then
@@ -1432,11 +1433,13 @@ test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes || enable_winemp3_acm=${enable_wine
dnl **** Check for OpenAL 1.1 ****
if test "$ac_cv_header_AL_al_h" = "yes"
then
- AC_CHECK_LIB(openal,alGetSource3i,[AC_SUBST(LIBOPENAL,"-lopenal")])
+ WINE_CHECK_SONAME(openal,alGetSource3i,[AC_SUBST(LIBOPENAL,"-lopenal")
+ ac_cv_lib_openal=yes
+ AC_DEFINE_UNQUOTED(HAVE_OPENAL,1,[Define to 1 if OpenAL is available])],,)
fi
-WINE_NOTICE_WITH(openal,[test "x$ac_cv_lib_openal_alGetSource3i" != xyes],
- [libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported.])
-test "x$ac_cv_lib_openal_alGetSource3i" = xyes || enable_openal32=${enable_openal32:-no}
+WINE_NOTICE_WITH(openal,[test "x$ac_cv_lib_openal" != xyes],
+ [libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported, and DirectSound will not be available.])
+test "x$ac_cv_lib_openal" = xyes || enable_openal32=${enable_openal32:-no}
dnl **** Check for libkstat ****
if test "$ac_cv_header_kstat_h" = "yes"
diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in
index 0b370dc..769927a 100644
--- a/dlls/dsound/Makefile.in
+++ b/dlls/dsound/Makefile.in
@@ -5,6 +5,7 @@ VPATH = @srcdir@
MODULE = dsound.dll
IMPORTLIB = dsound
IMPORTS = dxguid uuid winmm ole32 advapi32 kernel32 ntdll
+EXTRALIBS = @FRAMEWORK_OPENAL@
C_SRCS = \
buffer.c \
diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c
index 26c86b8..f2a26bc 100644
--- a/dlls/dsound/capture.c
+++ b/dlls/dsound/capture.c
@@ -1059,13 +1059,10 @@ static HRESULT DirectSoundCaptureDevice_Initialize(
return DSERR_NODRIVER;
}
- /* enumerate WINMM audio devices and find the one we want */
- for (wid=0; wid<widn; wid++) {
- if (IsEqualGUID( &devGUID, &DSOUND_capture_guids[wid]) ) {
- found = TRUE;
- break;
- }
- }
+ wid = devGUID.Data4[7];
+ if (!memcmp(&devGUID, &DSOUND_capture_guid, sizeof(GUID)-1)
+ && wid < widn)
+ found = TRUE;
if (found == FALSE) {
WARN("No device found matching given ID!\n");
diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index f52a6e9..3e4bde9 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -32,7 +32,10 @@
* Remove DS_HEL_FRAGS and use mixer fragment length for it
*/
+#include "config.h"
+#include "wine/port.h"
#include <stdarg.h>
+#include "wine/library.h"
#define COBJMACROS
#define NONAMELESSSTRUCT
@@ -59,7 +62,237 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound);
DirectSoundDevice* DSOUND_renderer[MAXWAVEDRIVERS];
GUID DSOUND_renderer_guids[MAXWAVEDRIVERS];
-GUID DSOUND_capture_guids[MAXWAVEDRIVERS];
+GUID DSOUND_capture_guid = { 0xbd6dd71b, 0x3deb, 0x11d1, { 0xb1, 0x71, 0x00, 0xc0, 0x4f, 0xc2, 0x00, 0x00 } };
+
+#ifdef HAVE_OPENAL
+
+static CRITICAL_SECTION_DEBUG openal_crst_debug =
+{
+ 0, 0, &openal_crst,
+ { &openal_crst_debug.ProcessLocksList,
+ &openal_crst_debug.ProcessLocksList },
+ 0, 0, { (DWORD_PTR)(__FILE__ ": openal_crst_debug") }
+};
+CRITICAL_SECTION openal_crst = { &openal_crst_debug, -1, 0, 0, 0, 0 };
+
+static void *openal_handle = RTLD_DEFAULT;
+int openal_loaded = 0;
+LPALCCREATECONTEXT palcCreateContext = NULL;
+LPALCMAKECONTEXTCURRENT palcMakeContextCurrent = NULL;
+LPALCPROCESSCONTEXT palcProcessContext = NULL;
+LPALCSUSPENDCONTEXT palcSuspendContext = NULL;
+LPALCDESTROYCONTEXT palcDestroyContext = NULL;
+LPALCGETCURRENTCONTEXT palcGetCurrentContext = NULL;
+LPALCGETCONTEXTSDEVICE palcGetContextsDevice = NULL;
+LPALCOPENDEVICE palcOpenDevice = NULL;
+LPALCCLOSEDEVICE palcCloseDevice = NULL;
+LPALCGETERROR palcGetError = NULL;
+LPALCISEXTENSIONPRESENT palcIsExtensionPresent = NULL;
+LPALCGETPROCADDRESS palcGetProcAddress = NULL;
+LPALCGETENUMVALUE palcGetEnumValue = NULL;
+LPALCGETSTRING palcGetString = NULL;
+LPALCGETINTEGERV palcGetIntegerv = NULL;
+LPALCCAPTUREOPENDEVICE palcCaptureOpenDevice = NULL;
+LPALCCAPTURECLOSEDEVICE palcCaptureCloseDevice = NULL;
+LPALCCAPTURESTART palcCaptureStart = NULL;
+LPALCCAPTURESTOP palcCaptureStop = NULL;
+LPALCCAPTURESAMPLES palcCaptureSamples = NULL;
+LPALENABLE palEnable = NULL;
+LPALDISABLE palDisable = NULL;
+LPALISENABLED palIsEnabled = NULL;
+LPALGETSTRING palGetString = NULL;
+LPALGETBOOLEANV palGetBooleanv = NULL;
+LPALGETINTEGERV palGetIntegerv = NULL;
+LPALGETFLOATV palGetFloatv = NULL;
+LPALGETDOUBLEV palGetDoublev = NULL;
+LPALGETBOOLEAN palGetBoolean = NULL;
+LPALGETINTEGER palGetInteger = NULL;
+LPALGETFLOAT palGetFloat = NULL;
+LPALGETDOUBLE palGetDouble = NULL;
+LPALGETERROR palGetError = NULL;
+LPALISEXTENSIONPRESENT palIsExtensionPresent = NULL;
+LPALGETPROCADDRESS palGetProcAddress = NULL;
+LPALGETENUMVALUE palGetEnumValue = NULL;
+LPALLISTENERF palListenerf = NULL;
+LPALLISTENER3F palListener3f = NULL;
+LPALLISTENERFV palListenerfv = NULL;
+LPALLISTENERI palListeneri = NULL;
+LPALLISTENER3I palListener3i = NULL;
+LPALLISTENERIV palListeneriv = NULL;
+LPALGETLISTENERF palGetListenerf = NULL;
+LPALGETLISTENER3F palGetListener3f = NULL;
+LPALGETLISTENERFV palGetListenerfv = NULL;
+LPALGETLISTENERI palGetListeneri = NULL;
+LPALGETLISTENER3I palGetListener3i = NULL;
+LPALGETLISTENERIV palGetListeneriv = NULL;
+LPALGENSOURCES palGenSources = NULL;
+LPALDELETESOURCES palDeleteSources = NULL;
+LPALISSOURCE palIsSource = NULL;
+LPALSOURCEF palSourcef = NULL;
+LPALSOURCE3F palSource3f = NULL;
+LPALSOURCEFV palSourcefv = NULL;
+LPALSOURCEI palSourcei = NULL;
+LPALSOURCE3I palSource3i = NULL;
+LPALSOURCEIV palSourceiv = NULL;
+LPALGETSOURCEF palGetSourcef = NULL;
+LPALGETSOURCE3F palGetSource3f = NULL;
+LPALGETSOURCEFV palGetSourcefv = NULL;
+LPALGETSOURCEI palGetSourcei = NULL;
+LPALGETSOURCE3I palGetSource3i = NULL;
+LPALGETSOURCEIV palGetSourceiv = NULL;
+LPALSOURCEPLAYV palSourcePlayv = NULL;
+LPALSOURCESTOPV palSourceStopv = NULL;
+LPALSOURCEREWINDV palSourceRewindv = NULL;
+LPALSOURCEPAUSEV palSourcePausev = NULL;
+LPALSOURCEPLAY palSourcePlay = NULL;
+LPALSOURCESTOP palSourceStop = NULL;
+LPALSOURCEREWIND palSourceRewind = NULL;
+LPALSOURCEPAUSE palSourcePause = NULL;
+LPALSOURCEQUEUEBUFFERS palSourceQueueBuffers = NULL;
+LPALSOURCEUNQUEUEBUFFERS palSourceUnqueueBuffers = NULL;
+LPALGENBUFFERS palGenBuffers = NULL;
+LPALDELETEBUFFERS palDeleteBuffers = NULL;
+LPALISBUFFER palIsBuffer = NULL;
+LPALBUFFERF palBufferf = NULL;
+LPALBUFFER3F palBuffer3f = NULL;
+LPALBUFFERFV palBufferfv = NULL;
+LPALBUFFERI palBufferi = NULL;
+LPALBUFFER3I palBuffer3i = NULL;
+LPALBUFFERIV palBufferiv = NULL;
+LPALGETBUFFERF palGetBufferf = NULL;
+LPALGETBUFFER3F palGetBuffer3f = NULL;
+LPALGETBUFFERFV palGetBufferfv = NULL;
+LPALGETBUFFERI palGetBufferi = NULL;
+LPALGETBUFFER3I palGetBuffer3i = NULL;
+LPALGETBUFFERIV palGetBufferiv = NULL;
+LPALBUFFERDATA palBufferData = NULL;
+LPALDOPPLERFACTOR palDopplerFactor = NULL;
+LPALDOPPLERVELOCITY palDopplerVelocity = NULL;
+LPALDISTANCEMODEL palDistanceModel = NULL;
+LPALSPEEDOFSOUND palSpeedOfSound = NULL;
+
+static void load_libopenal(void)
+{
+ DWORD failed = 0;
+
+#ifdef SONAME_LIBOPENAL
+ char error[128];
+ openal_handle = wine_dlopen(SONAME_LIBOPENAL, RTLD_NOW, error, sizeof(error));
+ if (!openal_handle)
+ ERR("Couldn't load " SONAME_LIBOPENAL ": %s\n", error);
+#endif
+#define LOAD_FUNCPTR(f) \
+ if((p##f = wine_dlsym(openal_handle, #f, NULL, 0)) == NULL) { \
+ ERR("Couldn't lookup %s in libopenal\n", #f); \
+ failed = 1; \
+ }
+
+ LOAD_FUNCPTR(alcCreateContext);
+ LOAD_FUNCPTR(alcMakeContextCurrent);
+ LOAD_FUNCPTR(alcProcessContext);
+ LOAD_FUNCPTR(alcSuspendContext);
+ LOAD_FUNCPTR(alcDestroyContext);
+ LOAD_FUNCPTR(alcGetCurrentContext);
+ LOAD_FUNCPTR(alcGetContextsDevice);
+ LOAD_FUNCPTR(alcOpenDevice);
+ LOAD_FUNCPTR(alcCloseDevice);
+ LOAD_FUNCPTR(alcGetError);
+ LOAD_FUNCPTR(alcIsExtensionPresent);
+ LOAD_FUNCPTR(alcGetProcAddress);
+ LOAD_FUNCPTR(alcGetEnumValue);
+ LOAD_FUNCPTR(alcGetString);
+ LOAD_FUNCPTR(alcGetIntegerv);
+ LOAD_FUNCPTR(alcCaptureOpenDevice);
+ LOAD_FUNCPTR(alcCaptureCloseDevice);
+ LOAD_FUNCPTR(alcCaptureStart);
+ LOAD_FUNCPTR(alcCaptureStop);
+ LOAD_FUNCPTR(alcCaptureSamples);
+ LOAD_FUNCPTR(alEnable);
+ LOAD_FUNCPTR(alDisable);
+ LOAD_FUNCPTR(alIsEnabled);
+ LOAD_FUNCPTR(alGetString);
+ LOAD_FUNCPTR(alGetBooleanv);
+ LOAD_FUNCPTR(alGetIntegerv);
+ LOAD_FUNCPTR(alGetFloatv);
+ LOAD_FUNCPTR(alGetDoublev);
+ LOAD_FUNCPTR(alGetBoolean);
+ LOAD_FUNCPTR(alGetInteger);
+ LOAD_FUNCPTR(alGetFloat);
+ LOAD_FUNCPTR(alGetDouble);
+ LOAD_FUNCPTR(alGetError);
+ LOAD_FUNCPTR(alIsExtensionPresent);
+ LOAD_FUNCPTR(alGetProcAddress);
+ LOAD_FUNCPTR(alGetEnumValue);
+ LOAD_FUNCPTR(alListenerf);
+ LOAD_FUNCPTR(alListener3f);
+ LOAD_FUNCPTR(alListenerfv);
+ LOAD_FUNCPTR(alListeneri);
+ LOAD_FUNCPTR(alListener3i);
+ LOAD_FUNCPTR(alListeneriv);
+ LOAD_FUNCPTR(alGetListenerf);
+ LOAD_FUNCPTR(alGetListener3f);
+ LOAD_FUNCPTR(alGetListenerfv);
+ LOAD_FUNCPTR(alGetListeneri);
+ LOAD_FUNCPTR(alGetListener3i);
+ LOAD_FUNCPTR(alGetListeneriv);
+ LOAD_FUNCPTR(alGenSources);
+ LOAD_FUNCPTR(alDeleteSources);
+ LOAD_FUNCPTR(alIsSource);
+ LOAD_FUNCPTR(alSourcef);
+ LOAD_FUNCPTR(alSource3f);
+ LOAD_FUNCPTR(alSourcefv);
+ LOAD_FUNCPTR(alSourcei);
+ LOAD_FUNCPTR(alSource3i);
+ LOAD_FUNCPTR(alSourceiv);
+ LOAD_FUNCPTR(alGetSourcef);
+ LOAD_FUNCPTR(alGetSource3f);
+ LOAD_FUNCPTR(alGetSourcefv);
+ LOAD_FUNCPTR(alGetSourcei);
+ LOAD_FUNCPTR(alGetSource3i);
+ LOAD_FUNCPTR(alGetSourceiv);
+ LOAD_FUNCPTR(alSourcePlayv);
+ LOAD_FUNCPTR(alSourceStopv);
+ LOAD_FUNCPTR(alSourceRewindv);
+ LOAD_FUNCPTR(alSourcePausev);
+ LOAD_FUNCPTR(alSourcePlay);
+ LOAD_FUNCPTR(alSourceStop);
+ LOAD_FUNCPTR(alSourceRewind);
+ LOAD_FUNCPTR(alSourcePause);
+ LOAD_FUNCPTR(alSourceQueueBuffers);
+ LOAD_FUNCPTR(alSourceUnqueueBuffers);
+ LOAD_FUNCPTR(alGenBuffers);
+ LOAD_FUNCPTR(alDeleteBuffers);
+ LOAD_FUNCPTR(alIsBuffer);
+ LOAD_FUNCPTR(alBufferf);
+ LOAD_FUNCPTR(alBuffer3f);
+ LOAD_FUNCPTR(alBufferfv);
+ LOAD_FUNCPTR(alBufferi);
+ LOAD_FUNCPTR(alBuffer3i);
+ LOAD_FUNCPTR(alBufferiv);
+ LOAD_FUNCPTR(alGetBufferf);
+ LOAD_FUNCPTR(alGetBuffer3f);
+ LOAD_FUNCPTR(alGetBufferfv);
+ LOAD_FUNCPTR(alGetBufferi);
+ LOAD_FUNCPTR(alGetBuffer3i);
+ LOAD_FUNCPTR(alGetBufferiv);
+ LOAD_FUNCPTR(alBufferData);
+ LOAD_FUNCPTR(alDopplerFactor);
+ LOAD_FUNCPTR(alDopplerVelocity);
+ LOAD_FUNCPTR(alDistanceModel);
+ LOAD_FUNCPTR(alSpeedOfSound);
+#undef LOAD_FUNCPTR
+ if (failed)
+ {
+ WARN("Unloading openal\n");
+ if (openal_handle != RTLD_DEFAULT)
+ wine_dlclose(openal_handle, NULL, 0);
+ openal_handle = NULL;
+ }
+ else
+ openal_loaded = 1;
+}
+
+#endif /*HAVE_OPENAL*/
HRESULT mmErr(UINT err)
{
@@ -261,8 +494,8 @@ HRESULT WINAPI GetDeviceID(LPCGUID pGuidSrc, LPGUID pGuidDest)
if ( IsEqualGUID( &DSDEVID_DefaultCapture, pGuidSrc ) ||
IsEqualGUID( &DSDEVID_DefaultVoiceCapture, pGuidSrc ) ) {
- *pGuidDest = DSOUND_capture_guids[ds_default_capture];
- TRACE("returns %s\n", get_device_id(pGuidDest));
+ *pGuidDest = DSOUND_capture_guid;
+ TRACE("returns %s\n", debugstr_guid(pGuidDest));
return DS_OK;
}
@@ -452,8 +685,8 @@ DirectSoundCaptureEnumerateW(
devs = waveInGetNumDevs();
if (devs > 0) {
if (GetDeviceID(&DSDEVID_DefaultCapture, &guid) == DS_OK) {
- for (wid = 0; wid < devs; ++wid) {
- if (IsEqualGUID( &guid, &DSOUND_capture_guids[wid] ) ) {
+ wid = guid.Data4[7];
+ if (wid < devs) { {
err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
if (err == DS_OK) {
TRACE("calling lpDSEnumCallback(NULL,\"%s\",\"%s\",%p)\n",
@@ -473,13 +706,14 @@ DirectSoundCaptureEnumerateW(
for (wid = 0; wid < devs; ++wid) {
err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
if (err == DS_OK) {
+ guid.Data4[7] = wid;
TRACE("calling lpDSEnumCallback(%s,\"%s\",\"%s\",%p)\n",
- debugstr_guid(&DSOUND_capture_guids[wid]),desc.szDesc,desc.szDrvname,lpContext);
+ debugstr_guid(&guid),desc.szDesc,desc.szDrvname,lpContext);
MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1,
wDesc, sizeof(wDesc)/sizeof(WCHAR) );
MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1,
wName, sizeof(wName)/sizeof(WCHAR) );
- if (lpDSEnumCallback(&DSOUND_capture_guids[wid], wDesc, wName, lpContext) == FALSE)
+ if (lpDSEnumCallback(&guid, wDesc, wName, lpContext) == FALSE)
return DS_OK;
}
}
@@ -667,11 +901,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
switch (fdwReason) {
case DLL_PROCESS_ATTACH:
TRACE("DLL_PROCESS_ATTACH\n");
+#ifdef HAVE_OPENAL
+ load_libopenal();
+#endif /*HAVE_OPENAL*/
for (i = 0; i < MAXWAVEDRIVERS; i++) {
DSOUND_renderer[i] = NULL;
- DSOUND_capture[i] = NULL;
INIT_GUID(DSOUND_renderer_guids[i], 0xbd6dd71a, 0x3deb, 0x11d1, 0xb1, 0x71, 0x00, 0xc0, 0x4f, 0xc2, 0x00, 0x00 + i);
- INIT_GUID(DSOUND_capture_guids[i], 0xbd6dd71b, 0x3deb, 0x11d1, 0xb1, 0x71, 0x00, 0xc0, 0x4f, 0xc2, 0x00, 0x00 + i);
}
DisableThreadLibraryCalls(hInstDLL);
/* Increase refcount on dsound by 1 */
@@ -679,6 +914,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
break;
case DLL_PROCESS_DETACH:
TRACE("DLL_PROCESS_DETACH\n");
+#ifdef SONAME_LIBOPENAL
+ if (openal_handle)
+ wine_dlclose(openal_handle, NULL, 0);
+#endif /*SONAME_LIBOPENAL*/
break;
default:
TRACE("UNKNOWN REASON\n");
@@ -686,3 +925,4 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
}
return TRUE;
}
+
diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
index c4e7565..bf22099 100644
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -22,8 +22,131 @@
/* Linux does not support better timing than 10ms */
#define DS_TIME_RES 2 /* Resolution of multimedia timer */
#define DS_TIME_DEL 10 /* Delay of multimedia timer callback, and duration of HEL fragment */
-
+/* Default refresh count, can be overridden */
+#define FAKE_REFRESH_COUNT (1000/DS_TIME_DEL/2)
+
#include "wine/list.h"
+
+#ifdef HAVE_OPENAL
+
+/* mac needs these defines to get the LPFUNCTION typedefs */
+#define AL_NO_PROTOTYPES
+#define ALC_NO_PROTOTYPES
+
+#ifdef HAVE_AL_AL_H
+#include <AL/al.h>
+#include <AL/alc.h>
+#elif defined(HAVE_OPENAL_AL_H)
+#include <OpenAL/al.h>
+#include <OpenAL/alc.h>
+#else
+#error No OpenAL headers found?
+#endif
+
+/* All openal functions */
+extern int openal_loaded;
+extern LPALCCREATECONTEXT palcCreateContext;
+extern LPALCMAKECONTEXTCURRENT palcMakeContextCurrent;
+extern LPALCPROCESSCONTEXT palcProcessContext;
+extern LPALCSUSPENDCONTEXT palcSuspendContext;
+extern LPALCDESTROYCONTEXT palcDestroyContext;
+extern LPALCGETCURRENTCONTEXT palcGetCurrentContext;
+extern LPALCGETCONTEXTSDEVICE palcGetContextsDevice;
+extern LPALCOPENDEVICE palcOpenDevice;
+extern LPALCCLOSEDEVICE palcCloseDevice;
+extern LPALCGETERROR palcGetError;
+extern LPALCISEXTENSIONPRESENT palcIsExtensionPresent;
+extern LPALCGETPROCADDRESS palcGetProcAddress;
+extern LPALCGETENUMVALUE palcGetEnumValue;
+extern LPALCGETSTRING palcGetString;
+extern LPALCGETINTEGERV palcGetIntegerv;
+extern LPALCCAPTUREOPENDEVICE palcCaptureOpenDevice;
+extern LPALCCAPTURECLOSEDEVICE palcCaptureCloseDevice;
+extern LPALCCAPTURESTART palcCaptureStart;
+extern LPALCCAPTURESTOP palcCaptureStop;
+extern LPALCCAPTURESAMPLES palcCaptureSamples;
+extern LPALENABLE palEnable;
+extern LPALDISABLE palDisable;
+extern LPALISENABLED palIsEnabled;
+extern LPALGETSTRING palGetString;
+extern LPALGETBOOLEANV palGetBooleanv;
+extern LPALGETINTEGERV palGetIntegerv;
+extern LPALGETFLOATV palGetFloatv;
+extern LPALGETDOUBLEV palGetDoublev;
+extern LPALGETBOOLEAN palGetBoolean;
+extern LPALGETINTEGER palGetInteger;
+extern LPALGETFLOAT palGetFloat;
+extern LPALGETDOUBLE palGetDouble;
+extern LPALGETERROR palGetError;
+extern LPALISEXTENSIONPRESENT palIsExtensionPresent;
+extern LPALGETPROCADDRESS palGetProcAddress;
+extern LPALGETENUMVALUE palGetEnumValue;
+extern LPALLISTENERF palListenerf;
+extern LPALLISTENER3F palListener3f;
+extern LPALLISTENERFV palListenerfv;
+extern LPALLISTENERI palListeneri;
+extern LPALLISTENER3I palListener3i;
+extern LPALLISTENERIV palListeneriv;
+extern LPALGETLISTENERF palGetListenerf;
+extern LPALGETLISTENER3F palGetListener3f;
+extern LPALGETLISTENERFV palGetListenerfv;
+extern LPALGETLISTENERI palGetListeneri;
+extern LPALGETLISTENER3I palGetListener3i;
+extern LPALGETLISTENERIV palGetListeneriv;
+extern LPALGENSOURCES palGenSources;
+extern LPALDELETESOURCES palDeleteSources;
+extern LPALISSOURCE palIsSource;
+extern LPALSOURCEF palSourcef;
+extern LPALSOURCE3F palSource3f;
+extern LPALSOURCEFV palSourcefv;
+extern LPALSOURCEI palSourcei;
+extern LPALSOURCE3I palSource3i;
+extern LPALSOURCEIV palSourceiv;
+extern LPALGETSOURCEF palGetSourcef;
+extern LPALGETSOURCE3F palGetSource3f;
+extern LPALGETSOURCEFV palGetSourcefv;
+extern LPALGETSOURCEI palGetSourcei;
+extern LPALGETSOURCE3I palGetSource3i;
+extern LPALGETSOURCEIV palGetSourceiv;
+extern LPALSOURCEPLAYV palSourcePlayv;
+extern LPALSOURCESTOPV palSourceStopv;
+extern LPALSOURCEREWINDV palSourceRewindv;
+extern LPALSOURCEPAUSEV palSourcePausev;
+extern LPALSOURCEPLAY palSourcePlay;
+extern LPALSOURCESTOP palSourceStop;
+extern LPALSOURCEREWIND palSourceRewind;
+extern LPALSOURCEPAUSE palSourcePause;
+extern LPALSOURCEQUEUEBUFFERS palSourceQueueBuffers;
+extern LPALSOURCEUNQUEUEBUFFERS palSourceUnqueueBuffers;
+extern LPALGENBUFFERS palGenBuffers;
+extern LPALDELETEBUFFERS palDeleteBuffers;
+extern LPALISBUFFER palIsBuffer;
+extern LPALBUFFERF palBufferf;
+extern LPALBUFFER3F palBuffer3f;
+extern LPALBUFFERFV palBufferfv;
+extern LPALBUFFERI palBufferi;
+extern LPALBUFFER3I palBuffer3i;
+extern LPALBUFFERIV palBufferiv;
+extern LPALGETBUFFERF palGetBufferf;
+extern LPALGETBUFFER3F palGetBuffer3f;
+extern LPALGETBUFFERFV palGetBufferfv;
+extern LPALGETBUFFERI palGetBufferi;
+extern LPALGETBUFFER3I palGetBuffer3i;
+extern LPALGETBUFFERIV palGetBufferiv;
+extern LPALBUFFERDATA palBufferData;
+extern LPALDOPPLERFACTOR palDopplerFactor;
+extern LPALDOPPLERVELOCITY palDopplerVelocity;
+extern LPALDISTANCEMODEL palDistanceModel;
+extern LPALSPEEDOFSOUND palSpeedOfSound;
+
+#include <math.h>
+#include "wingdi.h"
+#include "mmreg.h"
+
+/* OpenAL only allows for 1 single access to the device at the same time */
+extern CRITICAL_SECTION openal_crst;
+
+#endif
/* direct sound hardware acceleration levels */
#define DS_HW_ACCEL_FULL 0 /* default on Windows 98 */
@@ -381,7 +504,7 @@ extern DirectSoundDevice* DSOUND_renderer[MAXWAVEDRIVERS];
extern GUID DSOUND_renderer_guids[MAXWAVEDRIVERS];
extern DirectSoundCaptureDevice * DSOUND_capture[MAXWAVEDRIVERS];
-extern GUID DSOUND_capture_guids[MAXWAVEDRIVERS];
+extern GUID DSOUND_capture_guid;
HRESULT mmErr(UINT err);
void setup_dsound_options(void);
diff --git a/dlls/openal32/Makefile.in b/dlls/openal32/Makefile.in
index b237706..9c2ac8f 100644
--- a/dlls/openal32/Makefile.in
+++ b/dlls/openal32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = openal32.dll
IMPORTS = kernel32 ntdll
-EXTRALIBS = @LIBOPENAL@
+EXTRALIBS = @LIBOPENAL@ @FRAMEWORK_OPENAL@
C_SRCS = \
openal.c
diff --git a/include/config.h.in b/include/config.h.in
index 7a77d1f..968e876 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -549,7 +549,7 @@
/* Define to 1 if you have the <net/route.h> header file. */
#undef HAVE_NET_ROUTE_H
-/* Define to 1 if `ns_msg' is a member of `_msg_ptr'. */
+/* Define to 1 if `_msg_ptr' is a member of `ns_msg'. */
#undef HAVE_NS_MSG__MSG_PTR
/* Define to 1 if the system has the type `off_t'. */
@@ -558,6 +558,9 @@
/* Define if mkdir takes only one argument */
#undef HAVE_ONE_ARG_MKDIR
+/* Define to 1 if OpenAL is available */
+#undef HAVE_OPENAL
+
/* Define to 1 if you have the <OpenAL/al.h> header file. */
#undef HAVE_OPENAL_AL_H
@@ -660,7 +663,7 @@
/* Define to 1 if you have the `sched_yield' function. */
#undef HAVE_SCHED_YIELD
-/* Define to 1 if `scsireq_t' is a member of `cmd'. */
+/* Define to 1 if `cmd' is a member of `scsireq_t'. */
#undef HAVE_SCSIREQ_T_CMD
/* Define to 1 if you have the <scsi/scsi.h> header file. */
@@ -687,7 +690,7 @@
/* Define to 1 if you have the `settimeofday' function. */
#undef HAVE_SETTIMEOFDAY
-/* Define to 1 if `sg_io_hdr_t' is a member of `interface_id'. */
+/* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */
#undef HAVE_SG_IO_HDR_T_INTERFACE_ID
/* Define if sigaddset is supported */
@@ -696,7 +699,7 @@
/* Define to 1 if you have the `sigaltstack' function. */
#undef HAVE_SIGALTSTACK
-/* Define to 1 if `siginfo_t' is a member of `si_fd'. */
+/* Define to 1 if `si_fd' is a member of `siginfo_t'. */
#undef HAVE_SIGINFO_T_SI_FD
/* Define to 1 if you have the `sigprocmask' function. */
@@ -768,67 +771,67 @@
/* Define to 1 if you have the `strtoull' function. */
#undef HAVE_STRTOULL
-/* Define to 1 if `struct ff_effect' is a member of `direction'. */
+/* Define to 1 if `direction' is a member of `struct ff_effect'. */
#undef HAVE_STRUCT_FF_EFFECT_DIRECTION
-/* Define to 1 if `struct icmpstat' is a member of `icps_outhist'. */
+/* Define to 1 if `icps_outhist' is a member of `struct icmpstat'. */
#undef HAVE_STRUCT_ICMPSTAT_ICPS_OUTHIST
-/* Define to 1 if `struct msghdr' is a member of `msg_accrights'. */
+/* Define to 1 if `msg_accrights' is a member of `struct msghdr'. */
#undef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS
-/* Define to 1 if `struct mtget' is a member of `mt_blkno'. */
+/* Define to 1 if `mt_blkno' is a member of `struct mtget'. */
#undef HAVE_STRUCT_MTGET_MT_BLKNO
-/* Define to 1 if `struct mtget' is a member of `mt_blksiz'. */
+/* Define to 1 if `mt_blksiz' is a member of `struct mtget'. */
#undef HAVE_STRUCT_MTGET_MT_BLKSIZ
-/* Define to 1 if `struct mtget' is a member of `mt_gstat'. */
+/* Define to 1 if `mt_gstat' is a member of `struct mtget'. */
#undef HAVE_STRUCT_MTGET_MT_GSTAT
-/* Define to 1 if `struct option' is a member of `name'. */
+/* Define to 1 if `name' is a member of `struct option'. */
#undef HAVE_STRUCT_OPTION_NAME
-/* Define to 1 if `struct sockaddr_in6' is a member of `sin6_scope_id'. */
+/* Define to 1 if `sin6_scope_id' is a member of `struct sockaddr_in6'. */
#undef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
-/* Define to 1 if `struct sockaddr' is a member of `sa_len'. */
+/* Define to 1 if `sa_len' is a member of `struct sockaddr'. */
#undef HAVE_STRUCT_SOCKADDR_SA_LEN
-/* Define to 1 if `struct sockaddr_un' is a member of `sun_len'. */
+/* Define to 1 if `sun_len' is a member of `struct sockaddr_un'. */
#undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
-/* Define to 1 if `struct statfs' is a member of `f_bavail'. */
+/* Define to 1 if `f_bavail' is a member of `struct statfs'. */
#undef HAVE_STRUCT_STATFS_F_BAVAIL
-/* Define to 1 if `struct statfs' is a member of `f_bfree'. */
+/* Define to 1 if `f_bfree' is a member of `struct statfs'. */
#undef HAVE_STRUCT_STATFS_F_BFREE
-/* Define to 1 if `struct statfs' is a member of `f_favail'. */
+/* Define to 1 if `f_favail' is a member of `struct statfs'. */
#undef HAVE_STRUCT_STATFS_F_FAVAIL
-/* Define to 1 if `struct statfs' is a member of `f_ffree'. */
+/* Define to 1 if `f_ffree' is a member of `struct statfs'. */
#undef HAVE_STRUCT_STATFS_F_FFREE
-/* Define to 1 if `struct statfs' is a member of `f_frsize'. */
+/* Define to 1 if `f_frsize' is a member of `struct statfs'. */
#undef HAVE_STRUCT_STATFS_F_FRSIZE
-/* Define to 1 if `struct statfs' is a member of `f_namelen'. */
+/* Define to 1 if `f_namelen' is a member of `struct statfs'. */
#undef HAVE_STRUCT_STATFS_F_NAMELEN
-/* Define to 1 if `struct statvfs' is a member of `f_blocks'. */
+/* Define to 1 if `f_blocks' is a member of `struct statvfs'. */
#undef HAVE_STRUCT_STATVFS_F_BLOCKS
-/* Define to 1 if `struct stat' is a member of `st_atim'. */
+/* Define to 1 if `st_atim' is a member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_ATIM
-/* Define to 1 if `struct stat' is a member of `st_blocks'. */
+/* Define to 1 if `st_blocks' is a member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_BLOCKS
-/* Define to 1 if `struct stat' is a member of `st_ctim'. */
+/* Define to 1 if `st_ctim' is a member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_CTIM
-/* Define to 1 if `struct stat' is a member of `st_mtim'. */
+/* Define to 1 if `st_mtim' is a member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_MTIM
/* Define to 1 if the system has the type `struct xinpgen'. */
@@ -1071,7 +1074,7 @@
/* Define to 1 if you have the <X11/Xutil.h> header file. */
#undef HAVE_X11_XUTIL_H
-/* Define to 1 if `XICCallback' is a member of `callback'. */
+/* Define to 1 if `callback' is a member of `XICCallback'. */
#undef HAVE_XICCALLBACK_CALLBACK
/* Define if you have the XKB extension */
@@ -1185,6 +1188,9 @@
/* Define to the soname of the libodbc library. */
#undef SONAME_LIBODBC
+/* Define to the soname of the libopenal library. */
+#undef SONAME_LIBOPENAL
+
/* Define to the soname of the libpng library. */
#undef SONAME_LIBPNG
--
1.6.5.3
--------------040409070102020202020803--
More information about the wine-patches
mailing list