April 2010 - Wine-commits - list.winehq.org

Maarten Lankhorst : mmdevapi: Add uuid include.
by Alexandre Julliard 05 Apr '10

05 Apr '10

Module: wine Branch: master Commit: 5a954d4032c16324bae6712a4ad395967c61deb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a954d4032c16324bae6712a4… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 17 22:02:44 2010 +0100 mmdevapi: Add uuid include. --- dlls/mmdevapi/Makefile.in | 2 +- dlls/mmdevapi/main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/Makefile.in b/dlls/mmdevapi/Makefile.in index fcf8ef3..89f04b1 100644 --- a/dlls/mmdevapi/Makefile.in +++ b/dlls/mmdevapi/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mmdevapi.dll -IMPORTS = ole32 oleaut32 user32 advapi32 kernel32 ntdll +IMPORTS = uuid ole32 oleaut32 user32 advapi32 kernel32 ntdll C_SRCS = \ devenum.c \ diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 9a3d4d1..6b15dab 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -27,8 +27,9 @@ #include "wingdi.h" #include "wine/debug.h" -#include "initguid.h" #include "ole2.h" +#include "olectl.h" +#include "initguid.h" #include "mmdeviceapi.h" #include "dshow.h" #include "dsound.h"

1 0

Maarten Lankhorst : configure: Change openal detection.
by Alexandre Julliard 05 Apr '10

05 Apr '10

Module: wine Branch: master Commit: d435499fbcd74fa6f34352cfe63391791856e6d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d435499fbcd74fa6f34352cfe… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 9 11:52:09 2009 +0100 configure: Change openal detection. --- configure | 60 ++++++++++++++++++++++++++++++-------------- configure.ac | 13 ++++++--- dlls/openal32/Makefile.in | 2 +- include/config.h.in | 6 ++++ 4 files changed, 56 insertions(+), 25 deletions(-) diff --git a/configure b/configure index 4dc93f3..6a32ba5 100755 --- a/configure +++ b/configure @@ -610,6 +610,7 @@ LDPATH BUILTINFLAG EXTRACFLAGS LIBKSTAT +LIBOPENAL LIBMPG123 PNGINCL FONTCONFIGINCL @@ -647,7 +648,7 @@ CROSSTARGET CROSSTEST CROSSCC CARBONLIB -LIBOPENAL +FRAMEWORK_OPENAL COREAUDIO DISKARBITRATIONLIB LDEXECFLAGS @@ -6469,9 +6470,14 @@ done fi if test "$ac_cv_header_OpenAL_al_h" = "yes" then - LIBOPENAL="-framework OpenAL" + FRAMEWORK_OPENAL="-framework OpenAL" - ac_cv_lib_openal_alGetSource3i=yes + +cat >>confdefs.h <<_ACEOF +#define HAVE_OPENAL 1 +_ACEOF + + ac_cv_lib_openal=yes fi if test "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" then @@ -11379,14 +11385,14 @@ test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes -o "x$ac_cv_func_AudioFileStreamOpe if test "$ac_cv_header_AL_al_h" = "yes" then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alGetSource3i in -lopenal" >&5 -$as_echo_n "checking for alGetSource3i in -lopenal... " >&6; } -if test "${ac_cv_lib_openal_alGetSource3i+set}" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lopenal" >&5 +$as_echo_n "checking for -lopenal... " >&6; } +if test "${ac_cv_lib_soname_openal+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS + ac_check_soname_save_LIBS=$LIBS LIBS="-lopenal $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -11405,23 +11411,39 @@ return alGetSource3i (); } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_openal_alGetSource3i=yes -else - ac_cv_lib_openal_alGetSource3i=no + case "$LIBEXT" in + dll) ac_cv_lib_soname_openal=`$ac_cv_path_LDD conftest.exe | grep "openal" | sed -e "s/dll.*/dll/"';2,$d'` ;; + dylib) ac_cv_lib_soname_openal=`otool -L conftest$ac_exeext | grep "libopenal\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libopenal\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_openal=`$ac_cv_path_LDD conftest$ac_exeext | grep "libopenal\\.$LIBEXT" | sed -e "s/^.*$libopenal\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` ;; + esac fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + LIBS=$ac_check_soname_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_openal_alGetSource3i" >&5 -$as_echo "$ac_cv_lib_openal_alGetSource3i" >&6; } -if test "x$ac_cv_lib_openal_alGetSource3i" = x""yes; then : - LIBOPENAL="-lopenal" +if test "x$ac_cv_lib_soname_openal" = "x"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } -fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_openal" >&5 +$as_echo "$ac_cv_lib_soname_openal" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBOPENAL "$ac_cv_lib_soname_openal" +_ACEOF + + LIBOPENAL="-lopenal" + ac_cv_lib_openal=yes + +cat >>confdefs.h <<_ACEOF +#define HAVE_OPENAL 1 +_ACEOF + +fi fi -if test "x$ac_cv_lib_openal_alGetSource3i" != xyes; then : +if test "x$ac_cv_lib_openal" != xyes; then : case "x$with_openal" in x) as_fn_append wine_notices "|libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported." ;; xno) ;; @@ -11429,7 +11451,7 @@ if test "x$ac_cv_lib_openal_alGetSource3i" != xyes; then : This is an error since --with-openal was requested." "$LINENO" 5 ;; esac fi -test "x$ac_cv_lib_openal_alGetSource3i" = xyes || enable_openal32=${enable_openal32:-no} +test "x$ac_cv_lib_openal" = xyes || enable_openal32=${enable_openal32:-no} if test "$ac_cv_header_kstat_h" = "yes" then diff --git a/configure.ac b/configure.ac index c73de4e..2a9c3d3 100644 --- a/configure.ac +++ b/configure.ac @@ -662,8 +662,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 @@ -1483,11 +1484,13 @@ test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes -o "x$ac_cv_func_AudioFileStreamOpe 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], +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.]) -test "x$ac_cv_lib_openal_alGetSource3i" = xyes || enable_openal32=${enable_openal32:-no} +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/openal32/Makefile.in b/dlls/openal32/Makefile.in index 1f6e876..edd0785 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 789172a..29e711c 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -574,6 +574,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 @@ -1210,6 +1213,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 0

Maarten Lankhorst : mmdevapi: Add alext.h for openal support.
by Alexandre Julliard 05 Apr '10

05 Apr '10

Module: wine Branch: master Commit: 918ae892272a91595d0c104f69ec8ae424f4ea42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=918ae892272a91595d0c104f6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Jan 30 17:39:46 2010 +0100 mmdevapi: Add alext.h for openal support. --- dlls/mmdevapi/alext.h | 144 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 144 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/alext.h b/dlls/mmdevapi/alext.h new file mode 100644 index 0000000..e0a10a7 --- /dev/null +++ b/dlls/mmdevapi/alext.h @@ -0,0 +1,144 @@ +/** + * OpenAL cross platform audio library + * Copyright (C) 2008 by authors. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * Or go to http://www.gnu.org/copyleft/lgpl.html + */ + +#ifndef AL_ALEXT_H +#define AL_ALEXT_H + +#include <stddef.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef AL_LOKI_IMA_ADPCM_format +#define AL_LOKI_IMA_ADPCM_format 1 +#define AL_FORMAT_IMA_ADPCM_MONO16_EXT 0x10000 +#define AL_FORMAT_IMA_ADPCM_STEREO16_EXT 0x10001 +#endif + +#ifndef AL_LOKI_WAVE_format +#define AL_LOKI_WAVE_format 1 +#define AL_FORMAT_WAVE_EXT 0x10002 +#endif + +#ifndef AL_EXT_vorbis +#define AL_EXT_vorbis 1 +#define AL_FORMAT_VORBIS_EXT 0x10003 +#endif + +#ifndef AL_LOKI_quadriphonic +#define AL_LOKI_quadriphonic 1 +#define AL_FORMAT_QUAD8_LOKI 0x10004 +#define AL_FORMAT_QUAD16_LOKI 0x10005 +#endif + +#ifndef AL_EXT_float32 +#define AL_EXT_float32 1 +#define AL_FORMAT_MONO_FLOAT32 0x10010 +#define AL_FORMAT_STEREO_FLOAT32 0x10011 +#endif + +#ifndef AL_EXT_double +#define AL_EXT_double 1 +#define AL_FORMAT_MONO_DOUBLE_EXT 0x10012 +#define AL_FORMAT_STEREO_DOUBLE_EXT 0x10013 +#endif + +#ifndef ALC_LOKI_audio_channel +#define ALC_LOKI_audio_channel 1 +#define ALC_CHAN_MAIN_LOKI 0x500001 +#define ALC_CHAN_PCM_LOKI 0x500002 +#define ALC_CHAN_CD_LOKI 0x500003 +#endif + +#ifndef ALC_ENUMERATE_ALL_EXT +#define ALC_ENUMERATE_ALL_EXT 1 +#define ALC_DEFAULT_ALL_DEVICES_SPECIFIER 0x1012 +#define ALC_ALL_DEVICES_SPECIFIER 0x1013 +#endif + +#ifndef AL_EXT_MCFORMATS +#define AL_EXT_MCFORMATS 1 +#define AL_FORMAT_QUAD8 0x1204 +#define AL_FORMAT_QUAD16 0x1205 +#define AL_FORMAT_QUAD32 0x1206 +#define AL_FORMAT_REAR8 0x1207 +#define AL_FORMAT_REAR16 0x1208 +#define AL_FORMAT_REAR32 0x1209 +#define AL_FORMAT_51CHN8 0x120A +#define AL_FORMAT_51CHN16 0x120B +#define AL_FORMAT_51CHN32 0x120C +#define AL_FORMAT_61CHN8 0x120D +#define AL_FORMAT_61CHN16 0x120E +#define AL_FORMAT_61CHN32 0x120F +#define AL_FORMAT_71CHN8 0x1210 +#define AL_FORMAT_71CHN16 0x1211 +#define AL_FORMAT_71CHN32 0x1212 +#endif + +#ifndef AL_EXT_MULAW_MCFORMATS +#define AL_EXT_MULAW_MCFORMATS 1 +#define AL_FORMAT_MONO_MULAW 0x10014 +#define AL_FORMAT_STEREO_MULAW 0x10015 +#define AL_FORMAT_QUAD_MULAW 0x10021 +#define AL_FORMAT_REAR_MULAW 0x10022 +#define AL_FORMAT_51CHN_MULAW 0x10023 +#define AL_FORMAT_61CHN_MULAW 0x10024 +#define AL_FORMAT_71CHN_MULAW 0x10025 +#endif + +#ifndef AL_EXT_IMA4 +#define AL_EXT_IMA4 1 +#define AL_FORMAT_MONO_IMA4 0x1300 +#define AL_FORMAT_STEREO_IMA4 0x1301 +#endif + +#ifndef AL_EXT_STATIC_BUFFER +#define AL_EXT_STATIC_BUFFER 1 +typedef ALvoid (AL_APIENTRY*PFNALBUFFERDATASTATICPROC)(const ALint,ALenum,ALvoid*,ALsizei,ALsizei); +#ifdef AL_ALEXT_PROTOTYPES +AL_API ALvoid AL_APIENTRY alBufferDataStatic(const ALint buffer, ALenum format, ALvoid *data, ALsizei len, ALsizei freq); +#endif +#endif + +#ifndef ALC_EXT_disconnect +#define ALC_EXT_disconnect 1 +#define ALC_CONNECTED 0x313 +#endif + +#ifndef ALC_EXT_thread_local_context +#define ALC_EXT_thread_local_context 1 +typedef ALCboolean (ALC_APIENTRY*PFNALCSETTHREADCONTEXTPROC)(ALCcontext *context); +typedef ALCcontext* (ALC_APIENTRY*PFNALCGETTHREADCONTEXTPROC)(void); +#ifdef AL_ALEXT_PROTOTYPES +ALC_API ALCboolean ALC_APIENTRY alcSetThreadContext(ALCcontext *context); +ALC_API ALCcontext* ALC_APIENTRY alcGetThreadContext(void); +#endif +#endif + +#ifndef AL_EXT_source_distance_model +#define AL_EXT_source_distance_model 1 +#define AL_SOURCE_DISTANCE_MODEL 0x200 +#endif + +#ifdef __cplusplus +} +#endif + +#endif

1 0

Maarten Lankhorst : mmdevapi: Add dependency on openal.
by Alexandre Julliard 05 Apr '10

05 Apr '10

Module: wine Branch: master Commit: 2c067ed31efa00f4c4baa48e5c952418b9337b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c067ed31efa00f4c4baa48e5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 21 14:48:39 2010 +0100 mmdevapi: Add dependency on openal. --- dlls/mmdevapi/Makefile.in | 1 + dlls/mmdevapi/main.c | 264 ++++++++++++++++++++++++++++++++++++++++++++- dlls/mmdevapi/mmdevapi.h | 252 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 516 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c067ed31efa00f4c4baa…

1 0

Maarten Lankhorst : mmdevapi: Use openal to enumerate devices.
by Alexandre Julliard 05 Apr '10

05 Apr '10

Module: wine Branch: master Commit: 7b36f6658b3d221fb58cedcbc494a5da135f8207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b36f6658b3d221fb58cedcbc… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 21 14:48:57 2010 +0100 mmdevapi: Use openal to enumerate devices. --- dlls/mmdevapi/devenum.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 118 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 62855fa..362855e 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -106,7 +106,7 @@ static HRESULT MMDevPropStore_Create(MMDevice *This, DWORD access, IPropertyStor * If GUID is null, a random guid will be assigned * and the device will be created */ -static void MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD state, BOOL setdefault) +static void MMDevice_Create(MMDevice **dev, WCHAR *name, GUID *id, EDataFlow flow, DWORD state, BOOL setdefault) { HKEY key, root; MMDevice *cur; @@ -190,6 +190,8 @@ done: else MMDevice_def_rec = cur; } + if (dev) + *dev = cur; } static void MMDevice_Destroy(MMDevice *This) @@ -679,6 +681,113 @@ HRESULT MMDevice_SetPropValue(const GUID *devguid, DWORD flow, REFPROPERTYKEY ke return hr; } +#ifdef HAVE_OPENAL + +static void openal_setformat(MMDevice *This, DWORD freq) +{ + HRESULT hr; + PROPVARIANT pv = { VT_EMPTY }; + + hr = MMDevice_GetPropValue(&This->devguid, This->flow, &PKEY_AudioEngine_DeviceFormat, &pv); + if (SUCCEEDED(hr) && pv.vt == VT_BLOB) + { + WAVEFORMATEX *pwfx; + pwfx = (WAVEFORMATEX*)pv.u.blob.pBlobData; + if (pwfx->nSamplesPerSec != freq) + { + pwfx->nSamplesPerSec = freq; + pwfx->nAvgBytesPerSec = freq * pwfx->nBlockAlign; + MMDevice_SetPropValue(&This->devguid, This->flow, &PKEY_AudioEngine_DeviceFormat, &pv); + } + CoTaskMemFree(pwfx); + } + else + { + WAVEFORMATEXTENSIBLE wfxe; + + wfxe.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + wfxe.Format.nChannels = 2; + wfxe.Format.wBitsPerSample = 32; + wfxe.Format.nBlockAlign = wfxe.Format.nChannels * wfxe.Format.wBitsPerSample/8; + wfxe.Format.nSamplesPerSec = freq; + wfxe.Format.nAvgBytesPerSec = wfxe.Format.nSamplesPerSec * wfxe.Format.nBlockAlign; + wfxe.Format.cbSize = sizeof(wfxe)-sizeof(WAVEFORMATEX); + wfxe.Samples.wValidBitsPerSample = 32; + wfxe.SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; + wfxe.dwChannelMask = SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT; + + pv.vt = VT_BLOB; + pv.u.blob.cbSize = sizeof(wfxe); + pv.u.blob.pBlobData = (BYTE*)&wfxe; + MMDevice_SetPropValue(&This->devguid, This->flow, &PKEY_AudioEngine_DeviceFormat, &pv); + MMDevice_SetPropValue(&This->devguid, This->flow, &PKEY_AudioEngine_OEMFormat, &pv); + } +} + +static void openal_scanrender(void) +{ + WCHAR name[MAX_PATH]; + ALCdevice *dev; + const ALCchar *devstr, *defaultstr; + EnterCriticalSection(&openal_crst); + if (palcIsExtensionPresent(NULL, "ALC_ENUMERATE_ALL_EXT")) { + defaultstr = palcGetString(NULL, ALC_DEFAULT_ALL_DEVICES_SPECIFIER); + devstr = palcGetString(NULL, ALC_ALL_DEVICES_SPECIFIER); + } else { + defaultstr = palcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER); + devstr = palcGetString(NULL, ALC_DEVICE_SPECIFIER); + } + if (devstr && *devstr) + do { + MMDevice *mmdev; + MultiByteToWideChar( CP_UNIXCP, 0, devstr, -1, + name, sizeof(name)/sizeof(*name)-1 ); + name[sizeof(name)/sizeof(*name)-1] = 0; + TRACE("Adding %s\n", devstr); + dev = palcOpenDevice(devstr); + MMDevice_Create(&mmdev, name, NULL, eRender, dev ? DEVICE_STATE_ACTIVE : DEVICE_STATE_NOTPRESENT, !strcmp(devstr, defaultstr)); + if (dev) + { + ALint freq = 44100; + palcGetIntegerv(dev, ALC_FREQUENCY, 1, &freq); + openal_setformat(mmdev, freq); + palcCloseDevice(dev); + } + else + WARN("Could not open device: %04x\n", palcGetError(NULL)); + devstr += strlen(devstr)+1; + } while (*devstr); + LeaveCriticalSection(&openal_crst); +} + +static void openal_scancapture(void) +{ + WCHAR name[MAX_PATH]; + ALCdevice *dev; + const ALCchar *devstr, *defaultstr; + + EnterCriticalSection(&openal_crst); + devstr = palcGetString(NULL, ALC_CAPTURE_DEVICE_SPECIFIER); + defaultstr = palcGetString(NULL, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER); + if (devstr && *devstr) + do { + ALint freq = 44100; + MultiByteToWideChar( CP_UNIXCP, 0, devstr, -1, + name, sizeof(name)/sizeof(*name)-1 ); + name[sizeof(name)/sizeof(*name)-1] = 0; + TRACE("Adding %s\n", devstr); + dev = palcCaptureOpenDevice(devstr, freq, AL_FORMAT_MONO16, 65536); + MMDevice_Create(NULL, name, NULL, eCapture, dev ? DEVICE_STATE_ACTIVE : DEVICE_STATE_NOTPRESENT, !strcmp(devstr, defaultstr)); + if (dev) + palcCaptureCloseDevice(dev); + else + WARN("Could not open device: %04x\n", palcGetError(NULL)); + devstr += strlen(devstr)+1; + } while (*devstr); + LeaveCriticalSection(&openal_crst); +} +#endif /*HAVE_OPENAL*/ + HRESULT MMDevEnum_Create(REFIID riid, void **ppv) { MMDevEnumImpl *This = MMDevEnumerator; @@ -738,11 +847,18 @@ HRESULT MMDevEnum_Create(REFIID riid, void **ppv) && SUCCEEDED(MMDevice_GetPropValue(&guid, curflow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv)) && pv.vt == VT_LPWSTR) { - MMDevice_Create(pv.u.pwszVal, &guid, curflow, + MMDevice_Create(NULL, pv.u.pwszVal, &guid, curflow, DEVICE_STATE_NOTPRESENT, FALSE); CoTaskMemFree(pv.u.pwszVal); } } while (1); +#ifdef HAVE_OPENAL + if (openal_loaded) + { + openal_scanrender(); + openal_scancapture(); + } +#endif /*HAVE_OPENAL*/ } return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); }

1 0

Alexandre Julliard : mmdevapi: Include system headers before Wine headers.
by Alexandre Julliard 05 Apr '10

05 Apr '10

Module: wine Branch: master Commit: a7d000e2e2d86a1fb7e635662fb1fcb461f1f4e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7d000e2e2d86a1fb7e635662… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 5 17:44:23 2010 +0200 mmdevapi: Include system headers before Wine headers. --- dlls/mmdevapi/devenum.c | 10 +++++++++- dlls/mmdevapi/main.c | 8 ++++++++ dlls/mmdevapi/mmdevapi.h | 13 ++++--------- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 362855e..b593eb6 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -16,11 +16,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION #include "config.h" #include <stdarg.h> +#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> +#endif + +#define NONAMELESSUNION #define CINTERFACE #define COBJMACROS #include "windef.h" diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index d9536aa..0467963 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -21,6 +21,14 @@ #include <stdarg.h> +#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> +#endif + #define CINTERFACE #define COBJMACROS #include "windef.h" diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index 310c9f1..bcca85e 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef __WINE_CONFIG_H +# error You must include config.h to use this header +#endif + extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv); extern void MMDevEnum_Free(void); @@ -37,15 +41,6 @@ typedef struct MMDevice { #ifdef HAVE_OPENAL -#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 #include "alext.h" /* All openal functions */

1 0

Andrew Eikum : mshtml: Return success in HTTPChannel::SetRequestMethod.
by Alexandre Julliard 05 Apr '10

05 Apr '10

Module: wine Branch: master Commit: b688fd0de3d74a5da4ea594cd8fda91cbbbb1f22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b688fd0de3d74a5da4ea594cd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Apr 2 17:31:39 2010 -0500 mshtml: Return success in HTTPChannel::SetRequestMethod. Request method is determined by Wine on bind, so return success in this function to make Gecko happy. --- dlls/mshtml/nsio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 4610bbc..eb7aa73 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -933,9 +933,9 @@ static nsresult NSAPI nsChannel_SetRequestMethod(nsIHttpChannel *iface, { nsChannel *This = NSCHANNEL_THIS(iface); - FIXME("(%p)->(%p)\n", This, aRequestMethod); + TRACE("(%p)->(%p): Returning NS_OK\n", This, aRequestMethod); - return NS_ERROR_NOT_IMPLEMENTED; + return NS_OK; } static nsresult NSAPI nsChannel_GetReferrer(nsIHttpChannel *iface, nsIURI **aReferrer)

1 0

Andrew Eikum : mshtml: Implement HTTPChannel::GetRequestSucceeded.
by Alexandre Julliard 05 Apr '10

05 Apr '10

Module: wine Branch: master Commit: f40682eba90e45df1dff9188342aad6a253985ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40682eba90e45df1dff91883… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Apr 2 17:31:42 2010 -0500 mshtml: Implement HTTPChannel::GetRequestSucceeded. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsio.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 374b6c0..b19dbfa 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -38,6 +38,7 @@ #define NS_ERROR_FAILURE ((nsresult)0x80004005L) #define NS_NOINTERFACE ((nsresult)0x80004002L) #define NS_ERROR_NOT_IMPLEMENTED ((nsresult)0x80004001L) +#define NS_ERROR_NOT_AVAILABLE ((nsresult)0x80040111L) #define NS_ERROR_INVALID_ARG ((nsresult)0x80070057L) #define NS_ERROR_UNEXPECTED ((nsresult)0x8000ffffL) #define NS_ERROR_UNKNOWN_PROTOCOL ((nsresult)0x804b0012L) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index eb7aa73..8967fa1 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1052,9 +1052,14 @@ static nsresult NSAPI nsChannel_GetRequestSucceeded(nsIHttpChannel *iface, { nsChannel *This = NSCHANNEL_THIS(iface); - FIXME("(%p)->(%p)\n", This, aRequestSucceeded); + TRACE("(%p)->(%p)\n", This, aRequestSucceeded); - return NS_ERROR_NOT_IMPLEMENTED; + if(!This->response_status) + return NS_ERROR_NOT_AVAILABLE; + + *aRequestSucceeded = (This->response_status < 400); + + return NS_OK; } static nsresult NSAPI nsChannel_GetResponseHeader(nsIHttpChannel *iface,

1 0

Andrew Eikum : mshtml: Implement HTTPChannel::GetResponseHeader.
by Alexandre Julliard 05 Apr '10

05 Apr '10

Module: wine Branch: master Commit: cf2a3af6f0e9f0d7a7d2eee903f58d78eacb7c4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2a3af6f0e9f0d7a7d2eee90… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Apr 2 17:31:45 2010 -0500 mshtml: Implement HTTPChannel::GetResponseHeader. --- dlls/mshtml/mshtml_private.h | 7 ++++ dlls/mshtml/navigate.c | 70 +++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/nsio.c | 39 ++++++++++++++++++++++- 3 files changed, 110 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b19dbfa..e378f26 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -463,9 +463,16 @@ typedef struct { char *content_type; char *charset; PRUint32 response_status; + struct list response_headers; UINT url_scheme; } nsChannel; +struct ResponseHeader { + struct list entry; + WCHAR *header; + WCHAR *data; +}; + typedef struct { HRESULT (*qi)(HTMLDOMNode*,REFIID,void**); void (*destructor)(HTMLDOMNode*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index cc2aeb3..7a77795 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -62,7 +62,7 @@ typedef struct { HRESULT (*stop_binding)(BSCallback*,HRESULT); HRESULT (*read_data)(BSCallback*,IStream*); HRESULT (*on_progress)(BSCallback*,ULONG,LPCWSTR); - HRESULT (*on_response)(BSCallback*,DWORD); + HRESULT (*on_response)(BSCallback*,DWORD,LPCWSTR); } BSCallbackVtbl; struct BSCallback { @@ -493,7 +493,7 @@ static HRESULT WINAPI HttpNegotiate_OnResponse(IHttpNegotiate2 *iface, DWORD dwR TRACE("(%p)->(%d %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders), debugstr_w(szRequestHeaders), pszAdditionalRequestHeaders); - return This->vtbl->on_response(This, dwResponseCode); + return This->vtbl->on_response(This, dwResponseCode, szResponseHeaders); } static HRESULT WINAPI HttpNegotiate_GetRootSecurityId(IHttpNegotiate2 *iface, @@ -825,7 +825,8 @@ static HRESULT BufferBSC_on_progress(BSCallback *bsc, ULONG status_code, LPCWSTR return S_OK; } -static HRESULT BufferBSC_on_response(BSCallback *bsc, DWORD response_code) +static HRESULT BufferBSC_on_response(BSCallback *bsc, DWORD response_code, + LPCWSTR response_headers) { return S_OK; } @@ -1099,11 +1100,72 @@ static HRESULT nsChannelBSC_on_progress(BSCallback *bsc, ULONG status_code, LPCW return S_OK; } -static HRESULT nsChannelBSC_on_response(BSCallback *bsc, DWORD response_code) +static HRESULT nsChannelBSC_on_response(BSCallback *bsc, DWORD response_code, + LPCWSTR response_headers) { nsChannelBSC *This = NSCHANNELBSC_THIS(bsc); This->nschannel->response_status = response_code; + + if(response_headers) { + const WCHAR *hdr_start, *hdr_end; + + hdr_start = strchrW(response_headers, '\r'); + while(hdr_start) { + const WCHAR *colon; + struct ResponseHeader *new_header; + int len; + + hdr_start += 2; + hdr_end = strchrW(hdr_start, '\r'); + if(!hdr_end) { + WARN("Header doesn't end with CRLF: %s\n", wine_dbgstr_w(hdr_start)); + break; + } + if(hdr_end == hdr_start) + break; + + for(colon = hdr_start; *colon != ':' && colon != hdr_end; ++colon); + if(*colon != ':') { + WARN("Header missing colon: %s\n", wine_dbgstr_w(hdr_start)); + hdr_start = strchrW(hdr_start, '\r'); + continue; + } + + new_header = heap_alloc(sizeof(struct ResponseHeader)); + if(!new_header) + return E_OUTOFMEMORY; + + len = colon - hdr_start; + new_header->header = heap_alloc((len + 1) * sizeof(WCHAR)); + if(!new_header->header) { + heap_free(new_header); + return E_OUTOFMEMORY; + } + memcpy(new_header->header, hdr_start, len * sizeof(WCHAR)); + new_header->header[len] = 0; + + colon++; + while(*colon == ' ') + colon++; + + len = hdr_end - colon; + new_header->data = heap_alloc((len + 1) * sizeof(WCHAR)); + if(!new_header->data) { + heap_free(new_header->header); + heap_free(new_header); + return E_OUTOFMEMORY; + } + memcpy(new_header->data, colon, len * sizeof(WCHAR)); + new_header->data[len] = 0; + + list_add_head(&This->nschannel->response_headers, &new_header->entry); + TRACE("Adding header to list: (%s):(%s)\n", wine_dbgstr_w(new_header->header), wine_dbgstr_w(new_header->data)); + + hdr_start = strchrW(hdr_start, '\r'); + } + } + return S_OK; } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 8967fa1..dc4f538 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -363,6 +363,8 @@ static nsrefcnt NSAPI nsChannel_Release(nsIHttpChannel *iface) LONG ref = InterlockedDecrement(&This->ref); if(!ref) { + struct ResponseHeader *header, *next_hdr; + nsIURI_Release(NSURI(This->uri)); if(This->owner) nsISupports_Release(This->owner); @@ -376,6 +378,14 @@ static nsrefcnt NSAPI nsChannel_Release(nsIHttpChannel *iface) nsIURI_Release(This->original_uri); heap_free(This->content_type); heap_free(This->charset); + + LIST_FOR_EACH_ENTRY_SAFE(header, next_hdr, &This->response_headers, struct ResponseHeader, entry) { + list_remove(&header->entry); + heap_free(header->header); + heap_free(header->data); + heap_free(header); + } + heap_free(This); } @@ -1066,10 +1076,34 @@ static nsresult NSAPI nsChannel_GetResponseHeader(nsIHttpChannel *iface, const nsACString *header, nsACString *_retval) { nsChannel *This = NSCHANNEL_THIS(iface); + const char *header_str; + WCHAR *header_wstr; + struct ResponseHeader *this_header; - FIXME("(%p)->(%p %p)\n", This, header, _retval); + nsACString_GetData(header, &header_str); + TRACE("(%p)->(%p(%s) %p)\n", This, header, header_str, _retval); - return NS_ERROR_NOT_IMPLEMENTED; + header_wstr = heap_strdupAtoW(header_str); + if(!header_wstr) + return NS_ERROR_UNEXPECTED; + + LIST_FOR_EACH_ENTRY(this_header, &This->response_headers, struct ResponseHeader, entry) { + if(!strcmpW(this_header->header, header_wstr)) { + char *data = heap_strdupWtoA(this_header->data); + if(!data) { + heap_free(header_wstr); + return NS_ERROR_UNEXPECTED; + } + nsACString_SetData(_retval, data); + heap_free(data); + heap_free(header_wstr); + return NS_OK; + } + } + + heap_free(header_wstr); + + return NS_ERROR_NOT_AVAILABLE; } static nsresult NSAPI nsChannel_SetResponseHeader(nsIHttpChannel *iface, @@ -2521,6 +2555,7 @@ static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI ret->lpIHttpChannelInternalVtbl = &nsHttpChannelInternalVtbl; ret->ref = 1; ret->uri = wine_uri; + list_init(&ret->response_headers); nsIURI_AddRef(aURI); ret->original_uri = aURI;

1 0

Andrew Eikum : mshtml: Always load URLs without a base URL through Wine.
by Alexandre Julliard 05 Apr '10

05 Apr '10

Module: wine Branch: master Commit: 3901185e946d5c114b9e5d12e9ae80a427238bf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3901185e946d5c114b9e5d12e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Sat Apr 3 11:07:07 2010 -0500 mshtml: Always load URLs without a base URL through Wine. --- dlls/mshtml/nsio.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index dc4f538..2e514b1 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2453,7 +2453,6 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * HTMLWindow *window = NULL; nsIURI *uri = NULL; LPCWSTR base_wine_url = NULL; - BOOL is_wine_uri = FALSE; nsresult nsres; nsACString_GetData(aSpec, &spec); @@ -2464,10 +2463,8 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * if(is_gecko_special_uri(spec)) return nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, _retval); - if(!strncmp(spec, "wine:", 5)) { + if(!strncmp(spec, "wine:", 5)) spec += 5; - is_wine_uri = TRUE; - } if(aBaseURI) { PARSEDURLA parsed_url = {sizeof(PARSEDURLA)}; @@ -2512,7 +2509,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * set_wine_url(wine_uri, url); else WARN("CoCombineUrl failed: %08x\n", hres); - }else if(is_wine_uri) { + }else { WCHAR url[INTERNET_MAX_URL_LENGTH]; MultiByteToWideChar(CP_ACP, 0, spec, -1, url, sizeof(url)/sizeof(WCHAR));

1 0