January 2015 - Wine-commits

Matteo Bruni : winemac: Implement wglCreateContextAttribsARB.
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: d5846519603b2177ea9ee8582860928059714fa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5846519603b2177ea9ee8582… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 8 15:07:48 2015 +0100 winemac: Implement wglCreateContextAttribsARB. It also allows to create core profile contexts. --- dlls/winemac.drv/opengl.c | 544 +++++++++++++++++++++++++++++++--------------- 1 file changed, 366 insertions(+), 178 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d5846519603b2177ea9ee…

1 0

Piotr Caban : msvcp: Fix setting decimal point and thousands separator in numpunct_wchar__Init.
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: e899bd82491a3eb5b73f716b89c4a3c702cb060f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e899bd82491a3eb5b73f716b8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 8 18:19:41 2015 +0100 msvcp: Fix setting decimal point and thousands separator in numpunct_wchar__Init. --- dlls/msvcp60/locale.c | 20 ++++++++++---------- dlls/msvcp90/locale.c | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 53de64c..027c529 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -1997,6 +1997,14 @@ int __cdecl _Mbrtowc(wchar_t *out, const char *in, MSVCP_size_t len, int *state, return 1; } +static inline wchar_t mb_to_wc(char ch, const _Cvtvec *cvt) +{ + int state = 0; + wchar_t ret; + + return _Mbrtowc(&ret, &ch, 1, &state, cvt) == 1 ? ret : 0; +} + /* ?_Dowiden@?$ctype(a)_W@std@@IBE_WD(a)Z */ /* ?_Dowiden@?$ctype(a)_W@std@@IEBA_WD(a)Z */ /* ?_Dowiden@?$ctype(a)G@std@@IBEGD(a)Z */ @@ -3454,8 +3462,8 @@ static void numpunct_wchar__Init(numpunct_wchar *this, if(this->grouping) memcpy((char*)this->grouping, lc->grouping, len); - this->dp = lc->decimal_point[0]; - this->sep = lc->thousands_sep[0]; + this->dp = mb_to_wc(lc->decimal_point[0], &cvt); + this->sep = mb_to_wc(lc->thousands_sep[0], &cvt); } if(!this->false_name || !this->true_name || !this->grouping) { @@ -4083,14 +4091,6 @@ num_get* num_get_short_use_facet(const locale *loc) return obj; } -static inline wchar_t mb_to_wc(char ch, const _Cvtvec *cvt) -{ - int state = 0; - wchar_t ret; - - return _Mbrtowc(&ret, &ch, 1, &state, cvt) == 1 ? ret : 0; -} - static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator_wchar *first, istreambuf_iterator_wchar *last, const locale *loc, numpunct_wchar *numpunct) { diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 097dad8..9dedcc6 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -2394,6 +2394,14 @@ int __cdecl _Mbrtowc(wchar_t *out, const char *in, MSVCP_size_t len, int *state, return 1; } +static inline wchar_t mb_to_wc(char ch, const _Cvtvec *cvt) +{ + int state = 0; + wchar_t ret; + + return _Mbrtowc(&ret, &ch, 1, &state, cvt) == 1 ? ret : 0; +} + /* ?_Dowiden@?$ctype(a)_W@std@@IBE_WD(a)Z */ /* ?_Dowiden@?$ctype(a)_W@std@@IEBA_WD(a)Z */ /* ?_Dowiden@?$ctype(a)G@std@@IBEGD(a)Z */ @@ -4167,8 +4175,8 @@ void __thiscall numpunct_wchar__Init(numpunct_wchar *this, if(this->grouping) memcpy((char*)this->grouping, lc->grouping, len); - this->dp = lc->decimal_point[0]; - this->sep = lc->thousands_sep[0]; + this->dp = mb_to_wc(lc->decimal_point[0], &cvt); + this->sep = mb_to_wc(lc->thousands_sep[0], &cvt); } if(!this->false_name || !this->true_name || !this->grouping) { @@ -4896,14 +4904,6 @@ num_get* num_get_short_use_facet(const locale *loc) return obj; } -static inline wchar_t mb_to_wc(char ch, const _Cvtvec *cvt) -{ - int state = 0; - wchar_t ret; - - return _Mbrtowc(&ret, &ch, 1, &state, cvt) == 1 ? ret : 0; -} - static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator_wchar *first, istreambuf_iterator_wchar *last, const locale *loc, numpunct_wchar *numpunct) {

1 0

Michael Stefaniuc : oledb32/tests: Simplify some ok() checks (PVS-Studio).
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: 6d3c83b86936368e82ad5d2607125275f7f1d675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d3c83b86936368e82ad5d260… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 8 11:07:55 2015 +0100 oledb32/tests: Simplify some ok() checks (PVS-Studio). --- dlls/oledb32/tests/convert.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 3e78f24..b039e11 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -303,27 +303,21 @@ static void test_canconvert(void) /* src DBTYPE_VECTOR */ hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type | DBTYPE_VECTOR, simple_convert[dst_idx].type); - expect = FALSE; - ok((hr == S_OK && expect == TRUE) || - (hr == S_FALSE && expect == FALSE), - "%04x -> %04x: got %08x expect conversion to be %spossible\n", simple_convert[src_idx].type | DBTYPE_VECTOR, - simple_convert[dst_idx].type, hr, expect ? "" : "not "); + ok(hr == S_FALSE, + "%04x -> %04x: got %08x expect conversion to not be possible\n", simple_convert[src_idx].type | DBTYPE_VECTOR, + simple_convert[dst_idx].type, hr); /* dst DBTYPE_VECTOR */ hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type, simple_convert[dst_idx].type | DBTYPE_VECTOR); - expect = FALSE; - ok((hr == S_OK && expect == TRUE) || - (hr == S_FALSE && expect == FALSE), - "%04x -> %04x: got %08x expect conversion to be %spossible\n", simple_convert[src_idx].type, - simple_convert[dst_idx].type | DBTYPE_VECTOR, hr, expect ? "" : "not "); + ok(hr == S_FALSE, + "%04x -> %04x: got %08x expect conversion to not be possible\n", simple_convert[src_idx].type, + simple_convert[dst_idx].type | DBTYPE_VECTOR, hr); /* src & dst DBTYPE_VECTOR */ hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type | DBTYPE_VECTOR, simple_convert[dst_idx].type | DBTYPE_VECTOR); - expect = FALSE; - ok((hr == S_OK && expect == TRUE) || - (hr == S_FALSE && expect == FALSE), - "%04x -> %04x: got %08x expect conversion to be %spossible\n", simple_convert[src_idx].type | DBTYPE_VECTOR, - simple_convert[dst_idx].type | DBTYPE_VECTOR, hr, expect ? "" : "not "); + ok(hr == S_FALSE, + "%04x -> %04x: got %08x expect conversion to not be possible\n", simple_convert[src_idx].type | DBTYPE_VECTOR, + simple_convert[dst_idx].type | DBTYPE_VECTOR, hr); }

1 0

Michael Stefaniuc : quartz: Remove always true if subexpression ( PVS-Studio).
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: b31ef9c80abf5dc21aa937835ff2aa6e58fbfdbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b31ef9c80abf5dc21aa937835… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 8 11:09:42 2015 +0100 quartz: Remove always true if subexpression (PVS-Studio). --- dlls/quartz/avisplit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 1f57045..ee03e08 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1199,7 +1199,7 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, indexes = 0; } } - else if (!indexes && pAviSplit->oldindex) + else if (pAviSplit->oldindex) indexes = pAviSplit->Parser.cStreams; if (!indexes && pAviSplit->AviHeader.dwFlags & AVIF_MUSTUSEINDEX)

1 0

Michael Stefaniuc : quartz: Remove an unused variable (PVS-Studio).
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: 585f8dfe7e9ca444413b65a19bc855214c1d61cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=585f8dfe7e9ca444413b65a19… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 8 11:10:11 2015 +0100 quartz: Remove an unused variable (PVS-Studio). --- dlls/quartz/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 81f9ab8..b45c55b 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -274,11 +274,10 @@ HRESULT __RPC_STUB ICaptureGraphBuilder2_FindInterface_Stub( ICaptureGraphBuilde const char * qzdebugstr_guid( const GUID * id ) { int i; - char * name = NULL; - for (i=0;InterfaceDesc[i].name && !name;i++) { + for (i=0; InterfaceDesc[i].name; i++) if (IsEqualGUID(&InterfaceDesc[i].riid, id)) return InterfaceDesc[i].name; - } + return debugstr_guid(id); }

1 0

Michael Stefaniuc : quartz: Simplify code flow logic (PVS-Studio).
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: 8a42eb55da659ebb7943db699e28c23acec5df36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a42eb55da659ebb7943db699… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 8 11:10:52 2015 +0100 quartz: Simplify code flow logic (PVS-Studio). --- dlls/quartz/vmr9.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 53e4942..e950a48 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -476,14 +476,12 @@ static HRESULT WINAPI VMR9_ShouldDrawSampleNow(BaseRenderer *This, IMediaSample static HRESULT WINAPI VMR9_CompleteConnect(BaseRenderer *This, IPin *pReceivePin) { struct quartz_vmr *pVMR9 = (struct quartz_vmr*)This; - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p)\n", This); - if (!pVMR9->mode && SUCCEEDED(hr)) - hr = IVMRFilterConfig9_SetRenderingMode(&pVMR9->IVMRFilterConfig9_iface, VMR9Mode_Windowed); - - if (SUCCEEDED(hr)) + if (pVMR9->mode || + SUCCEEDED(hr = IVMRFilterConfig9_SetRenderingMode(&pVMR9->IVMRFilterConfig9_iface, VMR9Mode_Windowed))) hr = VMR9_maybe_init(pVMR9, FALSE); return hr;

1 0

Nikolay Sivov : dwrite: Store cluster map and glyph indices for each run.
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: b49a71416d072e8697b1340ce59a8cd0a8237655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49a71416d072e8697b1340ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 8 12:33:17 2015 +0300 dwrite: Store cluster map and glyph indices for each run. --- dlls/dwrite/layout.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index c430b2a..ad38177 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -110,6 +110,8 @@ struct layout_run { DWRITE_GLYPH_RUN_DESCRIPTION descr; DWRITE_GLYPH_RUN run; DWRITE_SCRIPT_ANALYSIS sa; + UINT16 *glyphs; + UINT16 *clustermap; }; struct dwrite_textlayout { @@ -221,6 +223,9 @@ static struct layout_run *alloc_layout_run(void) ret->sa.script = Script_Unknown; ret->sa.shapes = DWRITE_SCRIPT_SHAPES_DEFAULT; + ret->glyphs = NULL; + ret->clustermap = NULL; + return ret; } @@ -231,6 +236,8 @@ static void free_layout_runs(struct dwrite_textlayout *layout) list_remove(&cur->entry); if (cur->run.fontFace) IDWriteFontFace_Release(cur->run.fontFace); + heap_free(cur->glyphs); + heap_free(cur->clustermap); heap_free(cur); } } @@ -338,10 +345,12 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) /* fill run info */ LIST_FOR_EACH_ENTRY(run, &layout->runs, struct layout_run, entry) { + DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props = NULL; + DWRITE_SHAPING_TEXT_PROPERTIES *text_props = NULL; IDWriteFontFamily *family; + UINT32 index, max_count; IDWriteFont *font; BOOL exists = TRUE; - UINT32 index; range = get_layout_range_by_pos(layout, run->descr.textPosition); @@ -370,8 +379,62 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) run->run.fontEmSize = range->fontsize; run->descr.localeName = range->locale; + run->clustermap = heap_alloc(run->descr.stringLength*sizeof(UINT16)); + + max_count = 3*run->descr.stringLength/2 + 16; + run->glyphs = heap_alloc(max_count*sizeof(UINT16)); + if (!run->clustermap || !run->glyphs) + goto memerr; + + text_props = heap_alloc(run->descr.stringLength*sizeof(DWRITE_SHAPING_TEXT_PROPERTIES)); + glyph_props = heap_alloc(max_count*sizeof(DWRITE_SHAPING_GLYPH_PROPERTIES)); + if (!text_props || !glyph_props) + goto memerr; + + while (1) { + hr = IDWriteTextAnalyzer_GetGlyphs(analyzer, run->descr.string, run->descr.stringLength, + run->run.fontFace, FALSE /* FIXME */, run->run.bidiLevel & 1, &run->sa, run->descr.localeName, + NULL /* FIXME */, NULL, NULL, 0, max_count, run->clustermap, text_props, run->glyphs, glyph_props, + &run->run.glyphCount); + if (hr == E_NOT_SUFFICIENT_BUFFER) { + heap_free(run->glyphs); + heap_free(glyph_props); + + max_count = run->run.glyphCount; + + run->glyphs = heap_alloc(max_count*sizeof(UINT16)); + glyph_props = heap_alloc(max_count*sizeof(DWRITE_SHAPING_GLYPH_PROPERTIES)); + if (!run->glyphs || !glyph_props) + goto memerr; + + continue; + } + + break; + } + + heap_free(text_props); + heap_free(glyph_props); + + if (FAILED(hr)) { + WARN("[%u,%u]: shaping failed 0x%08x\n", run->descr.textPosition, run->descr.textPosition+run->descr.stringLength, hr); + continue; + } + + run->run.glyphIndices = run->glyphs; + run->descr.clusterMap = run->clustermap; - /* FIXME: set glyph indices, cluster map, advances */ + /* FIXME: set advances */ + continue; + + memerr: + heap_free(text_props); + heap_free(glyph_props); + heap_free(run->clustermap); + heap_free(run->glyphs); + run->clustermap = run->glyphs = NULL; + hr = E_OUTOFMEMORY; + break; } IDWriteTextAnalyzer_Release(analyzer);

1 0

Hans Leidekker : xcopy: Ignore the /V option.
by Alexandre Julliard 07 Jan '15

07 Jan '15

Module: wine Branch: master Commit: 90fd0285f04fcc5d2d44c016d2d51370f518eca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90fd0285f04fcc5d2d44c016d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 7 15:28:14 2015 +0100 xcopy: Ignore the /V option. --- programs/xcopy/xcopy.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 2134a5e..486e5b1 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -826,6 +826,9 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, case '?': XCOPY_wprintf(XCOPY_LoadMessage(STRING_HELP)); rc = RC_HELP; goto out; + case 'V': + WINE_FIXME("ignoring /V\n"); + break; default: WINE_TRACE("Unhandled parameter '%s'\n", wine_dbgstr_w(word)); XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARM), word);

1 0

Hugh McMaster : msvcrt/tests: Add more tests for _vsnwprintf.
by Alexandre Julliard 07 Jan '15

07 Jan '15

Module: wine Branch: master Commit: d999fd0d11ecf73ca38fdc35029f216d3852e924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d999fd0d11ecf73ca38fdc350… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jan 6 23:07:16 2015 +1100 msvcrt/tests: Add more tests for _vsnwprintf. --- dlls/msvcrt/tests/printf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 829b2e0..0606c25 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -1127,6 +1127,12 @@ static void test_vsnwprintf(void) ok( ret == 11, "got %d expected 11\n", ret ); WideCharToMultiByte( CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL ); ok( !strcmp(buf, "onetwothree"), "got %s expected 'onetwothree'\n", buf ); + + ret = _vsnwprintf_wrapper( str, 0, format, one, two, three ); + ok( ret == -1, "got %d, expected -1\n", ret ); + + ret = _vsnwprintf_wrapper( NULL, 0, format, one, two, three ); + ok( ret == 11 || broken(ret == -1 /* Win2k */), "got %d, expected 11\n", ret ); } static int __cdecl vswprintf_wrapper(wchar_t *str, const wchar_t *format, ...)

1 0

Mark Harmstone : dsound: Parse speaker config.
by Alexandre Julliard 07 Jan '15

07 Jan '15

Module: wine Branch: master Commit: c4e3079766aed0b68f356ac571d449cc08d1321e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4e3079766aed0b68f356ac57… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Jan 6 19:26:47 2015 +0000 dsound: Parse speaker config. --- dlls/dsound/dsound.c | 28 ++++++++++++++++++++++++++++ dlls/dsound/dsound_private.h | 5 +++++ dlls/dsound/primary.c | 27 ++++++++++++++++++++------- 3 files changed, 53 insertions(+), 7 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 66c9d91..c5c6e8a 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -23,6 +23,7 @@ #include <assert.h> #include <stdarg.h> #include <stdio.h> +#include <math.h> #define COBJMACROS #define NONAMELESSSTRUCT @@ -585,6 +586,31 @@ HRESULT WINAPI DirectSoundCreate8( return hr; } +void DSOUND_ParseSpeakerConfig(DirectSoundDevice *device) +{ + switch (DSSPEAKER_CONFIG(device->speaker_config)) { + case DSSPEAKER_MONO: + device->speaker_angles[0] = M_PI/180.0f * 0.0f; + device->speaker_num[0] = 0; + device->num_speakers = 1; + device->lfe_channel = -1; + break; + + case DSSPEAKER_STEREO: + case DSSPEAKER_HEADPHONE: + device->speaker_angles[0] = M_PI/180.0f * -90.0f; + device->speaker_angles[1] = M_PI/180.0f * 90.0f; + device->speaker_num[0] = 0; /* Left */ + device->speaker_num[1] = 1; /* Right */ + device->num_speakers = 2; + device->lfe_channel = -1; + break; + + default: + WARN("unknown speaker_config %u\n", device->speaker_config); + } +} + /******************************************************************************* * DirectSoundDevice */ @@ -605,6 +631,8 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) device->state = STATE_STOPPED; device->speaker_config = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); + DSOUND_ParseSpeakerConfig(device); + /* 3D listener initial parameters */ device->ds3dl.dwSize = sizeof(DS3DLISTENER); device->ds3dl.vPosition.x = 0.0; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 66af81a..5320d30 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -78,6 +78,10 @@ struct DirectSoundDevice CRITICAL_SECTION mixlock; IDirectSoundBufferImpl *primary; DWORD speaker_config; + float speaker_angles[DS_MAX_CHANNELS]; + int speaker_num[DS_MAX_CHANNELS]; + int num_speakers; + int lfe_channel; float *mix_buffer, *tmp_buffer; DWORD tmp_buffer_len, mix_buffer_len; @@ -199,6 +203,7 @@ HRESULT IKsPrivatePropertySetImpl_Create(REFIID riid, void **ppv) DECLSPEC_HIDDE HRESULT DSOUND_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; HRESULT DSOUND_Create8(REFIID riid, void **ppv) DECLSPEC_HIDDEN; HRESULT IDirectSoundImpl_Create(IUnknown *outer_unk, REFIID riid, void **ppv, BOOL has_ds8) DECLSPEC_HIDDEN; +void DSOUND_ParseSpeakerConfig(DirectSoundDevice *device) DECLSPEC_HIDDEN; /* primary.c */ diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index ea4559c..86ebba8 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -58,6 +58,21 @@ static DWORD DSOUND_fraglen(DirectSoundDevice *device) return ret; } +static DWORD speaker_config_to_channel_mask(DWORD speaker_config) +{ + switch (DSSPEAKER_CONFIG(speaker_config)) { + case DSSPEAKER_MONO: + return SPEAKER_FRONT_LEFT; + + case DSSPEAKER_STEREO: + case DSSPEAKER_HEADPHONE: + return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; + } + + WARN("unknown speaker_config %u\n", speaker_config); + return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; +} + static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client, BOOL forcewave, WAVEFORMATEX **wfx) { @@ -72,15 +87,11 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client if (FAILED(hr)) return hr; - if (mixwfe->Format.nChannels > 2) { - static int once; - if (!once++) - FIXME("Limiting channels to 2 due to lack of multichannel support\n"); - - mixwfe->Format.nChannels = 2; + 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; - mixwfe->dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; + mixwfe->dwChannelMask = speaker_config_to_channel_mask(device->speaker_config); } if (!IsEqualGUID(&mixwfe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)) { @@ -226,6 +237,8 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) device->speaker_config = DSOUND_FindSpeakerConfig(device->mmdevice); + DSOUND_ParseSpeakerConfig(device); + hres = DSOUND_WaveFormat(device, device->client, forcewave, &wfx); if (FAILED(hres)) { IAudioClient_Release(device->client);

1 0