wine-commits May 2016

wine-commits@winehq.org

4 participants
542 discussions

Henri Verbeet : kernel32/nls: Return CAL_GREGORIAN_XLIT_FRENCH for LOCALE_ICALENDARTYPE for LANG_PERSIAN.
by Alexandre Julliard 20 May '16

20 May '16

Module: wine Branch: master Commit: 9a93d21681ad5318280eb693e6f7d804ffd0ae0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a93d21681ad5318280eb693e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 19 18:02:47 2016 +0200 kernel32/nls: Return CAL_GREGORIAN_XLIT_FRENCH for LOCALE_ICALENDARTYPE for LANG_PERSIAN. The (Gregorian) month names are transliterated from French. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/far.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index cd1d0d8..7718d50 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -23,7 +23,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT { LOCALE_FONTSIGNATURE L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" - LOCALE_ICALENDARTYPE "2" + LOCALE_ICALENDARTYPE "12" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "981" LOCALE_ICURRDIGITS "2"

1 0

Henri Verbeet : kernel32/nls: Fix LOCALE_IFIRSTDAYOFWEEK for LANG_PERSIAN.
by Alexandre Julliard 20 May '16

20 May '16

Module: wine Branch: master Commit: 918089eedf1944a625742b033c3c312a5a4d1ffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=918089eedf1944a625742b033… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 19 18:02:46 2016 +0200 kernel32/nls: Fix LOCALE_IFIRSTDAYOFWEEK for LANG_PERSIAN. The first day of the week is شنبه, not یک‌شنبه. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/far.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index 114088b..cd1d0d8 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -39,7 +39,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT LOCALE_IDEFAULTUNIXCODEPAGE "65001" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "0" - LOCALE_IFIRSTDAYOFWEEK "6" + LOCALE_IFIRSTDAYOFWEEK "5" LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "0429"

1 0

Henri Verbeet : kernel32/nls: Use Persian punctuation for LANG_PERSIAN.
by Alexandre Julliard 20 May '16

20 May '16

Module: wine Branch: master Commit: 53643d3b6030c74a88d1c2bd4d1fe7b6cfe48ec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53643d3b6030c74a88d1c2bd4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 19 18:02:45 2016 +0200 kernel32/nls: Use Persian punctuation for LANG_PERSIAN. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/far.nls | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index 631f93b..114088b 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -96,7 +96,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT LOCALE_SDAYNAME5 "جمعه" LOCALE_SDAYNAME6 "شنبه" LOCALE_SDAYNAME7 "یک‌شنبه" - LOCALE_SDECIMAL "." + LOCALE_SDECIMAL "٫" LOCALE_SENGCOUNTRY "Iran" LOCALE_SENGCURRNAME "Iranian Rial" LOCALE_SENGLANGUAGE "Persian" @@ -105,9 +105,9 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT LOCALE_SISO3166CTRYNAME "IR" LOCALE_SISO639LANGNAME "fa" LOCALE_SLANGUAGE "Persian (Iran)" - LOCALE_SLIST ";" + LOCALE_SLIST "؛" LOCALE_SLONGDATE "yyyy/MM/dd" - LOCALE_SMONDECIMALSEP "/" + LOCALE_SMONDECIMALSEP "٫" LOCALE_SMONGROUPING "3;0" LOCALE_SMONTHNAME1 "ژانویه" LOCALE_SMONTHNAME2 "فوریه" @@ -122,7 +122,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT LOCALE_SMONTHNAME11 "نوامبر" LOCALE_SMONTHNAME12 "دسامبر" LOCALE_SMONTHNAME13 "" - LOCALE_SMONTHOUSANDSEP "," + LOCALE_SMONTHOUSANDSEP "٬" LOCALE_SNAME "fa-IR" LOCALE_SNATIVECTRYNAME "ایران" LOCALE_SNATIVECURRNAME "ریال" @@ -143,7 +143,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT LOCALE_SSHORTESTDAYNAME7 "ی" LOCALE_SSHORTTIME "hh:mm tt" LOCALE_SSORTNAME "Default" - LOCALE_STHOUSAND "," + LOCALE_STHOUSAND "٬" LOCALE_STIME ":" LOCALE_STIMEFORMAT "hh:mm:ss tt" LOCALE_SYEARMONTH "yyyy/MM"

1 0

Henri Verbeet : kernel32/nls: Store LOCALE_SNATIVEDIGITS as UTF-8 in far.nls.
by Alexandre Julliard 20 May '16

20 May '16

Module: wine Branch: master Commit: 39fdd439b3f013ca127c332bfd5268b359f47607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39fdd439b3f013ca127c332bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 19 18:02:44 2016 +0200 kernel32/nls: Store LOCALE_SNATIVEDIGITS as UTF-8 in far.nls. CP1256 can't represent these, but it's fine in UTF-8. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/far.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index 652c78f..631f93b 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -126,7 +126,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT LOCALE_SNAME "fa-IR" LOCALE_SNATIVECTRYNAME "ایران" LOCALE_SNATIVECURRNAME "ریال" - LOCALE_SNATIVEDIGITS L"\x06f0\x06f1\x06f2\x06f3\x06f4\x06f5\x06f6\x06f7\x06f8\x06f9" + LOCALE_SNATIVEDIGITS "۰۱۲۳۴۵۶۷۸۹" LOCALE_SNATIVEDISPLAYNAME "فارسی (ایران)" LOCALE_SNATIVELANGNAME "فارسی" LOCALE_SNEGATIVESIGN "-"

1 0

Andrey Gusev : gdi32: Fix a typo in a pointer name in primitive_funcs.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: 9a80284e1a886ff7e01d33f68715c9bfdb773459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a80284e1a886ff7e01d33f68… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu May 19 17:16:12 2016 +0300 gdi32: Fix a typo in a pointer name in primitive_funcs. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dibdrv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 4152f2e..c64058b 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -177,7 +177,7 @@ typedef struct primitive_funcs void (* solid_rects)(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor); void (* solid_line)(const dib_info *dib, const POINT *start, const struct line_params *params, DWORD and, DWORD xor); - void (* pattern_rects)(const dib_info *dib, int num, const RECT *rc, const POINT *orign, + void (* pattern_rects)(const dib_info *dib, int num, const RECT *rc, const POINT *origin, const dib_info *brush, const rop_mask_bits *bits); void (* copy_rect)(const dib_info *dst, const RECT *rc, const dib_info *src, const POINT *origin, int rop2, int overlap);

1 0

Andrew Eikum : winegstreamer: Set offset on GstBuffer.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: 29deae351b4a4460fe8d7a04af88325dac420a0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=29deae351b4a4460fe8d7a04a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 19 09:14:51 2016 -0500 winegstreamer: Set offset on GstBuffer. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 97648bc..d71225d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -712,6 +712,8 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 ERR("Returned %08x\n", hr); return GST_FLOW_ERROR; } + + GST_BUFFER_OFFSET(*buf) = ofs; return GST_FLOW_OK; }

1 0

Andrew Eikum : winegstreamer: Fix IQualityControl::Notify.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: 1517bfb1863667b39117762c448a3f43bc4852bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1517bfb1863667b39117762c4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 19 09:14:48 2016 -0500 winegstreamer: Fix IQualityControl::Notify. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index f0b30e2..97648bc 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1663,15 +1663,28 @@ static ULONG WINAPI GST_QualityControl_Release(IQualityControl *iface) static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { GSTOutPin *pin = impl_from_IQualityControl(iface); - REFERENCE_TIME late = qm.Late; + GstEvent *evt; + TRACE("(%p)->(%p, { 0x%x %u %s %s })\n", pin, sender, qm.Type, qm.Proportion, wine_dbgstr_longlong(qm.Late), wine_dbgstr_longlong(qm.TimeStamp)); + mark_wine_thread(); - if (qm.Late < 0 && -qm.Late > qm.TimeStamp) - late = -qm.TimeStamp; - gst_pad_push_event(pin->my_sink, gst_event_new_qos(late <= 0 ? GST_QOS_TYPE_OVERFLOW : GST_QOS_TYPE_UNDERFLOW, 1000./qm.Proportion, late*100, qm.TimeStamp*100)); + + if (qm.Type == Flood) + qm.Late = 0; + + evt = gst_event_new_qos(qm.Type == Famine ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, + qm.Proportion / 1000., qm.Late * 100, qm.TimeStamp * 100); + + if (!evt) { + WARN("Failed to create QOS event\n"); + return E_INVALIDARG; + } + + gst_pad_push_event(pin->my_sink, evt); + return S_OK; }

1 0

Andrew Eikum : dsound: Support downmixing quadraphonic to stereo.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: 1def346bab59ac447c7f9c34528fb4490b8ed69c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1def346bab59ac447c7f9c345… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 19 09:11:16 2016 -0500 dsound: Support downmixing quadraphonic to stereo. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_convert.c | 27 +++++++++++++++++++++++++++ dlls/dsound/dsound_private.h | 1 + dlls/dsound/mixer.c | 6 ++++++ 3 files changed, 34 insertions(+) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 3b4d2e5..d9ed637 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -252,6 +252,33 @@ void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD c } } +void put_quad2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) +{ + /* based on pulseaudio's downmix algorithm */ + switch(channel){ + + case 2: /* back left */ + value *= 0.1f; /* (1/9) / (sum of left volumes) */ + dsb->put_aux(dsb, pos, 0, value); + break; + + case 0: /* front left */ + value *= 0.9f; /* 1 / (sum of left volumes) */ + dsb->put_aux(dsb, pos, 0, value); + break; + + case 3: /* back right */ + value *= 0.1f; /* (1/9) / (sum of right volumes) */ + dsb->put_aux(dsb, pos, 1, value); + break; + + case 1: /* front right */ + value *= 0.9f; /* 1 / (sum of right volumes) */ + dsb->put_aux(dsb, pos, 1, value); + break; + } +} + 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 49e98ba..63d1226 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -179,6 +179,7 @@ void put_stereo2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel 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; void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; +void put_quad2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *dsbd, IDirectSoundBuffer **buffer) DECLSPEC_HIDDEN; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 4f05ee2..309c338 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -179,6 +179,12 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) dsb->put = put_surround512stereo; dsb->put_aux = putieee32_sum; } + else if (ichannels == 4 && ochannels == 2) + { + dsb->mix_channels = 4; + dsb->put = put_quad2stereo; + dsb->put_aux = putieee32_sum; + } else { if (ichannels > 2)

1 0

Andrew Eikum : dsound: Support downmixing 5.1 to stereo.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: 88dd3b4f6e4ed10413b8d93055801a6e60fbc5e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88dd3b4f6e4ed10413b8d9305… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 19 09:11:13 2016 -0500 dsound: Support downmixing 5.1 to stereo. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_convert.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dsound/dsound_private.h | 2 ++ dlls/dsound/mixer.c | 8 ++++++++ 3 files changed, 56 insertions(+) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 4ae83ba..3b4d2e5 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -157,6 +157,13 @@ void putieee32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, floa *fbuf = value; } +void putieee32_sum(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) +{ + BYTE *buf = (BYTE *)dsb->device->tmp_buffer; + float *fbuf = (float*)(buf + pos + sizeof(float) * channel); + *fbuf += value; +} + void put_mono2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) { dsb->put_aux(dsb, pos, 0, value); @@ -206,6 +213,45 @@ void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD c } } +void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) +{ + /* based on pulseaudio's downmix algorithm */ + switch(channel){ + + case 4: /* back left */ + value *= 0.056f; /* (1/9) / (sum of left volumes) */ + dsb->put_aux(dsb, pos, 0, value); + break; + + case 0: /* front left */ + value *= 0.503; /* 1 / (sum of left volumes) */ + dsb->put_aux(dsb, pos, 0, value); + break; + + case 5: /* back right */ + value *= 0.056f; /* (1/9) / (sum of right volumes) */ + dsb->put_aux(dsb, pos, 1, value); + break; + + case 1: /* front right */ + value *= 0.503f; /* 1 / (sum of right volumes) */ + dsb->put_aux(dsb, pos, 1, value); + break; + + case 2: /* front centre */ + value *= 0.252f; /* 0.5 / (sum of left/right volumes) */ + dsb->put_aux(dsb, pos, 0, value); + dsb->put_aux(dsb, pos, 1, value); + break; + + case 3: /* LFE */ + value *= 0.189f; /* 0.375 / (sum of left/right volumes) */ + dsb->put_aux(dsb, pos, 0, value); + dsb->put_aux(dsb, pos, 1, value); + break; + } +} + 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 d063046..49e98ba 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -47,6 +47,7 @@ typedef float (*bitsgetfunc)(const IDirectSoundBufferImpl *, DWORD, DWORD); typedef void (*bitsputfunc)(const IDirectSoundBufferImpl *, DWORD, DWORD, float); extern const bitsgetfunc getbpp[5] DECLSPEC_HIDDEN; void putieee32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; +void putieee32_sum(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void mixieee32(float *src, float *dst, unsigned samples) DECLSPEC_HIDDEN; typedef void (*normfunc)(const void *, void *, unsigned); extern const normfunc normfunctions[4] DECLSPEC_HIDDEN; @@ -177,6 +178,7 @@ void put_mono2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, 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; +void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *dsbd, IDirectSoundBuffer **buffer) DECLSPEC_HIDDEN; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 217d4ce..4f05ee2 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -173,6 +173,12 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) dsb->mix_channels = 2; dsb->put = put_stereo2surround51; } + else if (ichannels == 6 && ochannels == 2) + { + dsb->mix_channels = 6; + dsb->put = put_surround512stereo; + dsb->put_aux = putieee32_sum; + } else { if (ichannels > 2) @@ -495,6 +501,8 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, /* Resample buffer to temporary buffer specifically allocated for this purpose, if needed */ oldpos = dsb->sec_mixpos; + if(dsb->put_aux == putieee32_sum) + memset(dsb->device->tmp_buffer, 0, dsb->device->tmp_buffer_len); DSOUND_MixToTemporary(dsb, frames); ibuf = dsb->device->tmp_buffer;

1 0

Andrew Eikum : dsound: Allow inactive devices to change the primary format.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: 4fbe6f3e7601f7b39f7f672ffe43553eee92ab1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fbe6f3e7601f7b39f7f672ff… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 19 09:11:08 2016 -0500 dsound: Allow inactive devices to change the primary format. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/primary.c | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 0dc16f0..b14bff7 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -479,35 +479,30 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); EnterCriticalSection(&(device->mixlock)); - if (device->priolevel == DSSCL_WRITEPRIMARY) { - old_fmt = device->primary_pwfx; - device->primary_pwfx = DSOUND_CopyFormat(passed_fmt); - fmtex = (WAVEFORMATEXTENSIBLE *)device->primary_pwfx; - if (device->primary_pwfx == NULL) { - err = DSERR_OUTOFMEMORY; - goto out; - } + old_fmt = device->primary_pwfx; + device->primary_pwfx = DSOUND_CopyFormat(passed_fmt); + fmtex = (WAVEFORMATEXTENSIBLE *)device->primary_pwfx; + if (device->primary_pwfx == NULL) { + err = DSERR_OUTOFMEMORY; + goto out; + } - if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && - fmtex->Samples.wValidBitsPerSample == 0) { - TRACE("Correcting 0 valid bits per sample\n"); - fmtex->Samples.wValidBitsPerSample = fmtex->Format.wBitsPerSample; - } + if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && + fmtex->Samples.wValidBitsPerSample == 0) { + TRACE("Correcting 0 valid bits per sample\n"); + fmtex->Samples.wValidBitsPerSample = fmtex->Format.wBitsPerSample; + } + if(device->priolevel == DSSCL_WRITEPRIMARY || device->nrofbuffers == 0) err = DSOUND_ReopenDevice(device, TRUE); - if (FAILED(err)) { - ERR("No formats could be opened\n"); - HeapFree(GetProcessHeap(), 0, device->primary_pwfx); - device->primary_pwfx = old_fmt; - } else - HeapFree(GetProcessHeap(), 0, old_fmt); + if (FAILED(err) && device->priolevel == DSSCL_WRITEPRIMARY) { + ERR("No formats could be opened\n"); + HeapFree(GetProcessHeap(), 0, device->primary_pwfx); + device->primary_pwfx = old_fmt; } else { - WAVEFORMATEX *wfx = DSOUND_CopyFormat(passed_fmt); - if (wfx) { - HeapFree(GetProcessHeap(), 0, device->primary_pwfx); - device->primary_pwfx = wfx; - } else - err = DSERR_OUTOFMEMORY; + /* ignore failures */ + err = S_OK; + HeapFree(GetProcessHeap(), 0, old_fmt); } out:

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
55
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 May 2016