wine-commits January 2015

wine-commits@winehq.org

2 participants
302 discussions

Mark Harmstone : dsound: Degrade speaker config if too many channels.
by Alexandre Julliard 13 Jan '15

13 Jan '15

Module: wine Branch: master Commit: b5aec2e40ffb3a49134a424e936f38adfa27470e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5aec2e40ffb3a49134a424e9… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sun Jan 11 17:40:52 2015 +0000 dsound: Degrade speaker config if too many channels. --- dlls/dsound/dsound_private.h | 1 + dlls/dsound/primary.c | 17 ++++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index af2034a..52b2847 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -219,6 +219,7 @@ HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LP LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) DECLSPEC_HIDDEN; HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) DECLSPEC_HIDDEN; HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) DECLSPEC_HIDDEN; +DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice, int channels) DECLSPEC_HIDDEN; HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, const DSBUFFERDESC *dsbd) DECLSPEC_HIDDEN; void primarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index d3c2689..7d05efd 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -93,7 +93,10 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client if (FAILED(hr)) return hr; - if (mixwfe->Format.nChannels > device->num_speakers) { + if (mixwfe->Format.nChannels < device->num_speakers) { + device->speaker_config = DSOUND_FindSpeakerConfig(device->mmdevice, mixwfe->Format.nChannels); + DSOUND_ParseSpeakerConfig(device); + } else if (mixwfe->Format.nChannels > device->num_speakers) { mixwfe->Format.nChannels = device->num_speakers; mixwfe->Format.nBlockAlign = mixwfe->Format.nChannels * mixwfe->Format.wBitsPerSample / 8; mixwfe->Format.nAvgBytesPerSec = mixwfe->Format.nSamplesPerSec * mixwfe->Format.nBlockAlign; @@ -163,7 +166,7 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client return S_OK; } -static DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice) +DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice, int channels) { IPropertyStore *store; HRESULT hr; @@ -198,13 +201,13 @@ static DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice) PropVariantClear(&pv); IPropertyStore_Release(store); - if ((phys_speakers & KSAUDIO_SPEAKER_5POINT1) == KSAUDIO_SPEAKER_5POINT1) + if ((channels >= 6 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_5POINT1) == KSAUDIO_SPEAKER_5POINT1) return DSSPEAKER_5POINT1_BACK; - else if ((phys_speakers & KSAUDIO_SPEAKER_5POINT1_SURROUND) == KSAUDIO_SPEAKER_5POINT1_SURROUND) + else if ((channels >= 6 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_5POINT1_SURROUND) == KSAUDIO_SPEAKER_5POINT1_SURROUND) return DSSPEAKER_5POINT1_SURROUND; - else if ((phys_speakers & KSAUDIO_SPEAKER_QUAD) == KSAUDIO_SPEAKER_QUAD) + else if ((channels >= 4 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_QUAD) == KSAUDIO_SPEAKER_QUAD) return DSSPEAKER_QUAD; - else if ((phys_speakers & KSAUDIO_SPEAKER_STEREO) == KSAUDIO_SPEAKER_STEREO) + else if ((channels >= 2 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_STEREO) == KSAUDIO_SPEAKER_STEREO) return DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); else if ((phys_speakers & KSAUDIO_SPEAKER_MONO) == KSAUDIO_SPEAKER_MONO) return DSSPEAKER_MONO; @@ -247,7 +250,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) return hres; } - device->speaker_config = DSOUND_FindSpeakerConfig(device->mmdevice); + device->speaker_config = DSOUND_FindSpeakerConfig(device->mmdevice, 0); DSOUND_ParseSpeakerConfig(device);

1 0

Mark Harmstone : winealsa: Do not destroy remapping info on IsFormatSupported.
by Alexandre Julliard 13 Jan '15

13 Jan '15

Module: wine Branch: master Commit: dcf8767b5879f88548ab35de3e65afbef17bd65a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf8767b5879f88548ab35de3… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sun Jan 11 17:10:28 2015 +0000 winealsa: Do not destroy remapping info on IsFormatSupported. --- dlls/winealsa.drv/mmdevdrv.c | 62 +++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 33 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 2079dcc..e32cb54 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1130,11 +1130,11 @@ static int alsa_channel_index(DWORD flag) return -1; } -static BOOL need_remapping(ACImpl *This, const WAVEFORMATEX *fmt) +static BOOL need_remapping(ACImpl *This, const WAVEFORMATEX *fmt, int *map) { unsigned int i; for(i = 0; i < fmt->nChannels; ++i){ - if(This->alsa_channel_map[i] != i) + if(map[i] != i) return TRUE; } return FALSE; @@ -1166,8 +1166,10 @@ static DWORD get_channel_mask(unsigned int channels) return 0; } -static HRESULT map_channels(ACImpl *This, const WAVEFORMATEX *fmt) +static HRESULT map_channels(ACImpl *This, const WAVEFORMATEX *fmt, int *alsa_channels, int *map) { + BOOL need_remap; + if(This->dataflow != eCapture && (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE || fmt->nChannels > 2) ){ WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; DWORD mask, flag = SPEAKER_FRONT_LEFT; @@ -1179,47 +1181,47 @@ static HRESULT map_channels(ACImpl *This, const WAVEFORMATEX *fmt) else mask = get_channel_mask(fmt->nChannels); - This->alsa_channels = 0; + *alsa_channels = 0; while(i < fmt->nChannels && !(flag & SPEAKER_RESERVED)){ if(mask & flag){ - This->alsa_channel_map[i] = alsa_channel_index(flag); + map[i] = alsa_channel_index(flag); TRACE("Mapping mmdevapi channel %u (0x%x) to ALSA channel %d\n", - i, flag, This->alsa_channel_map[i]); - if(This->alsa_channel_map[i] >= This->alsa_channels) - This->alsa_channels = This->alsa_channel_map[i] + 1; + i, flag, map[i]); + if(map[i] >= *alsa_channels) + *alsa_channels = map[i] + 1; ++i; } flag <<= 1; } while(i < fmt->nChannels){ - This->alsa_channel_map[i] = This->alsa_channels; + map[i] = *alsa_channels; TRACE("Mapping mmdevapi channel %u to ALSA channel %d\n", - i, This->alsa_channel_map[i]); - ++This->alsa_channels; + i, map[i]); + ++*alsa_channels; ++i; } for(i = 0; i < fmt->nChannels; ++i){ - if(This->alsa_channel_map[i] == -1){ - This->alsa_channel_map[i] = This->alsa_channels; - ++This->alsa_channels; + if(map[i] == -1){ + map[i] = *alsa_channels; + ++*alsa_channels; TRACE("Remapping mmdevapi channel %u to ALSA channel %d\n", - i, This->alsa_channel_map[i]); + i, map[i]); } } - This->need_remapping = need_remapping(This, fmt); - - TRACE("need_remapping: %u, alsa_channels: %d\n", This->need_remapping, This->alsa_channels); + need_remap = need_remapping(This, fmt, map); }else{ - This->need_remapping = FALSE; - This->alsa_channels = fmt->nChannels; - TRACE("need_remapping: %u, alsa_channels: %d\n", This->need_remapping, This->alsa_channels); + *alsa_channels = fmt->nChannels; + + need_remap = FALSE; } - return S_OK; + TRACE("need_remapping: %u, alsa_channels: %d\n", need_remap, *alsa_channels); + + return need_remap ? S_OK : S_FALSE; } static void silence_buffer(ACImpl *This, BYTE *buffer, UINT32 frames) @@ -1304,11 +1306,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, dump_fmt(fmt); - if(FAILED(map_channels(This, fmt))){ - WARN("map_channels failed\n"); - hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; - goto exit; - } + This->need_remapping = map_channels(This, fmt, &This->alsa_channels, This->alsa_channel_map) == S_OK ? TRUE : FALSE; if((err = snd_pcm_hw_params_any(This->pcm_handle, This->hw_params)) < 0){ WARN("Unable to get hw_params: %d (%s)\n", err, snd_strerror(err)); @@ -1623,6 +1621,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, WAVEFORMATEX *closest = NULL; unsigned int max = 0, min = 0; int err; + int alsa_channels, alsa_channel_map[32]; TRACE("(%p)->(%x, %p, %p)\n", This, mode, fmt, out); @@ -1717,12 +1716,9 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, closest->nChannels = min; } - if(FAILED(map_channels(This, fmt))){ - hr = AUDCLNT_E_DEVICE_INVALIDATED; - WARN("map_channels failed\n"); - goto exit; - } - if(This->alsa_channels > max){ + map_channels(This, fmt, &alsa_channels, alsa_channel_map); + + if(alsa_channels > max){ hr = S_FALSE; closest->nChannels = max; }

1 0

Frédéric Delanoy : French translation for release 1.7.34
by Jeremy Newman 13 Jan '15

13 Jan '15

Module: website Branch: master Commit: 1b5e2abaaad290fd5afc474940755465acda0f24 URL: http://source.winehq.org/git/website.git/?a=commit;h=1b5e2abaaad290fd5afc47… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jan 13 12:59:18 2015 +0100 French translation for release 1.7.34 --- news/fr/2015010901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2015010901.xml b/news/fr/2015010901.xml new file mode 100644 index 0000000..197ca5c --- /dev/null +++ b/news/fr/2015010901.xml @@ -0,0 +1,16 @@ +<news> +<date>9 janvier 2015</date> +<title>Sortie de Wine 1.7.34</title> +<body> + La version de développement 1.7.34 de Wine est disponible. + <a href="{$root}/announce/1.7.34">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge du son multicanal dans DirectSound.</li> + <li>Meilleure prise en charge des séquences de texte dans DirectWrite.</li> + <li>Nombreux correctifs dans le moteur HTML.</li> + <li>Prise en charge complémentaire des objets WBEM.</li> + <li>Quelques fonctions supplémentaires dans les moteurs d'exécution C/C++.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.34.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.34
by Jeremy Newman 12 Jan '15

12 Jan '15

Module: website Branch: master Commit: addf9a11344e4d57de98c3daf2dcd314743b8709 URL: http://source.winehq.org/git/website.git/?a=commit;h=addf9a11344e4d57de98c3… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Jan 10 09:30:53 2015 +0100 Polish translation for release 1.7.34 --- news/pl/2015010901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2015010901.xml b/news/pl/2015010901.xml new file mode 100644 index 0000000..2944c64 --- /dev/null +++ b/news/pl/2015010901.xml @@ -0,0 +1,17 @@ +<news> +<date>Styczeń 9, 2015</date> +<title>Wydano Wine 1.7.34</title> +<body> + Wydanie rozwojowe Wine 1.7.34 jest już dostępne. + <a href="{$root}/announce/1.7.34">Co nowego</a> w tym wydaniu: +<ul> + <li>Obsługa dźwięku otaczającego w DirectSound.</li> + <li>Lepsza obsługa tekstu w DirectWrite.</li> + <li>Wiele poprawek w silniku HTML.</li> + <li>Większe wsparcie dla obiektów WBEM.</li> + <li>Więcej funkcji w bibliotekach uruchomieniowych C/C++.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.34.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.34
by Alexandre Julliard 09 Jan '15

09 Jan '15

Module: website Branch: master Commit: ea01e69a8fba7e1d4245e1eb5a5a1e2ba23aa59f URL: http://source.winehq.org/git/website.git/?a=commit;h=ea01e69a8fba7e1d4245e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 9 20:56:48 2015 +0100 Wine release 1.7.34 --- news/en/2015010901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2015010901.xml b/news/en/2015010901.xml new file mode 100644 index 0000000..fefb868 --- /dev/null +++ b/news/en/2015010901.xml @@ -0,0 +1,17 @@ +<news> +<date>January 9, 2015</date> +<title>Wine 1.7.34 Released</title> +<body> + The Wine development release 1.7.34 is now available. + <a href="{$root}/announce/1.7.34">What's new</a> in this release: +<ul> + <li>Support for surround sound in DirectSound.</li> + <li>Better text run support in DirectWrite.</li> + <li>Many HTML engine fixes.</li> + <li>More support for WBEM objects.</li> + <li>A few more C/C++ runtime functions.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.34.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.7.34 : Alexandre Julliard : Release 1.7.34
by Alexandre Julliard 09 Jan '15

09 Jan '15

Module: wine Branch: refs/tags/wine-1.7.34 Tag: 87953c463c9e63eb495db7a8d05b3122dfd67086 URL: http://source.winehq.org/git/wine.git/?a=tag;h=87953c463c9e63eb495db7a8d05b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 9 20:48:24 2015 +0100 Release 1.7.34

1 0

Alexandre Julliard : Release 1.7.34.
by Alexandre Julliard 09 Jan '15

09 Jan '15

Module: wine Branch: master Commit: b34b2caed4ec509af9d92edf8dc48d495097ebfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b34b2caed4ec509af9d92edf8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 9 20:48:24 2015 +0100 Release 1.7.34. --- ANNOUNCE | 619 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 8 + VERSION | 2 +- configure | 18 +- 4 files changed, 362 insertions(+), 285 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b34b2caed4ec509af9d92…

1 0

Mark Harmstone : dsound: Support 5.1 sound.
by Alexandre Julliard 09 Jan '15

09 Jan '15

Module: wine Branch: master Commit: 77b2ab21f45bc6773f539f2ae04edbf9cf09ac48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77b2ab21f45bc6773f539f2ae… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Jan 6 19:27:21 2015 +0000 dsound: Support 5.1 sound. --- dlls/dsound/dsound.c | 34 ++++++++++++++++++++++++++++++++++ dlls/dsound/dsound_convert.c | 24 ++++++++++++++++++++++++ dlls/dsound/dsound_private.h | 4 +++- dlls/dsound/mixer.c | 7 +++++++ dlls/dsound/primary.c | 9 ++++++++- dlls/dsound/sound3d.c | 11 +++++++++-- 6 files changed, 85 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index db4852f..8df778a 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -619,6 +619,40 @@ void DSOUND_ParseSpeakerConfig(DirectSoundDevice *device) device->lfe_channel = -1; break; + case DSSPEAKER_5POINT1_BACK: + device->speaker_angles[0] = M_PI/180.0f * -135.0f; + device->speaker_angles[1] = M_PI/180.0f * -45.0f; + device->speaker_angles[2] = M_PI/180.0f * 0.0f; + device->speaker_angles[3] = M_PI/180.0f * 45.0f; + device->speaker_angles[4] = M_PI/180.0f * 135.0f; + device->speaker_angles[5] = 9999.0f; + device->speaker_num[0] = 4; /* Rear left */ + device->speaker_num[1] = 0; /* Front left */ + device->speaker_num[2] = 2; /* Front centre */ + device->speaker_num[3] = 1; /* Front right */ + device->speaker_num[4] = 5; /* Rear right */ + device->speaker_num[5] = 3; /* LFE */ + device->num_speakers = 6; + device->lfe_channel = 3; + break; + + case DSSPEAKER_5POINT1_SURROUND: + device->speaker_angles[0] = M_PI/180.0f * -90.0f; + device->speaker_angles[1] = M_PI/180.0f * -30.0f; + device->speaker_angles[2] = M_PI/180.0f * 0.0f; + device->speaker_angles[3] = M_PI/180.0f * 30.0f; + device->speaker_angles[4] = M_PI/180.0f * 90.0f; + device->speaker_angles[5] = 9999.0f; + device->speaker_num[0] = 4; /* Rear left */ + device->speaker_num[1] = 0; /* Front left */ + device->speaker_num[2] = 2; /* Front centre */ + device->speaker_num[3] = 1; /* Front right */ + device->speaker_num[4] = 5; /* Rear right */ + device->speaker_num[5] = 3; /* LFE */ + device->num_speakers = 6; + device->lfe_channel = 3; + break; + default: WARN("unknown speaker_config %u\n", device->speaker_config); } diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index a7f7ad4..5ac7a10 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -184,6 +184,30 @@ void put_stereo2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel } } +void put_mono2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) +{ + dsb->put_aux(dsb, pos, 0, value); + dsb->put_aux(dsb, pos, 1, value); + dsb->put_aux(dsb, pos, 2, value); + dsb->put_aux(dsb, pos, 3, value); + dsb->put_aux(dsb, pos, 4, value); + dsb->put_aux(dsb, pos, 5, value); +} + +void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) +{ + if (channel == 0) { /* Left */ + dsb->put_aux(dsb, pos, 0, value); /* Front left */ + dsb->put_aux(dsb, pos, 4, value); /* Back left */ + + dsb->put_aux(dsb, pos, 2, 0.0f); /* Mute front centre */ + dsb->put_aux(dsb, pos, 3, 0.0f); /* Mute LFE */ + } else if (channel == 1) { /* Right */ + dsb->put_aux(dsb, pos, 1, value); /* Front right */ + dsb->put_aux(dsb, pos, 5, value); /* Back right */ + } +} + void mixieee32(float *src, float *dst, unsigned samples) { TRACE("%p - %p %d\n", src, dst, samples); diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 0ade63e..af2034a 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -30,7 +30,7 @@ #include "wine/list.h" -#define DS_MAX_CHANNELS 4 +#define DS_MAX_CHANNELS 6 extern int ds_hel_buflen DECLSPEC_HIDDEN; extern int ds_snd_queue_max DECLSPEC_HIDDEN; @@ -181,6 +181,8 @@ float get_mono(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) DECL void put_mono2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_mono2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_stereo2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; +void put_mono2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; +void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; HRESULT IDirectSoundBufferImpl_Create( DirectSoundDevice *device, diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 363ca47..b367086 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -156,6 +156,8 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) dsb->put = put_mono2stereo; else if (ochannels == 4) dsb->put = put_mono2quad; + else if (ochannels == 6) + dsb->put = put_mono2surround51; } else if (ochannels == 1) { @@ -167,6 +169,11 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) dsb->mix_channels = 2; dsb->put = put_stereo2quad; } + else if (ichannels == 2 && ochannels == 6) + { + dsb->mix_channels = 2; + dsb->put = put_stereo2surround51; + } else { if (ichannels > 2) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index bed588d..d3c2689 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -70,6 +70,9 @@ static DWORD speaker_config_to_channel_mask(DWORD speaker_config) case DSSPEAKER_QUAD: return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT; + + case DSSPEAKER_5POINT1_BACK: + return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT; } WARN("unknown speaker_config %u\n", speaker_config); @@ -195,7 +198,11 @@ static DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice) PropVariantClear(&pv); IPropertyStore_Release(store); - if ((phys_speakers & KSAUDIO_SPEAKER_QUAD) == KSAUDIO_SPEAKER_QUAD) + if ((phys_speakers & KSAUDIO_SPEAKER_5POINT1) == KSAUDIO_SPEAKER_5POINT1) + return DSSPEAKER_5POINT1_BACK; + else if ((phys_speakers & KSAUDIO_SPEAKER_5POINT1_SURROUND) == KSAUDIO_SPEAKER_5POINT1_SURROUND) + return DSSPEAKER_5POINT1_SURROUND; + else if ((phys_speakers & KSAUDIO_SPEAKER_QUAD) == KSAUDIO_SPEAKER_QUAD) return DSSPEAKER_QUAD; else if ((phys_speakers & KSAUDIO_SPEAKER_STEREO) == KSAUDIO_SPEAKER_STEREO) return DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 329de94..f720478 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -162,7 +162,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) /* panning related stuff */ D3DVALUE flAngle, flAngle2; D3DVECTOR vLeft; - int i; + int i, num_main_speakers; float a, ingain; /* doppler shift related stuff */ @@ -311,8 +311,15 @@ if(0) for (i = 0; i < dsb->device->pwfx->nChannels; i++) dsb->volpan.dwTotalAmpFactor[i] = 0; + num_main_speakers = dsb->device->pwfx->nChannels; + + if (dsb->device->lfe_channel != -1) { + dsb->volpan.dwTotalAmpFactor[dsb->device->lfe_channel] = ingain; + num_main_speakers--; + } + /* adapted from OpenAL's Alc/panning.c */ - for (i = 0; i < dsb->device->pwfx->nChannels - 1; i++) + for (i = 0; i < num_main_speakers - 1; i++) { if(flAngle >= dsb->device->speaker_angles[i] && flAngle < dsb->device->speaker_angles[i+1]) {

1 0

Mark Harmstone : dsound: Support quadraphonic sound.
by Alexandre Julliard 09 Jan '15

09 Jan '15

Module: wine Branch: master Commit: 3ba100d81c8c2de783f0e4b57d7e190ca8ec47ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba100d81c8c2de783f0e4b57… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Jan 6 19:27:10 2015 +0000 dsound: Support quadraphonic sound. --- dlls/dsound/dsound.c | 13 +++++++++++++ dlls/dsound/dsound_convert.c | 19 +++++++++++++++++++ dlls/dsound/dsound_private.h | 4 +++- dlls/dsound/mixer.c | 11 ++++++++++- dlls/dsound/primary.c | 7 ++++++- 5 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index c5c6e8a..db4852f 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -606,6 +606,19 @@ void DSOUND_ParseSpeakerConfig(DirectSoundDevice *device) device->lfe_channel = -1; break; + case DSSPEAKER_QUAD: + device->speaker_angles[0] = M_PI/180.0f * -135.0f; + device->speaker_angles[1] = M_PI/180.0f * -45.0f; + device->speaker_angles[2] = M_PI/180.0f * 45.0f; + device->speaker_angles[3] = M_PI/180.0f * 135.0f; + device->speaker_num[0] = 2; /* Rear left */ + device->speaker_num[1] = 0; /* Front left */ + device->speaker_num[2] = 1; /* Front right */ + device->speaker_num[3] = 3; /* Rear right */ + device->num_speakers = 4; + device->lfe_channel = -1; + break; + default: WARN("unknown speaker_config %u\n", device->speaker_config); } diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index d3d686a..a7f7ad4 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -165,6 +165,25 @@ void put_mono2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel dsb->put_aux(dsb, pos, 1, value); } +void put_mono2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) +{ + dsb->put_aux(dsb, pos, 0, value); + dsb->put_aux(dsb, pos, 1, value); + dsb->put_aux(dsb, pos, 2, value); + dsb->put_aux(dsb, pos, 3, value); +} + +void put_stereo2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) +{ + if (channel == 0) { /* Left */ + dsb->put_aux(dsb, pos, 0, value); /* Front left */ + dsb->put_aux(dsb, pos, 2, value); /* Back left */ + } else if (channel == 1) { /* Right */ + dsb->put_aux(dsb, pos, 1, value); /* Front right */ + dsb->put_aux(dsb, pos, 3, value); /* Back right */ + } +} + void mixieee32(float *src, float *dst, unsigned samples) { TRACE("%p - %p %d\n", src, dst, samples); diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 5320d30..0ade63e 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -30,7 +30,7 @@ #include "wine/list.h" -#define DS_MAX_CHANNELS 2 +#define DS_MAX_CHANNELS 4 extern int ds_hel_buflen DECLSPEC_HIDDEN; extern int ds_snd_queue_max DECLSPEC_HIDDEN; @@ -179,6 +179,8 @@ struct IDirectSoundBufferImpl float get_mono(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) DECLSPEC_HIDDEN; void put_mono2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; +void put_mono2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; +void put_stereo2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; HRESULT IDirectSoundBufferImpl_Create( DirectSoundDevice *device, diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index f6c2661..363ca47 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -151,13 +151,22 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) else if (ichannels == 1) { dsb->mix_channels = 1; - dsb->put = put_mono2stereo; + + if (ochannels == 2) + dsb->put = put_mono2stereo; + else if (ochannels == 4) + dsb->put = put_mono2quad; } else if (ochannels == 1) { dsb->mix_channels = 1; dsb->get = get_mono; } + else if (ichannels == 2 && ochannels == 4) + { + dsb->mix_channels = 2; + dsb->put = put_stereo2quad; + } else { if (ichannels > 2) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 86ebba8..bed588d 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -67,6 +67,9 @@ static DWORD speaker_config_to_channel_mask(DWORD speaker_config) case DSSPEAKER_STEREO: case DSSPEAKER_HEADPHONE: return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; + + case DSSPEAKER_QUAD: + return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT; } WARN("unknown speaker_config %u\n", speaker_config); @@ -192,7 +195,9 @@ static DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice) PropVariantClear(&pv); IPropertyStore_Release(store); - if ((phys_speakers & KSAUDIO_SPEAKER_STEREO) == KSAUDIO_SPEAKER_STEREO) + if ((phys_speakers & KSAUDIO_SPEAKER_QUAD) == KSAUDIO_SPEAKER_QUAD) + return DSSPEAKER_QUAD; + else if ((phys_speakers & KSAUDIO_SPEAKER_STEREO) == KSAUDIO_SPEAKER_STEREO) return DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); else if ((phys_speakers & KSAUDIO_SPEAKER_MONO) == KSAUDIO_SPEAKER_MONO) return DSSPEAKER_MONO;

1 0

Yifu Wang : msvcp120: Implemented xtime functions.
by Alexandre Julliard 09 Jan '15

09 Jan '15

Module: wine Branch: master Commit: b81e79ed08b1bde157e94f09960dc0c455d5f035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81e79ed08b1bde157e94f099… Author: Yifu Wang <ywang(a)esri.com> Date: Tue Dec 16 16:33:21 2014 -0800 msvcp120: Implemented xtime functions. --- configure | 1 + configure.ac | 1 + dlls/msvcp120/msvcp120.spec | 8 +-- dlls/msvcp120/tests/Makefile.in | 5 ++ dlls/msvcp120/tests/msvcp120.c | 139 ++++++++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 8 +-- dlls/msvcp90/misc.c | 54 ++++++++++++++ 7 files changed, 208 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 062287e..d560f43 100755 --- a/configure +++ b/configure @@ -17246,6 +17246,7 @@ wine_fn_config_dll msvcp100 enable_msvcp100 wine_fn_config_test dlls/msvcp100/tests msvcp100_test wine_fn_config_dll msvcp110 enable_msvcp110 wine_fn_config_dll msvcp120 enable_msvcp120 +wine_fn_config_test dlls/msvcp120/tests msvcp120_test wine_fn_config_dll msvcp120_app enable_msvcp120_app wine_fn_config_dll msvcp60 enable_msvcp60 wine_fn_config_test dlls/msvcp60/tests msvcp60_test diff --git a/configure.ac b/configure.ac index 50efb9f..8263c66 100644 --- a/configure.ac +++ b/configure.ac @@ -3070,6 +3070,7 @@ WINE_CONFIG_DLL(msvcp100) WINE_CONFIG_TEST(dlls/msvcp100/tests) WINE_CONFIG_DLL(msvcp110) WINE_CONFIG_DLL(msvcp120) +WINE_CONFIG_TEST(dlls/msvcp120/tests) WINE_CONFIG_DLL(msvcp120_app) WINE_CONFIG_DLL(msvcp60) WINE_CONFIG_TEST(dlls/msvcp60/tests) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 422f0b6..653b742 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3838,9 +3838,9 @@ @ stub _Xp_setw @ stub _Xp_sqrtx @ stub _Xp_subx -@ stub _Xtime_diff_to_millis -@ stub _Xtime_diff_to_millis2 -@ cdecl _Xtime_get_ticks() +@ cdecl _Xtime_diff_to_millis(ptr) +@ cdecl _Xtime_diff_to_millis2(ptr ptr) +@ cdecl -ret64 _Xtime_get_ticks() # extern _Zero @ stub __Wcrtomb_lk -@ stub xtime_get +@ cdecl xtime_get(ptr long) diff --git a/dlls/msvcp120/tests/Makefile.in b/dlls/msvcp120/tests/Makefile.in new file mode 100644 index 0000000..fc08699 --- /dev/null +++ b/dlls/msvcp120/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = msvcp120.dll +APPMODE = -mno-cygwin + +C_SRCS = \ + msvcp120.c diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c new file mode 100644 index 0000000..1b1dbf0 --- /dev/null +++ b/dlls/msvcp120/tests/msvcp120.c @@ -0,0 +1,139 @@ +/* + * Copyright 2014 Yifu Wang for ESRI + * + * 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 + */ + +#include "wine/test.h" +#include "winbase.h" + +typedef int MSVCRT_long; + +/* xtime */ +typedef struct { + __time64_t sec; + MSVCRT_long nsec; +} xtime; + +static MSVCRT_long (__cdecl *p__Xtime_diff_to_millis2)(const xtime*, const xtime*); +static int (__cdecl *p_xtime_get)(xtime*, int); + +static HMODULE msvcp; + +static BOOL init(void) +{ + msvcp = LoadLibraryA("msvcp120.dll"); + if(!msvcp) + { + win_skip("msvcp120.dll not installed\n"); + return FALSE; + } + + p__Xtime_diff_to_millis2 = (void*)GetProcAddress(msvcp, "_Xtime_diff_to_millis2"); + p_xtime_get = (void*)GetProcAddress(msvcp, "xtime_get"); + + return TRUE; +} + +static void test__Xtime_diff_to_millis2(void) +{ + struct { + __time64_t sec_before; + MSVCRT_long nsec_before; + __time64_t sec_after; + MSVCRT_long nsec_after; + MSVCRT_long expect; + } tests[] = { + {1, 0, 2, 0, 1000}, + {0, 1000000000, 0, 2000000000, 1000}, + {1, 100000000, 2, 100000000, 1000}, + {1, 100000000, 1, 200000000, 100}, + {0, 0, 0, 1000000000, 1000}, + {0, 0, 0, 1200000000, 1200}, + {0, 0, 0, 1230000000, 1230}, + {0, 0, 0, 1234000000, 1234}, + {0, 0, 0, 1234100000, 1235}, + {0, 0, 0, 1234900000, 1235}, + {0, 0, 0, 1234010000, 1235}, + {0, 0, 0, 1234090000, 1235}, + {0, 0, 0, 1234000001, 1235}, + {0, 0, 0, 1234000009, 1235}, + {0, 0, -1, 0, 0}, + {0, 0, 0, -10000000, 0}, + {0, 0, -1, -100000000, 0}, + {-1, 0, 0, 0, 1000}, + {0, -100000000, 0, 0, 100}, + {-1, -100000000, 0, 0, 1100}, + {0, 0, -1, 2000000000, 1000}, + {0, 0, -2, 2000000000, 0}, + {0, 0, -2, 2100000000, 100} + }; + int i; + MSVCRT_long ret; + xtime t1, t2; + + for(i = 0; i < sizeof(tests) / sizeof(tests[0]); ++ i) + { + t1.sec = tests[i].sec_before; + t1.nsec = tests[i].nsec_before; + t2.sec = tests[i].sec_after; + t2.nsec = tests[i].nsec_after; + ret = p__Xtime_diff_to_millis2(&t2, &t1); + ok(ret == tests[i].expect, + "_Xtime_diff_to_millis2(): test: %d expect: %d, got: %d\n", + i, tests[i].expect, ret); + } +} + +static void test_xtime_get(void) +{ + static const MSVCRT_long tests[] = {1, 50, 100, 200, 500}; + MSVCRT_long diff; + xtime before, after; + int i; + + for(i = 0; i < sizeof(tests) / sizeof(tests[0]); i ++) + { + p_xtime_get(&before, 1); + Sleep(tests[i]); + p_xtime_get(&after, 1); + + diff = p__Xtime_diff_to_millis2(&after, &before); + + ok(diff >= tests[i], + "xtime_get() not functioning correctly, test: %d, expect: ge %d, got: %d\n", + i, tests[i], diff); + } + + /* Test parameter and return value */ + before.sec = 0xdeadbeef, before.nsec = 0xdeadbeef; + i = p_xtime_get(&before, 0); + ok(i == 0, "expect xtime_get() to return 0, got: %d\n", i); + ok(before.sec == 0xdeadbeef && before.nsec == 0xdeadbeef, + "xtime_get() shouldn't have modified the xtime struct with the given option\n"); + + before.sec = 0xdeadbeef, before.nsec = 0xdeadbeef; + i = p_xtime_get(&before, 1); + ok(i == 1, "expect xtime_get() to return 1, got: %d\n", i); + ok(before.sec != 0xdeadbeef && before.nsec != 0xdeadbeef, + "xtime_get() should have modified the xtime struct with the given option\n"); +} + +START_TEST(msvcp120) +{ + if(!init()) return; + test__Xtime_diff_to_millis2(); + test_xtime_get(); +} diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 6bc0374..390d470 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3838,9 +3838,9 @@ @ stub _Xp_setw @ stub _Xp_sqrtx @ stub _Xp_subx -@ stub _Xtime_diff_to_millis -@ stub _Xtime_diff_to_millis2 -@ cdecl _Xtime_get_ticks() msvcp120._Xtime_get_ticks +@ cdecl _Xtime_diff_to_millis(ptr) msvcp120._Xtime_diff_to_millis +@ cdecl _Xtime_diff_to_millis2(ptr ptr) msvcp120._Xtime_diff_to_millis2 +@ cdecl -ret64 _Xtime_get_ticks() msvcp120._Xtime_get_ticks # extern _Zero @ stub __Wcrtomb_lk -@ stub xtime_get +@ cdecl xtime_get(ptr long) msvcp120.xtime_get diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 61e43c3..a030b01 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -33,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY) #define TICKSPERSEC 10000000 #define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC) +#define NANOSEC_PER_MILLISEC 1000000 +#define MILLISEC_PER_SEC 1000 struct __Container_proxy; @@ -350,6 +352,15 @@ void __thiscall _Container_base12__Swap_all( that->proxy->cont = that; } +#if _MSVCP_VER >= 110 +typedef int MSVCRT_long; + +/* xtime */ +typedef struct { + __time64_t sec; + MSVCRT_long nsec; +} xtime; + /* _Xtime_get_ticks */ LONGLONG __cdecl _Xtime_get_ticks(void) { @@ -361,6 +372,49 @@ LONGLONG __cdecl _Xtime_get_ticks(void) return ((LONGLONG)ft.dwHighDateTime<<32) + ft.dwLowDateTime - TICKS_1601_TO_1970; } +/* _xtime_get */ +int __cdecl xtime_get(xtime* t, int unknown) +{ + LONGLONG ticks; + + TRACE("(%p)\n", t); + + if(unknown != 1) + return 0; + + ticks = _Xtime_get_ticks(); + t->sec = ticks / TICKSPERSEC; + t->nsec = ticks % TICKSPERSEC * 100; + return 1; +} + +/* _Xtime_diff_to_millis2 */ +MSVCRT_long __cdecl _Xtime_diff_to_millis2(xtime *t1, xtime *t2) +{ + __time64_t diff_sec; + MSVCRT_long diff_nsec, ret; + + TRACE("(%p, %p)\n", t1, t2); + + diff_sec = t1->sec - t2->sec; + diff_nsec = t1->nsec - t2->nsec; + ret = diff_sec * MILLISEC_PER_SEC + + (diff_nsec + NANOSEC_PER_MILLISEC - 1) / NANOSEC_PER_MILLISEC; + return ret > 0 ? ret : 0; +} + +/* _Xtime_diff_to_millis */ +MSVCRT_long __cdecl _Xtime_diff_to_millis(xtime *t) +{ + xtime now; + + TRACE("%p\n", t); + + xtime_get(&now, 1); + return _Xtime_diff_to_millis2(t, &now); +} +#endif + #if _MSVCP_VER >= 90 unsigned int __cdecl _Random_device(void) {

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2015