- Wine-Devel - list.winehq.org

[PATCH 1/2] msvcr110: Add _Cancellation_beacon::_Cancellation_beacon_ctor stub.
by Torge Matthies April 11, 2022

April 11, 2022

The pointer is needed for Crazy Machines 3 to not crash. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/concurrency.c | 19 +++++++++++++++++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 64c015b8ab6..b77671602ea 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -19,7 +19,7 @@ @ stub -arch=win64 ??0_CancellationTokenState(a)details@Concurrency@@AEAA(a)XZ @ stub -arch=arm ??0_Cancellation_beacon(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??0_Cancellation_beacon(a)details@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??0_Cancellation_beacon(a)details@Concurrency@@QEAA(a)XZ +@ cdecl -arch=win64 ??0_Cancellation_beacon(a)details@Concurrency@@QEAA(a)XZ(ptr) _Cancellation_beacon_ctor @ cdecl -arch=arm ??0_Condition_variable(a)details@Concurrency@@QAA(a)XZ(ptr) _Condition_variable_ctor @ thiscall -arch=i386 ??0_Condition_variable(a)details@Concurrency@@QAE(a)XZ(ptr) _Condition_variable_ctor @ cdecl -arch=win64 ??0_Condition_variable(a)details@Concurrency@@QEAA(a)XZ(ptr) _Condition_variable_ctor diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 8a5d20036ec..4d54227fd52 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -16,7 +16,7 @@ @ cdecl -arch=win64 ??0SchedulerPolicy(a)Concurrency@@QEAA(a)XZ(ptr) SchedulerPolicy_ctor @ stub -arch=arm ??0_Cancellation_beacon(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??0_Cancellation_beacon(a)details@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??0_Cancellation_beacon(a)details@Concurrency@@QEAA(a)XZ +@ cdecl -arch=win64 ??0_Cancellation_beacon(a)details@Concurrency@@QEAA(a)XZ(ptr) _Cancellation_beacon_ctor @ cdecl -arch=arm ??0_Condition_variable(a)details@Concurrency@@QAA(a)XZ(ptr) _Condition_variable_ctor @ thiscall -arch=i386 ??0_Condition_variable(a)details@Concurrency@@QAE(a)XZ(ptr) _Condition_variable_ctor @ cdecl -arch=win64 ??0_Condition_variable(a)details@Concurrency@@QEAA(a)XZ(ptr) _Condition_variable_ctor diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 2bf4a5010f8..3bb28baa631 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -14,7 +14,7 @@ @ cdecl -arch=win64 ??0SchedulerPolicy(a)Concurrency@@QEAA(a)XZ(ptr) msvcr120.??0SchedulerPolicy(a)Concurrency@@QEAA(a)XZ @ stub -arch=arm ??0_Cancellation_beacon(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??0_Cancellation_beacon(a)details@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??0_Cancellation_beacon(a)details@Concurrency@@QEAA(a)XZ +@ cdecl -arch=win64 ??0_Cancellation_beacon(a)details@Concurrency@@QEAA(a)XZ(ptr) msvcr120.??0_Cancellation_beacon(a)details@Concurrency@@QEAA(a)XZ @ cdecl -arch=arm ??0_Condition_variable(a)details@Concurrency@@QAA(a)XZ(ptr) msvcr120.??0_Condition_variable(a)details@Concurrency@@QAA(a)XZ @ thiscall -arch=i386 ??0_Condition_variable(a)details@Concurrency@@QAE(a)XZ(ptr) msvcr120.??0_Condition_variable(a)details@Concurrency@@QAE(a)XZ @ cdecl -arch=win64 ??0_Condition_variable(a)details@Concurrency@@QEAA(a)XZ(ptr) msvcr120.??0_Condition_variable(a)details@Concurrency@@QEAA(a)XZ diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 98baf253adf..0f9d0141f4c 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -308,6 +308,10 @@ typedef struct cv_queue { LONG expired; } cv_queue; +typedef struct { + void *unknown; +} _Cancellation_beacon; + typedef struct { /* cv_queue structure is not binary compatible */ cv_queue *queue; @@ -2486,6 +2490,21 @@ int __cdecl event_wait_for_multiple(event **events, size_t count, bool wait_all, #if _MSVCR_VER >= 110 +struct { + void *unk; +} _Cancellation_beacon_unknown = { + 0x0 +}; + +/* ??0_Cancellation_beacon(a)details@Concurrency@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(_Cancellation_beacon_ctor, 4) +_Cancellation_beacon* __thiscall _Cancellation_beacon_ctor(_Cancellation_beacon *this) +{ + FIXME("(%p): stub!\n", this); + this->unknown = &_Cancellation_beacon_unknown; + return this; +} + /* ??0_Condition_variable(a)details@Concurrency@@QAE(a)XZ */ /* ??0_Condition_variable(a)details@Concurrency@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(_Condition_variable_ctor, 4) -- 2.35.1

1 1

[PATCH] po: Update German translation.
by Julian Rüger April 11, 2022

April 11, 2022

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH v3 1/7] jscript: Implement Object.prototype.__defineGetter__.
by Gabriel Ivăncescu April 11, 2022

April 11, 2022

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/object.c | 44 ++++++++++++++++ dlls/mshtml/tests/documentmode.js | 88 +++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 9d4a747..d7650ff 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -294,6 +294,49 @@ done: return hres; } +static HRESULT Object_defineGetter(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +{ + property_desc_t desc; + const WCHAR *name; + jsstr_t *name_str; + jsdisp_t *jsthis; + HRESULT hres; + + TRACE("\n"); + + if(!is_object_instance(vthis) || !(jsthis = to_jsdisp(get_object(vthis)))) + goto done; + + if(argc < 2 || !is_object_instance(argv[1])) + return JS_E_FUNCTION_EXPECTED; + + desc.getter = to_jsdisp(get_object(argv[1])); + if(!desc.getter) { + FIXME("getter is not JS object\n"); + return E_NOTIMPL; + } + /* FIXME: Check IsCallable */ + + hres = to_flat_string(ctx, argv[0], &name_str, &name); + if(FAILED(hres)) + return hres; + + desc.flags = desc.mask = PROPF_CONFIGURABLE | PROPF_ENUMERABLE; + desc.explicit_getter = TRUE; + desc.explicit_setter = FALSE; + desc.explicit_value = FALSE; + desc.setter = NULL; + hres = jsdisp_define_property(jsthis, name, &desc); + + jsstr_release(name_str); + if(FAILED(hres)) + return hres; +done: + if(r) + *r = jsval_undefined(); + return S_OK; +} + HRESULT Object_get_proto_(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *jsthis; @@ -365,6 +408,7 @@ static void Object_destructor(jsdisp_t *dispex) } static const builtin_prop_t Object_props[] = { + {L"__defineGetter__", Object_defineGetter, PROPF_METHOD|PROPF_ES6|2}, {L"hasOwnProperty", Object_hasOwnProperty, PROPF_METHOD|1}, {L"isPrototypeOf", Object_isPrototypeOf, PROPF_METHOD|1}, {L"propertyIsEnumerable", Object_propertyIsEnumerable, PROPF_METHOD|1}, diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 2902902..18dd65e 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1415,6 +1415,94 @@ sync_test("__proto__", function() { } }); +sync_test("__defineGetter__", function() { + var v = document.documentMode; + var r, x = 42; + + if(v < 11) { + ok(x.__defineGetter__ === undefined, "x.__defineGetter__ = " + x.__defineGetter__); + ok(!("__defineGetter__" in Object), "Object.__defineGetter__ = " + Object.__defineGetter__); + return; + } + ok(Object.prototype.hasOwnProperty("__defineGetter__"), "__defineGetter__ is not a property of Object.prototype"); + ok(Object.prototype.__defineGetter__.length === 2, "__defineGetter__.length = " + Object.prototype.__defineGetter__.length); + + function getter() { return "wine"; } + function setter(val) { } + + r = x.__defineGetter__("foo", getter); + ok(r === undefined, "__defineGetter__ on 42 returned " + r); + ok(x.foo === undefined, "42.foo = " + x.foo); + + x = {}; + r = x.__defineGetter__("foo", getter); + ok(r === undefined, "__defineGetter__ returned " + r); + ok(x.foo === "wine", "x.foo = " + x.foo); + r = Object.getOwnPropertyDescriptor(x, "foo"); + ok(r.value === undefined, "x.foo value = " + r.value); + ok(r.get === getter, "x.foo get = " + r.get); + ok(r.set === undefined, "x.foo set = " + r.set); + ok(r.writable === undefined, "x.foo writable = " + r.writable); + ok(r.enumerable === true, "x.foo enumerable = " + r.enumerable); + ok(r.configurable === true, "x.foo configurable = " + r.configurable); + + Object.defineProperty(x, "foo", { get: undefined, set: setter, configurable: false }); + r = Object.getOwnPropertyDescriptor(x, "foo"); + ok(r.value === undefined, "x.foo setter value = " + r.value); + ok(r.get === undefined, "x.foo setter get = " + r.get); + ok(r.set === setter, "x.foo setter set = " + r.set); + ok(r.writable === undefined, "x.foo setter writable = " + r.writable); + ok(r.enumerable === true, "x.foo setter enumerable = " + r.enumerable); + ok(r.configurable === false, "x.foo setter configurable = " + r.configurable); + try { + x.__defineGetter__("foo", getter); + ok(false, "expected exception calling __defineGetter__ on non-configurable property"); + }catch(e) { + ok(e.number === 0xa13d6 - 0x80000000, "__defineGetter__ on non-configurable property threw exception " + e.number); + } + + r = Object.prototype.__defineGetter__.call(undefined, "bar", getter); + ok(r === undefined, "__defineGetter__ on undefined returned " + r); + r = Object.prototype.__defineGetter__.call(null, "bar", getter); + ok(r === undefined, "__defineGetter__ on null returned " + r); + r = x.__defineGetter__(undefined, getter); + ok(r === undefined, "__defineGetter__ undefined prop returned " + r); + ok(x["undefined"] === "wine", "x.undefined = " + x["undefined"]); + r = x.__defineGetter__(false, getter); + ok(r === undefined, "__defineGetter__ undefined prop returned " + r); + ok(x["false"] === "wine", "x.false = " + x["false"]); + + try { + x.__defineGetter__("bar", "string"); + ok(false, "expected exception calling __defineGetter__ with string"); + }catch(e) { + ok(e.number === 0xa138a - 0x80000000, "__defineGetter__ with string threw exception " + e.number); + } + try { + x.__defineGetter__("bar", undefined); + ok(false, "expected exception calling __defineGetter__ with undefined"); + }catch(e) { + ok(e.number === 0xa138a - 0x80000000, "__defineGetter__ with undefined threw exception " + e.number); + } + try { + x.__defineGetter__("bar", null); + ok(false, "expected exception calling __defineGetter__ with null"); + }catch(e) { + ok(e.number === 0xa138a - 0x80000000, "__defineGetter__ with null threw exception " + e.number); + } + try { + Object.prototype.__defineGetter__.call(x, "bar"); + ok(false, "expected exception calling __defineGetter__ with only one arg"); + }catch(e) { + ok(e.number === 0xa138a - 0x80000000, "__defineGetter__ with only one arg threw exception " + e.number); + } + + x.bar = "test"; + ok(x.bar === "test", "x.bar = " + x.bar); + x.__defineGetter__("bar", getter); + ok(x.bar === "wine", "x.bar with getter = " + x.bar); +}); + async_test("postMessage", function() { var v = document.documentMode; var onmessage_called = false; -- 2.34.1

3 20

[website] German translation for release 7.6
by Julian Rüger April 11, 2022

April 11, 2022

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for WWN issue 415
by Julian Rüger April 11, 2022

April 11, 2022

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 7.5
by Julian Rüger April 11, 2022

April 11, 2022

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH 8/8] wineoss: Move get_mix_format to the unixlib.
by Huw Davies April 11, 2022

April 11, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 104 +++++------------------------------- dlls/wineoss.drv/oss.c | 101 ++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 9 ++++ 3 files changed, 122 insertions(+), 92 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 6ab7b3e551d..f7c7864e2af 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1111,9 +1111,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, WAVEFORMATEX **pwfx) { ACImpl *This = impl_from_IAudioClient3(iface); - WAVEFORMATEXTENSIBLE *fmt; - oss_audioinfo ai; - int formats, fd; + struct get_mix_format_params params; TRACE("(%p)->(%p)\n", This, pwfx); @@ -1121,99 +1119,21 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, return E_POINTER; *pwfx = NULL; - fd = open_device(This->devnode, This->dataflow); - if(fd < 0){ - WARN("Unable to open device %s: %d (%s)\n", This->devnode, errno, strerror(errno)); - return AUDCLNT_E_DEVICE_INVALIDATED; - } - - ai.dev = -1; - if(ioctl(fd, SNDCTL_ENGINEINFO, &ai) < 0){ - WARN("Unable to get audio info for device %s: %d (%s)\n", This->devnode, - errno, strerror(errno)); - close(fd); - return E_FAIL; - } - close(fd); - - if(This->dataflow == eRender) - formats = ai.oformats; - else if(This->dataflow == eCapture) - formats = ai.iformats; - else - return E_UNEXPECTED; - - fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); - if(!fmt) + params.device = This->devnode; + params.flow = This->dataflow; + params.fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); + if(!params.fmt) return E_OUTOFMEMORY; - fmt->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; - if(formats & AFMT_S16_LE){ - fmt->Format.wBitsPerSample = 16; - fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; -#ifdef AFMT_FLOAT - }else if(formats & AFMT_FLOAT){ - fmt->Format.wBitsPerSample = 32; - fmt->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; -#endif - }else if(formats & AFMT_U8){ - fmt->Format.wBitsPerSample = 8; - fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - }else if(formats & AFMT_S32_LE){ - fmt->Format.wBitsPerSample = 32; - fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - }else if(formats & AFMT_S24_LE){ - fmt->Format.wBitsPerSample = 24; - fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - }else{ - WARN("Didn't recognize any available OSS formats: %x\n", formats); - CoTaskMemFree(fmt); - return E_FAIL; - } - - /* some OSS drivers are buggy, so set reasonable defaults if - * the reported values seem wacky */ - fmt->Format.nChannels = max(ai.max_channels, ai.min_channels); - if(fmt->Format.nChannels == 0 || fmt->Format.nChannels > 8) - fmt->Format.nChannels = 2; - - /* For most hardware on Windows, users must choose a configuration with an even - * number of channels (stereo, quad, 5.1, 7.1). Users can then disable - * channels, but those channels are still reported to applications from - * GetMixFormat! Some applications behave badly if given an odd number of - * channels (e.g. 2.1). */ - if(fmt->Format.nChannels > 1 && (fmt->Format.nChannels & 0x1)) - { - if(fmt->Format.nChannels < ai.max_channels) - fmt->Format.nChannels += 1; - else - /* We could "fake" more channels and downmix the emulated channels, - * but at that point you really ought to tweak your OSS setup or - * just use PulseAudio. */ - WARN("Some Windows applications behave badly with an odd number of channels (%u)!\n", fmt->Format.nChannels); - } - - if(ai.max_rate == 0) - fmt->Format.nSamplesPerSec = 44100; - else - fmt->Format.nSamplesPerSec = min(ai.max_rate, 44100); - if(fmt->Format.nSamplesPerSec < ai.min_rate) - fmt->Format.nSamplesPerSec = ai.min_rate; - - fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels); - - fmt->Format.nBlockAlign = (fmt->Format.wBitsPerSample * - fmt->Format.nChannels) / 8; - fmt->Format.nAvgBytesPerSec = fmt->Format.nSamplesPerSec * - fmt->Format.nBlockAlign; + OSS_CALL(get_mix_format, &params); - fmt->Samples.wValidBitsPerSample = fmt->Format.wBitsPerSample; - fmt->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); - - *pwfx = (WAVEFORMATEX*)fmt; - dump_fmt(*pwfx); + if(SUCCEEDED(params.result)){ + *pwfx = &params.fmt->Format; + dump_fmt(*pwfx); + } else + CoTaskMemFree(params.fmt); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 49173ec6b6b..389ec73ee10 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -495,9 +495,110 @@ static NTSTATUS is_format_supported(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_mix_format(void *args) +{ + struct get_mix_format_params *params = args; + WAVEFORMATEXTENSIBLE *fmt = params->fmt; + oss_audioinfo ai; + int formats, fd; + + if(params->flow != eRender && params->flow != eCapture){ + params->result = E_UNEXPECTED; + return STATUS_SUCCESS; + } + + fd = open_device(params->device, params->flow); + if(fd < 0){ + WARN("Unable to open device %s: %d (%s)\n", params->device, errno, strerror(errno)); + params->result = AUDCLNT_E_DEVICE_INVALIDATED; + return STATUS_SUCCESS; + } + + ai.dev = -1; + if(ioctl(fd, SNDCTL_ENGINEINFO, &ai) < 0){ + WARN("Unable to get audio info for device %s: %d (%s)\n", params->device, errno, strerror(errno)); + close(fd); + params->result = E_FAIL; + return STATUS_SUCCESS; + } + close(fd); + + if(params->flow == eRender) + formats = ai.oformats; + else + formats = ai.iformats; + + fmt->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + if(formats & AFMT_S16_LE){ + fmt->Format.wBitsPerSample = 16; + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; +#ifdef AFMT_FLOAT + }else if(formats & AFMT_FLOAT){ + fmt->Format.wBitsPerSample = 32; + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; +#endif + }else if(formats & AFMT_U8){ + fmt->Format.wBitsPerSample = 8; + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + }else if(formats & AFMT_S32_LE){ + fmt->Format.wBitsPerSample = 32; + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + }else if(formats & AFMT_S24_LE){ + fmt->Format.wBitsPerSample = 24; + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + }else{ + WARN("Didn't recognize any available OSS formats: %x\n", formats); + params->result = E_FAIL; + return STATUS_SUCCESS; + } + + /* some OSS drivers are buggy, so set reasonable defaults if + * the reported values seem wacky */ + fmt->Format.nChannels = max(ai.max_channels, ai.min_channels); + if(fmt->Format.nChannels == 0 || fmt->Format.nChannels > 8) + fmt->Format.nChannels = 2; + + /* For most hardware on Windows, users must choose a configuration with an even + * number of channels (stereo, quad, 5.1, 7.1). Users can then disable + * channels, but those channels are still reported to applications from + * GetMixFormat! Some applications behave badly if given an odd number of + * channels (e.g. 2.1). */ + if(fmt->Format.nChannels > 1 && (fmt->Format.nChannels & 0x1)) + { + if(fmt->Format.nChannels < ai.max_channels) + fmt->Format.nChannels += 1; + else + /* We could "fake" more channels and downmix the emulated channels, + * but at that point you really ought to tweak your OSS setup or + * just use PulseAudio. */ + WARN("Some Windows applications behave badly with an odd number of channels (%u)!\n", fmt->Format.nChannels); + } + + if(ai.max_rate == 0) + fmt->Format.nSamplesPerSec = 44100; + else + fmt->Format.nSamplesPerSec = min(ai.max_rate, 44100); + if(fmt->Format.nSamplesPerSec < ai.min_rate) + fmt->Format.nSamplesPerSec = ai.min_rate; + + fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels); + + fmt->Format.nBlockAlign = (fmt->Format.wBitsPerSample * + fmt->Format.nChannels) / 8; + fmt->Format.nAvgBytesPerSec = fmt->Format.nSamplesPerSec * + fmt->Format.nBlockAlign; + + fmt->Samples.wValidBitsPerSample = fmt->Format.wBitsPerSample; + fmt->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, get_endpoint_ids, is_format_supported, + get_mix_format, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index b89e2142d93..e0817cbc9c1 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -77,11 +77,20 @@ struct is_format_supported_params HRESULT result; }; +struct get_mix_format_params +{ + const char *device; + EDataFlow flow; + WAVEFORMATEXTENSIBLE *fmt; + HRESULT result; +}; + enum oss_funcs { oss_test_connect, oss_get_endpoint_ids, oss_is_format_supported, + oss_get_mix_format, }; extern unixlib_handle_t oss_handle; -- 2.25.1

2 1

[PATCH 7/8] wineoss: Move the stream creation to AudioClient_Initialize().
by Huw Davies April 11, 2022

April 11, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 148 +++++++++++++++++------------------- 1 file changed, 70 insertions(+), 78 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 990429156bc..6ab7b3e551d 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -430,8 +430,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out) { ACImpl *This; - struct oss_stream *stream; - oss_audioinfo ai; const OSSDevice *oss_dev; HRESULT hr; int len; @@ -448,57 +446,15 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, if(!This) return E_OUTOFMEMORY; - stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->stream)); - if(!stream){ - HeapFree(GetProcessHeap(), 0, This); - return E_OUTOFMEMORY; - } - stream->flow = oss_dev->flow; - This->stream = stream; - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient3_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, stream); HeapFree(GetProcessHeap(), 0, This); return hr; } - stream->fd = open_device(oss_dev->devnode, oss_dev->flow); - if(stream->fd < 0){ - WARN("Unable to open device %s: %d (%s)\n", oss_dev->devnode, errno, - strerror(errno)); - HeapFree(GetProcessHeap(), 0, stream); - HeapFree(GetProcessHeap(), 0, This); - return AUDCLNT_E_DEVICE_INVALIDATED; - } - This->dataflow = oss_dev->flow; - - ai.dev = -1; - if(ioctl(stream->fd, SNDCTL_ENGINEINFO, &ai) < 0){ - WARN("Unable to get audio info for device %s: %d (%s)\n", oss_dev->devnode, - errno, strerror(errno)); - close(stream->fd); - HeapFree(GetProcessHeap(), 0, stream); - HeapFree(GetProcessHeap(), 0, This); - return E_FAIL; - } - strcpy(This->devnode, oss_dev->devnode); - TRACE("OSS audioinfo:\n"); - TRACE("devnode: %s\n", ai.devnode); - TRACE("name: %s\n", ai.name); - TRACE("busy: %x\n", ai.busy); - TRACE("caps: %x\n", ai.caps); - TRACE("iformats: %x\n", ai.iformats); - TRACE("oformats: %x\n", ai.oformats); - TRACE("enabled: %d\n", ai.enabled); - TRACE("min_rate: %d\n", ai.min_rate); - TRACE("max_rate: %d\n", ai.max_rate); - TRACE("min_channels: %d\n", ai.min_channels); - TRACE("max_channels: %d\n", ai.max_channels); - This->IAudioClient3_iface.lpVtbl = &AudioClient3_Vtbl; This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl; This->IAudioCaptureClient_iface.lpVtbl = &AudioCaptureClient_Vtbl; @@ -576,17 +532,19 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) IUnknown_Release(This->pUnkFTMarshal); This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); - close(stream->fd); if(This->initted){ EnterCriticalSection(&g_sessions_lock); list_remove(&This->entry); LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); - HeapFree(GetProcessHeap(), 0, stream->local_buffer); - HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); - CoTaskMemFree(stream->fmt); - HeapFree(GetProcessHeap(), 0, stream); + if(stream){ + close(stream->fd); + HeapFree(GetProcessHeap(), 0, stream->local_buffer); + HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); + CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream); + } HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -882,7 +840,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, const GUID *sessionguid) { ACImpl *This = impl_from_IAudioClient3(iface); - struct oss_stream *stream = This->stream; + struct oss_stream *stream; + oss_audioinfo ai; int i; HRESULT hr; @@ -942,18 +901,49 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } - hr = setup_oss_device(mode, stream->fd, fmt, NULL); - if(FAILED(hr)){ + stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->stream)); + if(!stream){ LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); - return hr; + return E_OUTOFMEMORY; + } + stream->flow = This->dataflow; + + stream->fd = open_device(This->devnode, This->dataflow); + if(stream->fd < 0){ + WARN("Unable to open device %s: %d (%s)\n", This->devnode, errno, strerror(errno)); + hr = AUDCLNT_E_DEVICE_INVALIDATED; + goto exit; + } + + ai.dev = -1; + if(ioctl(stream->fd, SNDCTL_ENGINEINFO, &ai) < 0){ + WARN("Unable to get audio info for device %s: %d (%s)\n", This->devnode, errno, strerror(errno)); + hr = E_FAIL; + goto exit; } + TRACE("OSS audioinfo:\n"); + TRACE("devnode: %s\n", ai.devnode); + TRACE("name: %s\n", ai.name); + TRACE("busy: %x\n", ai.busy); + TRACE("caps: %x\n", ai.caps); + TRACE("iformats: %x\n", ai.iformats); + TRACE("oformats: %x\n", ai.oformats); + TRACE("enabled: %d\n", ai.enabled); + TRACE("min_rate: %d\n", ai.min_rate); + TRACE("max_rate: %d\n", ai.max_rate); + TRACE("min_channels: %d\n", ai.min_channels); + TRACE("max_channels: %d\n", ai.max_channels); + + hr = setup_oss_device(mode, stream->fd, fmt, NULL); + if(FAILED(hr)) + goto exit; + stream->fmt = clone_format(fmt); if(!stream->fmt){ - LeaveCriticalSection(&This->lock); - LeaveCriticalSection(&g_sessions_lock); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto exit; } stream->period_us = period / 10; @@ -965,23 +955,16 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, stream->local_buffer = HeapAlloc(GetProcessHeap(), 0, stream->bufsize_frames * fmt->nBlockAlign); if(!stream->local_buffer){ - CoTaskMemFree(stream->fmt); - stream->fmt = NULL; - LeaveCriticalSection(&This->lock); - LeaveCriticalSection(&g_sessions_lock); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto exit; } This->channel_count = fmt->nChannels; This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float)); if(!This->vols){ - CoTaskMemFree(stream->fmt); - stream->fmt = NULL; - LeaveCriticalSection(&This->lock); - LeaveCriticalSection(&g_sessions_lock); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto exit; } - for(i = 0; i < This->channel_count; ++i) This->vols[i] = 1.f; @@ -991,24 +974,25 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, hr = get_audio_session(sessionguid, This->parent, This->channel_count, &This->session); + +exit: if(FAILED(hr)){ HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; CoTaskMemFree(stream->fmt); - stream->fmt = NULL; - LeaveCriticalSection(&This->lock); - LeaveCriticalSection(&g_sessions_lock); - return hr; + if(stream->fd >= 0) close(stream->fd); + HeapFree(GetProcessHeap(), 0, stream->local_buffer); + HeapFree(GetProcessHeap(), 0, stream); + } else { + list_add_tail(&This->session->clients, &This->entry); + This->stream = stream; + This->initted = TRUE; } - list_add_tail(&This->session->clients, &This->entry); - - This->initted = TRUE; - LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); - return S_OK; + return hr; } static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, @@ -1129,7 +1113,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, ACImpl *This = impl_from_IAudioClient3(iface); WAVEFORMATEXTENSIBLE *fmt; oss_audioinfo ai; - int formats; + int formats, fd; TRACE("(%p)->(%p)\n", This, pwfx); @@ -1137,12 +1121,20 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, return E_POINTER; *pwfx = NULL; + fd = open_device(This->devnode, This->dataflow); + if(fd < 0){ + WARN("Unable to open device %s: %d (%s)\n", This->devnode, errno, strerror(errno)); + return AUDCLNT_E_DEVICE_INVALIDATED; + } + ai.dev = -1; - if(ioctl(This->stream->fd, SNDCTL_ENGINEINFO, &ai) < 0){ + if(ioctl(fd, SNDCTL_ENGINEINFO, &ai) < 0){ WARN("Unable to get audio info for device %s: %d (%s)\n", This->devnode, errno, strerror(errno)); + close(fd); return E_FAIL; } + close(fd); if(This->dataflow == eRender) formats = ai.oformats; -- 2.25.1

2 1

[PATCH 6/8] wineoss: Don't cache the oss_audioinfo in the client.
by Huw Davies April 11, 2022

April 11, 2022

The retrieval on endpoint creation is left in for debugging purposes. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 53 +++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 242d2e0b359..990429156bc 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -113,8 +113,6 @@ struct ACImpl { UINT32 channel_count; struct oss_stream *stream; - oss_audioinfo ai; - BOOL initted; HANDLE timer; @@ -433,6 +431,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, { ACImpl *This; struct oss_stream *stream; + oss_audioinfo ai; const OSSDevice *oss_dev; HRESULT hr; int len; @@ -475,8 +474,8 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, This->dataflow = oss_dev->flow; - This->ai.dev = -1; - if(ioctl(stream->fd, SNDCTL_ENGINEINFO, &This->ai) < 0){ + ai.dev = -1; + if(ioctl(stream->fd, SNDCTL_ENGINEINFO, &ai) < 0){ WARN("Unable to get audio info for device %s: %d (%s)\n", oss_dev->devnode, errno, strerror(errno)); close(stream->fd); @@ -488,17 +487,17 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, strcpy(This->devnode, oss_dev->devnode); TRACE("OSS audioinfo:\n"); - TRACE("devnode: %s\n", This->ai.devnode); - TRACE("name: %s\n", This->ai.name); - TRACE("busy: %x\n", This->ai.busy); - TRACE("caps: %x\n", This->ai.caps); - TRACE("iformats: %x\n", This->ai.iformats); - TRACE("oformats: %x\n", This->ai.oformats); - TRACE("enabled: %d\n", This->ai.enabled); - TRACE("min_rate: %d\n", This->ai.min_rate); - TRACE("max_rate: %d\n", This->ai.max_rate); - TRACE("min_channels: %d\n", This->ai.min_channels); - TRACE("max_channels: %d\n", This->ai.max_channels); + TRACE("devnode: %s\n", ai.devnode); + TRACE("name: %s\n", ai.name); + TRACE("busy: %x\n", ai.busy); + TRACE("caps: %x\n", ai.caps); + TRACE("iformats: %x\n", ai.iformats); + TRACE("oformats: %x\n", ai.oformats); + TRACE("enabled: %d\n", ai.enabled); + TRACE("min_rate: %d\n", ai.min_rate); + TRACE("max_rate: %d\n", ai.max_rate); + TRACE("min_channels: %d\n", ai.min_channels); + TRACE("max_channels: %d\n", ai.max_channels); This->IAudioClient3_iface.lpVtbl = &AudioClient3_Vtbl; This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl; @@ -1129,6 +1128,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, { ACImpl *This = impl_from_IAudioClient3(iface); WAVEFORMATEXTENSIBLE *fmt; + oss_audioinfo ai; int formats; TRACE("(%p)->(%p)\n", This, pwfx); @@ -1137,10 +1137,17 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, return E_POINTER; *pwfx = NULL; + ai.dev = -1; + if(ioctl(This->stream->fd, SNDCTL_ENGINEINFO, &ai) < 0){ + WARN("Unable to get audio info for device %s: %d (%s)\n", This->devnode, + errno, strerror(errno)); + return E_FAIL; + } + if(This->dataflow == eRender) - formats = This->ai.oformats; + formats = ai.oformats; else if(This->dataflow == eCapture) - formats = This->ai.iformats; + formats = ai.iformats; else return E_UNEXPECTED; @@ -1174,7 +1181,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, /* some OSS drivers are buggy, so set reasonable defaults if * the reported values seem wacky */ - fmt->Format.nChannels = max(This->ai.max_channels, This->ai.min_channels); + fmt->Format.nChannels = max(ai.max_channels, ai.min_channels); if(fmt->Format.nChannels == 0 || fmt->Format.nChannels > 8) fmt->Format.nChannels = 2; @@ -1185,7 +1192,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, * channels (e.g. 2.1). */ if(fmt->Format.nChannels > 1 && (fmt->Format.nChannels & 0x1)) { - if(fmt->Format.nChannels < This->ai.max_channels) + if(fmt->Format.nChannels < ai.max_channels) fmt->Format.nChannels += 1; else /* We could "fake" more channels and downmix the emulated channels, @@ -1194,12 +1201,12 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, WARN("Some Windows applications behave badly with an odd number of channels (%u)!\n", fmt->Format.nChannels); } - if(This->ai.max_rate == 0) + if(ai.max_rate == 0) fmt->Format.nSamplesPerSec = 44100; else - fmt->Format.nSamplesPerSec = min(This->ai.max_rate, 44100); - if(fmt->Format.nSamplesPerSec < This->ai.min_rate) - fmt->Format.nSamplesPerSec = This->ai.min_rate; + fmt->Format.nSamplesPerSec = min(ai.max_rate, 44100); + if(fmt->Format.nSamplesPerSec < ai.min_rate) + fmt->Format.nSamplesPerSec = ai.min_rate; fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels); -- 2.25.1

2 1

[PATCH 5/8] wineoss: Move is_format_supported to the unixlib.
by Huw Davies April 11, 2022

April 11, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 51 ++++----- dlls/wineoss.drv/oss.c | 202 ++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 11 ++ 3 files changed, 233 insertions(+), 31 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 4f8460a3b3b..242d2e0b359 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1094,45 +1094,34 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, } static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, - AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *pwfx, - WAVEFORMATEX **outpwfx) + AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *fmt, + WAVEFORMATEX **out) { ACImpl *This = impl_from_IAudioClient3(iface); - int fd = -1; - HRESULT ret; + struct is_format_supported_params params; - TRACE("(%p)->(%x, %p, %p)\n", This, mode, pwfx, outpwfx); + TRACE("(%p)->(%x, %p, %p)\n", This, mode, fmt, out); + if(fmt) dump_fmt(fmt); - if(!pwfx || (mode == AUDCLNT_SHAREMODE_SHARED && !outpwfx)) - return E_POINTER; - - if(mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE) - return E_INVALIDARG; + params.device = This->devnode; + params.flow = This->dataflow; + params.share = mode; + params.fmt_in = fmt; + params.fmt_out = NULL; - if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - pwfx->cbSize < sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)) - return E_INVALIDARG; - - dump_fmt(pwfx); - - if(outpwfx){ - *outpwfx = NULL; - if(mode != AUDCLNT_SHAREMODE_SHARED) - outpwfx = NULL; + if(out){ + *out = NULL; + if(mode == AUDCLNT_SHAREMODE_SHARED) + params.fmt_out = CoTaskMemAlloc(sizeof(*params.fmt_out)); } + OSS_CALL(is_format_supported, &params); - fd = open_device(This->devnode, This->dataflow); - if(fd < 0){ - WARN("Unable to open device %s: %d (%s)\n", This->devnode, errno, - strerror(errno)); - return AUDCLNT_E_DEVICE_INVALIDATED; - } - - ret = setup_oss_device(mode, fd, pwfx, outpwfx); - - close(fd); + if(params.result == S_FALSE) + *out = &params.fmt_out->Format; + else + CoTaskMemFree(params.fmt_out); - return ret; + return params.result; } static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index ab7751ac174..49173ec6b6b 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -35,6 +35,7 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "winternl.h" +#include "initguid.h" #include "audioclient.h" #include "wine/debug.h" @@ -294,8 +295,209 @@ static NTSTATUS get_endpoint_ids(void *args) return STATUS_SUCCESS; } +static UINT get_channel_mask(unsigned int channels) +{ + switch(channels){ + case 0: + return 0; + case 1: + return KSAUDIO_SPEAKER_MONO; + case 2: + return KSAUDIO_SPEAKER_STEREO; + case 3: + return KSAUDIO_SPEAKER_STEREO | SPEAKER_LOW_FREQUENCY; + case 4: + return KSAUDIO_SPEAKER_QUAD; /* not _SURROUND */ + case 5: + return KSAUDIO_SPEAKER_QUAD | SPEAKER_LOW_FREQUENCY; + case 6: + return KSAUDIO_SPEAKER_5POINT1; /* not 5POINT1_SURROUND */ + case 7: + return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; + case 8: + return KSAUDIO_SPEAKER_7POINT1_SURROUND; /* Vista deprecates 7POINT1 */ + } + FIXME("Unknown speaker configuration: %u\n", channels); + return 0; +} + +static int get_oss_format(const WAVEFORMATEX *fmt) +{ + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)fmt; + + if(fmt->wFormatTag == WAVE_FORMAT_PCM || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ + switch(fmt->wBitsPerSample){ + case 8: + return AFMT_U8; + case 16: + return AFMT_S16_LE; + case 24: + return AFMT_S24_LE; + case 32: + return AFMT_S32_LE; + } + return -1; + } + +#ifdef AFMT_FLOAT + if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ + if(fmt->wBitsPerSample != 32) + return -1; + + return AFMT_FLOAT; + } +#endif + + return -1; +} + +static WAVEFORMATEXTENSIBLE *clone_format(const WAVEFORMATEX *fmt) +{ + WAVEFORMATEXTENSIBLE *ret; + size_t size; + + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + size = sizeof(WAVEFORMATEXTENSIBLE); + else + size = sizeof(WAVEFORMATEX); + + ret = malloc(size); + if(!ret) + return NULL; + + memcpy(ret, fmt, size); + + ret->Format.cbSize = size - sizeof(WAVEFORMATEX); + + return ret; +} + +static HRESULT setup_oss_device(AUDCLNT_SHAREMODE share, int fd, + const WAVEFORMATEX *fmt, WAVEFORMATEXTENSIBLE *out) +{ + const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)fmt; + int tmp, oss_format; + double tenth; + HRESULT ret = S_OK; + WAVEFORMATEXTENSIBLE *closest; + + tmp = oss_format = get_oss_format(fmt); + if(oss_format < 0) + return AUDCLNT_E_UNSUPPORTED_FORMAT; + if(ioctl(fd, SNDCTL_DSP_SETFMT, &tmp) < 0){ + WARN("SETFMT failed: %d (%s)\n", errno, strerror(errno)); + return E_FAIL; + } + if(tmp != oss_format){ + TRACE("Format unsupported by this OSS version: %x\n", oss_format); + return AUDCLNT_E_UNSUPPORTED_FORMAT; + } + + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + (fmtex->Format.nAvgBytesPerSec == 0 || + fmtex->Format.nBlockAlign == 0 || + fmtex->Samples.wValidBitsPerSample > fmtex->Format.wBitsPerSample)) + return E_INVALIDARG; + + if(fmt->nChannels == 0) + return AUDCLNT_E_UNSUPPORTED_FORMAT; + + closest = clone_format(fmt); + if(!closest) + return E_OUTOFMEMORY; + + tmp = fmt->nSamplesPerSec; + if(ioctl(fd, SNDCTL_DSP_SPEED, &tmp) < 0){ + WARN("SPEED failed: %d (%s)\n", errno, strerror(errno)); + free(closest); + return E_FAIL; + } + tenth = fmt->nSamplesPerSec * 0.1; + if(tmp > fmt->nSamplesPerSec + tenth || tmp < fmt->nSamplesPerSec - tenth){ + ret = S_FALSE; + closest->Format.nSamplesPerSec = tmp; + } + + tmp = fmt->nChannels; + if(ioctl(fd, SNDCTL_DSP_CHANNELS, &tmp) < 0){ + WARN("CHANNELS failed: %d (%s)\n", errno, strerror(errno)); + free(closest); + return E_FAIL; + } + if(tmp != fmt->nChannels){ + ret = S_FALSE; + closest->Format.nChannels = tmp; + } + + if(closest->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) + closest->dwChannelMask = get_channel_mask(closest->Format.nChannels); + + if(fmt->nBlockAlign != fmt->nChannels * fmt->wBitsPerSample / 8 || + fmt->nAvgBytesPerSec != fmt->nBlockAlign * fmt->nSamplesPerSec || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + fmtex->Samples.wValidBitsPerSample < fmtex->Format.wBitsPerSample)) + ret = S_FALSE; + + if(share == AUDCLNT_SHAREMODE_EXCLUSIVE && + fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(fmtex->dwChannelMask == 0 || fmtex->dwChannelMask & SPEAKER_RESERVED) + ret = S_FALSE; + } + + if(ret == S_FALSE && !out) + ret = AUDCLNT_E_UNSUPPORTED_FORMAT; + + if(ret == S_FALSE && out){ + closest->Format.nBlockAlign = + closest->Format.nChannels * closest->Format.wBitsPerSample / 8; + closest->Format.nAvgBytesPerSec = + closest->Format.nBlockAlign * closest->Format.nSamplesPerSec; + if(closest->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) + closest->Samples.wValidBitsPerSample = closest->Format.wBitsPerSample; + memcpy(out, closest, closest->Format.cbSize + sizeof(WAVEFORMATEX)); + } + free(closest); + + TRACE("returning: %08x\n", ret); + return ret; +} + +static NTSTATUS is_format_supported(void *args) +{ + struct is_format_supported_params *params = args; + int fd; + + params->result = S_OK; + + if(!params->fmt_in || (params->share == AUDCLNT_SHAREMODE_SHARED && !params->fmt_out)) + params->result = E_POINTER; + else if(params->share != AUDCLNT_SHAREMODE_SHARED && params->share != AUDCLNT_SHAREMODE_EXCLUSIVE) + params->result = E_INVALIDARG; + else if(params->fmt_in->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + params->fmt_in->cbSize < sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)) + params->result = E_INVALIDARG; + if(FAILED(params->result)) + return STATUS_SUCCESS; + + fd = open_device(params->device, params->flow); + if(fd < 0){ + WARN("Unable to open device %s: %d (%s)\n", params->device, errno, strerror(errno)); + params->result = AUDCLNT_E_DEVICE_INVALIDATED; + return STATUS_SUCCESS; + } + params->result = setup_oss_device(params->share, fd, params->fmt_in, params->fmt_out); + close(fd); + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, get_endpoint_ids, + is_format_supported, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index f498609898a..b89e2142d93 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -67,10 +67,21 @@ struct get_endpoint_ids_params unsigned int default_idx; }; +struct is_format_supported_params +{ + const char *device; + EDataFlow flow; + AUDCLNT_SHAREMODE share; + const WAVEFORMATEX *fmt_in; + WAVEFORMATEXTENSIBLE *fmt_out; + HRESULT result; +}; + enum oss_funcs { oss_test_connect, oss_get_endpoint_ids, + oss_is_format_supported, }; extern unixlib_handle_t oss_handle; -- 2.25.1

2 1