- Wine-Devel - list.winehq.org

[PATCH 03/12] winecoreaudio: Move get_buffer_size to the unixlib.
by Huw Davies Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 13 +++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 12 +++++------- dlls/winecoreaudio.drv/unixlib.h | 8 ++++++++ 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index f1ab4cf7986..56504a8b7b0 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1115,6 +1115,18 @@ static NTSTATUS capture_resample(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_buffer_size(void *args) +{ + struct get_buffer_size_params *params = args; + struct coreaudio_stream *stream = params->stream; + + OSSpinLockLock(&stream->lock); + *params->frames = stream->bufsize_frames; + OSSpinLockUnlock(&stream->lock); + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1122,6 +1134,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = release_stream, get_mix_format, is_format_supported, + get_buffer_size, capture_resample /* temporary */ }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 578312bf4ef..cd33cababd1 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -855,6 +855,7 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, UINT32 *frames) { ACImpl *This = impl_from_IAudioClient3(iface); + struct get_buffer_size_params params; TRACE("(%p)->(%p)\n", This, frames); @@ -864,13 +865,10 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - OSSpinLockLock(&This->stream->lock); - - *frames = This->stream->bufsize_frames; - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + params.frames = frames; + UNIX_CALL(get_buffer_size, &params); + return params.result; } static HRESULT ca_get_max_stream_latency(ACImpl *This, UInt32 *max) diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index c1762c50e7e..7e08b347b02 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -93,6 +93,13 @@ struct is_format_supported_params HRESULT result; }; +struct get_buffer_size_params +{ + struct coreaudio_stream *stream; + HRESULT result; + UINT32 *frames; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -100,6 +107,7 @@ enum unix_funcs unix_release_stream, unix_get_mix_format, unix_is_format_supported, + unix_get_buffer_size, unix_capture_resample /* temporary */ }; -- 2.23.0

2 1

[PATCH 02/12] winecoreaudio: Add a temporary capture_resample syscall.
by Huw Davies Nov. 23, 2021

Nov. 23, 2021

Eventually everything that calls this will reside in the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 105 +++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 102 +--------------------------- dlls/winecoreaudio.drv/unixlib.h | 2 + 3 files changed, 108 insertions(+), 101 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index f7f7777efcb..f1ab4cf7986 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -693,6 +693,7 @@ static NTSTATUS release_stream( void *args ) } if(stream->converter) AudioConverterDispose(stream->converter); + free(stream->resamp_buffer); free(stream->wrap_buffer); free(stream->cap_buffer); if(stream->local_buffer) @@ -1012,6 +1013,108 @@ unsupported: return STATUS_SUCCESS; } +static UINT buf_ptr_diff(UINT left, UINT right, UINT bufsize) +{ + if(left <= right) + return right - left; + return bufsize - (left - right); +} + +/* place data from cap_buffer into provided AudioBufferList */ +static OSStatus feed_cb(AudioConverterRef converter, UInt32 *nframes, AudioBufferList *data, + AudioStreamPacketDescription **packets, void *user) +{ + struct coreaudio_stream *stream = user; + + *nframes = min(*nframes, stream->cap_held_frames); + if(!*nframes){ + data->mBuffers[0].mData = NULL; + data->mBuffers[0].mDataByteSize = 0; + data->mBuffers[0].mNumberChannels = stream->fmt->nChannels; + return noErr; + } + + data->mBuffers[0].mDataByteSize = *nframes * stream->fmt->nBlockAlign; + data->mBuffers[0].mNumberChannels = stream->fmt->nChannels; + + if(stream->cap_offs_frames + *nframes > stream->cap_bufsize_frames){ + UINT32 chunk_frames = stream->cap_bufsize_frames - stream->cap_offs_frames; + + if(stream->wrap_bufsize_frames < *nframes){ + free(stream->wrap_buffer); + stream->wrap_buffer = malloc(data->mBuffers[0].mDataByteSize); + stream->wrap_bufsize_frames = *nframes; + } + + memcpy(stream->wrap_buffer, stream->cap_buffer + stream->cap_offs_frames * stream->fmt->nBlockAlign, + chunk_frames * stream->fmt->nBlockAlign); + memcpy(stream->wrap_buffer + chunk_frames * stream->fmt->nBlockAlign, stream->cap_buffer, + (*nframes - chunk_frames) * stream->fmt->nBlockAlign); + + data->mBuffers[0].mData = stream->wrap_buffer; + }else + data->mBuffers[0].mData = stream->cap_buffer + stream->cap_offs_frames * stream->fmt->nBlockAlign; + + stream->cap_offs_frames += *nframes; + stream->cap_offs_frames %= stream->cap_bufsize_frames; + stream->cap_held_frames -= *nframes; + + if(packets) + *packets = NULL; + + return noErr; +} + +static NTSTATUS capture_resample(void *args) +{ + struct coreaudio_stream *stream = args; + UINT32 resamp_period_frames = muldiv(stream->period_frames, stream->dev_desc.mSampleRate, + stream->fmt->nSamplesPerSec); + OSStatus sc; + + /* the resampling process often needs more source frames than we'd + * guess from a straight conversion using the sample rate ratio. so + * only convert if we have extra source data. */ + while(stream->cap_held_frames > resamp_period_frames * 2){ + AudioBufferList converted_list; + UInt32 wanted_frames = stream->period_frames; + + converted_list.mNumberBuffers = 1; + converted_list.mBuffers[0].mNumberChannels = stream->fmt->nChannels; + converted_list.mBuffers[0].mDataByteSize = wanted_frames * stream->fmt->nBlockAlign; + + if(stream->resamp_bufsize_frames < wanted_frames){ + free(stream->resamp_buffer); + stream->resamp_buffer = malloc(converted_list.mBuffers[0].mDataByteSize); + stream->resamp_bufsize_frames = wanted_frames; + } + + converted_list.mBuffers[0].mData = stream->resamp_buffer; + + sc = AudioConverterFillComplexBuffer(stream->converter, feed_cb, + stream, &wanted_frames, &converted_list, NULL); + if(sc != noErr){ + WARN("AudioConverterFillComplexBuffer failed: %x\n", (int)sc); + break; + } + + ca_wrap_buffer(stream->local_buffer, + stream->wri_offs_frames * stream->fmt->nBlockAlign, + stream->bufsize_frames * stream->fmt->nBlockAlign, + stream->resamp_buffer, wanted_frames * stream->fmt->nBlockAlign); + + stream->wri_offs_frames += wanted_frames; + stream->wri_offs_frames %= stream->bufsize_frames; + if(stream->held_frames + wanted_frames > stream->bufsize_frames){ + stream->lcl_offs_frames += buf_ptr_diff(stream->lcl_offs_frames, stream->wri_offs_frames, + stream->bufsize_frames); + stream->held_frames = stream->bufsize_frames; + }else + stream->held_frames += wanted_frames; + } + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1019,4 +1122,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = release_stream, get_mix_format, is_format_supported, + + capture_resample /* temporary */ }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 418bbfa00af..578312bf4ef 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -138,10 +138,6 @@ struct ACImpl { struct coreaudio_stream *stream; struct list entry; - - /* Temporary */ - BYTE *feed_wrap_buffer; - UINT32 feed_wrap_bufsize_frames; }; static const IAudioClient3Vtbl AudioClient3_Vtbl; @@ -581,7 +577,6 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) if(This->stream->tmp_buffer) NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, &This->stream->tmp_buffer_size, MEM_RELEASE); - HeapFree(GetProcessHeap(), 0, This->stream->resamp_buffer); params.stream = This->stream; UNIX_CALL(release_stream, &params); } @@ -591,7 +586,6 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); - free(This->feed_wrap_buffer); IMMDevice_Release(This->parent); IUnknown_Release(This->pUnkFTMarshal); HeapFree(GetProcessHeap(), 0, This); @@ -736,103 +730,9 @@ static void silence_buffer(struct coreaudio_stream *stream, BYTE *buffer, UINT32 memset(buffer, 0, frames * stream->fmt->nBlockAlign); } -static UINT buf_ptr_diff(UINT left, UINT right, UINT bufsize) -{ - if(left <= right) - return right - left; - return bufsize - (left - right); -} - -/* place data from cap_buffer into provided AudioBufferList */ -static OSStatus feed_cb(AudioConverterRef converter, UInt32 *nframes, AudioBufferList *data, - AudioStreamPacketDescription **packets, void *user) -{ - ACImpl *This = user; - - *nframes = min(*nframes, This->stream->cap_held_frames); - if(!*nframes){ - data->mBuffers[0].mData = NULL; - data->mBuffers[0].mDataByteSize = 0; - data->mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; - return noErr; - } - - data->mBuffers[0].mDataByteSize = *nframes * This->stream->fmt->nBlockAlign; - data->mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; - - if(This->stream->cap_offs_frames + *nframes > This->stream->cap_bufsize_frames){ - UINT32 chunk_frames = This->stream->cap_bufsize_frames - This->stream->cap_offs_frames; - - if(This->feed_wrap_bufsize_frames < *nframes){ - free(This->feed_wrap_buffer); - This->feed_wrap_buffer = malloc(data->mBuffers[0].mDataByteSize); - This->feed_wrap_bufsize_frames = *nframes; - } - - memcpy(This->feed_wrap_buffer, This->stream->cap_buffer + This->stream->cap_offs_frames * This->stream->fmt->nBlockAlign, - chunk_frames * This->stream->fmt->nBlockAlign); - memcpy(This->feed_wrap_buffer + chunk_frames * This->stream->fmt->nBlockAlign, This->stream->cap_buffer, - (*nframes - chunk_frames) * This->stream->fmt->nBlockAlign); - - data->mBuffers[0].mData = This->feed_wrap_buffer; - }else - data->mBuffers[0].mData = This->stream->cap_buffer + This->stream->cap_offs_frames * This->stream->fmt->nBlockAlign; - - This->stream->cap_offs_frames += *nframes; - This->stream->cap_offs_frames %= This->stream->cap_bufsize_frames; - This->stream->cap_held_frames -= *nframes; - - if(packets) - *packets = NULL; - - return noErr; -} - static void capture_resample(ACImpl *This) { - UINT32 resamp_period_frames = MulDiv(This->stream->period_frames, This->stream->dev_desc.mSampleRate, This->stream->fmt->nSamplesPerSec); - OSStatus sc; - - /* the resampling process often needs more source frames than we'd - * guess from a straight conversion using the sample rate ratio. so - * only convert if we have extra source data. */ - while(This->stream->cap_held_frames > resamp_period_frames * 2){ - AudioBufferList converted_list; - UInt32 wanted_frames = This->stream->period_frames; - - converted_list.mNumberBuffers = 1; - converted_list.mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; - converted_list.mBuffers[0].mDataByteSize = wanted_frames * This->stream->fmt->nBlockAlign; - - if(This->stream->resamp_bufsize_frames < wanted_frames){ - HeapFree(GetProcessHeap(), 0, This->stream->resamp_buffer); - This->stream->resamp_buffer = HeapAlloc(GetProcessHeap(), 0, converted_list.mBuffers[0].mDataByteSize); - This->stream->resamp_bufsize_frames = wanted_frames; - } - - converted_list.mBuffers[0].mData = This->stream->resamp_buffer; - - sc = AudioConverterFillComplexBuffer(This->stream->converter, feed_cb, - This, &wanted_frames, &converted_list, NULL); - if(sc != noErr){ - WARN("AudioConverterFillComplexBuffer failed: %x\n", (int)sc); - break; - } - - ca_wrap_buffer(This->stream->local_buffer, - This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign, - This->stream->bufsize_frames * This->stream->fmt->nBlockAlign, - This->stream->resamp_buffer, wanted_frames * This->stream->fmt->nBlockAlign); - - This->stream->wri_offs_frames += wanted_frames; - This->stream->wri_offs_frames %= This->stream->bufsize_frames; - if(This->stream->held_frames + wanted_frames > This->stream->bufsize_frames){ - This->stream->lcl_offs_frames += buf_ptr_diff(This->stream->lcl_offs_frames, - This->stream->wri_offs_frames, This->stream->bufsize_frames); - This->stream->held_frames = This->stream->bufsize_frames; - }else - This->stream->held_frames += wanted_frames; - } + UNIX_CALL(capture_resample, This->stream); } static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 23de92ecfdd..c1762c50e7e 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -100,6 +100,8 @@ enum unix_funcs unix_release_stream, unix_get_mix_format, unix_is_format_supported, + + unix_capture_resample /* temporary */ }; extern unixlib_handle_t coreaudio_handle; -- 2.23.0

2 1

[PATCH 01/12] winecoreaudio: Move is_format_supported to the unixlib.
by Huw Davies Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 65 ++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 255 ++--------------------------- dlls/winecoreaudio.drv/unixlib.h | 11 ++ 3 files changed, 91 insertions(+), 240 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 208655d20c6..f7f7777efcb 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -948,10 +948,75 @@ static NTSTATUS get_mix_format(void *args) return STATUS_SUCCESS; } +static NTSTATUS is_format_supported(void *args) +{ + struct is_format_supported_params *params = args; + const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)params->fmt_in; + AudioStreamBasicDescription dev_desc; + AudioConverterRef converter; + AudioComponentInstance unit; + + 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){ + if(params->fmt_in->cbSize < sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)) + params->result = E_INVALIDARG; + else if(params->fmt_in->nAvgBytesPerSec == 0 || params->fmt_in->nBlockAlign == 0 || + fmtex->Samples.wValidBitsPerSample > params->fmt_in->wBitsPerSample) + params->result = E_INVALIDARG; + else if(fmtex->Samples.wValidBitsPerSample < params->fmt_in->wBitsPerSample) + goto unsupported; + else if(params->share == AUDCLNT_SHAREMODE_EXCLUSIVE && + (fmtex->dwChannelMask == 0 || fmtex->dwChannelMask & SPEAKER_RESERVED)) + goto unsupported; + } + if(FAILED(params->result)) return STATUS_SUCCESS; + + if(params->fmt_in->nBlockAlign != params->fmt_in->nChannels * params->fmt_in->wBitsPerSample / 8 || + params->fmt_in->nAvgBytesPerSec != params->fmt_in->nBlockAlign * params->fmt_in->nSamplesPerSec) + goto unsupported; + + if(params->fmt_in->nChannels == 0){ + params->result = AUDCLNT_E_UNSUPPORTED_FORMAT; + return STATUS_SUCCESS; + } + unit = get_audiounit(params->flow, params->dev_id); + + converter = NULL; + params->result = ca_setup_audiounit(params->flow, unit, params->fmt_in, &dev_desc, &converter); + AudioComponentInstanceDispose(unit); + if(FAILED(params->result)) goto unsupported; + if(converter) AudioConverterDispose(converter); + + params->result = S_OK; + return STATUS_SUCCESS; + +unsupported: + if(params->fmt_out){ + struct get_mix_format_params get_mix_params = + { + .flow = params->flow, + .dev_id = params->dev_id, + .fmt = params->fmt_out, + }; + + get_mix_format(&get_mix_params); + params->result = get_mix_params.result; + if(SUCCEEDED(params->result)) params->result = S_FALSE; + } + else params->result = AUDCLNT_E_UNSUPPORTED_FORMAT; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, create_stream, release_stream, get_mix_format, + is_format_supported, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 2ad2938a5d8..418bbfa00af 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -473,62 +473,6 @@ static BOOL get_deviceid_by_guid(GUID *guid, AudioDeviceID *id, EDataFlow *flow) return FALSE; } -static AudioComponentInstance get_audiounit(EDataFlow dataflow, AudioDeviceID adevid) -{ - AudioComponentInstance unit; - AudioComponent comp; - AudioComponentDescription desc; - OSStatus sc; - - memset(&desc, 0, sizeof(desc)); - desc.componentType = kAudioUnitType_Output; - desc.componentSubType = kAudioUnitSubType_HALOutput; - desc.componentManufacturer = kAudioUnitManufacturer_Apple; - - if(!(comp = AudioComponentFindNext(NULL, &desc))){ - WARN("AudioComponentFindNext failed\n"); - return NULL; - } - - sc = AudioComponentInstanceNew(comp, &unit); - if(sc != noErr){ - WARN("AudioComponentInstanceNew failed: %x\n", (int)sc); - return NULL; - } - - if(dataflow == eCapture){ - UInt32 enableio; - - enableio = 1; - sc = AudioUnitSetProperty(unit, kAudioOutputUnitProperty_EnableIO, - kAudioUnitScope_Input, 1, &enableio, sizeof(enableio)); - if(sc != noErr){ - WARN("Couldn't enable I/O on input element: %x\n", (int)sc); - AudioComponentInstanceDispose(unit); - return NULL; - } - - enableio = 0; - sc = AudioUnitSetProperty(unit, kAudioOutputUnitProperty_EnableIO, - kAudioUnitScope_Output, 0, &enableio, sizeof(enableio)); - if(sc != noErr){ - WARN("Couldn't disable I/O on output element: %x\n", (int)sc); - AudioComponentInstanceDispose(unit); - return NULL; - } - } - - sc = AudioUnitSetProperty(unit, kAudioOutputUnitProperty_CurrentDevice, - kAudioUnitScope_Global, 0, &adevid, sizeof(adevid)); - if(sc != noErr){ - WARN("Couldn't set audio unit device\n"); - AudioComponentInstanceDispose(unit); - return NULL; - } - - return unit; -} - HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out) { ACImpl *This; @@ -689,46 +633,6 @@ static void dump_fmt(const WAVEFORMATEX *fmt) } } -static HRESULT ca_get_audiodesc(AudioStreamBasicDescription *desc, - const WAVEFORMATEX *fmt) -{ - const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)fmt; - - desc->mFormatFlags = 0; - - if(fmt->wFormatTag == WAVE_FORMAT_PCM || - (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ - desc->mFormatID = kAudioFormatLinearPCM; - if(fmt->wBitsPerSample > 8) - desc->mFormatFlags = kAudioFormatFlagIsSignedInteger; - }else if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || - (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ - desc->mFormatID = kAudioFormatLinearPCM; - desc->mFormatFlags = kAudioFormatFlagIsFloat; - }else if(fmt->wFormatTag == WAVE_FORMAT_MULAW || - (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_MULAW))){ - desc->mFormatID = kAudioFormatULaw; - }else if(fmt->wFormatTag == WAVE_FORMAT_ALAW || - (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_ALAW))){ - desc->mFormatID = kAudioFormatALaw; - }else - return AUDCLNT_E_UNSUPPORTED_FORMAT; - - desc->mSampleRate = fmt->nSamplesPerSec; - desc->mBytesPerPacket = fmt->nBlockAlign; - desc->mFramesPerPacket = 1; - desc->mBytesPerFrame = fmt->nBlockAlign; - desc->mChannelsPerFrame = fmt->nChannels; - desc->mBitsPerChannel = fmt->wBitsPerSample; - desc->mReserved = 0; - - return S_OK; -} - static void session_init_vols(AudioSession *session, UINT channels) { if(session->channel_count < channels){ @@ -931,90 +835,6 @@ static void capture_resample(ACImpl *This) } } -static void dump_adesc(const char *aux, AudioStreamBasicDescription *desc) -{ - TRACE("%s: mSampleRate: %f\n", aux, desc->mSampleRate); - TRACE("%s: mBytesPerPacket: %u\n", aux, (unsigned int)desc->mBytesPerPacket); - TRACE("%s: mFramesPerPacket: %u\n", aux, (unsigned int)desc->mFramesPerPacket); - TRACE("%s: mBytesPerFrame: %u\n", aux, (unsigned int)desc->mBytesPerFrame); - TRACE("%s: mChannelsPerFrame: %u\n", aux, (unsigned int)desc->mChannelsPerFrame); - TRACE("%s: mBitsPerChannel: %u\n", aux, (unsigned int)desc->mBitsPerChannel); -} - -static HRESULT ca_setup_audiounit(EDataFlow dataflow, AudioComponentInstance unit, - const WAVEFORMATEX *fmt, AudioStreamBasicDescription *dev_desc, - AudioConverterRef *converter) -{ - OSStatus sc; - HRESULT hr; - - if(dataflow == eCapture){ - AudioStreamBasicDescription desc; - UInt32 size; - Float64 rate; - fenv_t fenv; - BOOL fenv_stored = TRUE; - - hr = ca_get_audiodesc(&desc, fmt); - if(FAILED(hr)) - return hr; - dump_adesc("requested", &desc); - - /* input-only units can't perform sample rate conversion, so we have to - * set up our own AudioConverter to support arbitrary sample rates. */ - size = sizeof(*dev_desc); - sc = AudioUnitGetProperty(unit, kAudioUnitProperty_StreamFormat, - kAudioUnitScope_Input, 1, dev_desc, &size); - if(sc != noErr){ - WARN("Couldn't get unit format: %x\n", (int)sc); - return osstatus_to_hresult(sc); - } - dump_adesc("hardware", dev_desc); - - rate = dev_desc->mSampleRate; - *dev_desc = desc; - dev_desc->mSampleRate = rate; - - dump_adesc("final", dev_desc); - sc = AudioUnitSetProperty(unit, kAudioUnitProperty_StreamFormat, - kAudioUnitScope_Output, 1, dev_desc, sizeof(*dev_desc)); - if(sc != noErr){ - WARN("Couldn't set unit format: %x\n", (int)sc); - return osstatus_to_hresult(sc); - } - - /* AudioConverterNew requires divide-by-zero SSE exceptions to be masked */ - if(feholdexcept(&fenv)){ - WARN("Failed to store fenv state\n"); - fenv_stored = FALSE; - } - - sc = AudioConverterNew(dev_desc, &desc, converter); - - if(fenv_stored && fesetenv(&fenv)) - WARN("Failed to restore fenv state\n"); - - if(sc != noErr){ - WARN("Couldn't create audio converter: %x\n", (int)sc); - return osstatus_to_hresult(sc); - } - }else{ - hr = ca_get_audiodesc(dev_desc, fmt); - if(FAILED(hr)) - return hr; - - dump_adesc("final", dev_desc); - sc = AudioUnitSetProperty(unit, kAudioUnitProperty_StreamFormat, - kAudioUnitScope_Input, 0, dev_desc, sizeof(*dev_desc)); - if(sc != noErr){ - WARN("Couldn't set format: %x\n", (int)sc); - return osstatus_to_hresult(sc); - } - } - - return S_OK; -} - static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, REFERENCE_TIME period, const WAVEFORMATEX *fmt, @@ -1298,75 +1118,30 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, WAVEFORMATEX **outpwfx) { ACImpl *This = impl_from_IAudioClient3(iface); - AudioStreamBasicDescription dev_desc; - AudioConverterRef converter; - AudioComponentInstance unit; - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)pwfx; - HRESULT hr; + struct is_format_supported_params params; TRACE("(%p)->(%x, %p, %p)\n", This, mode, pwfx, outpwfx); + if(pwfx) dump_fmt(pwfx); - if(!pwfx || (mode == AUDCLNT_SHAREMODE_SHARED && !outpwfx)) - return E_POINTER; - - if(mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE) - return E_INVALIDARG; - - if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - pwfx->cbSize < sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)) - return E_INVALIDARG; - - dump_fmt(pwfx); + params.dev_id = This->adevid; + params.flow = This->dataflow; + params.share = mode; + params.fmt_in = pwfx; + params.fmt_out = NULL; if(outpwfx){ *outpwfx = NULL; - if(mode != AUDCLNT_SHAREMODE_SHARED) - outpwfx = NULL; - } - - if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ - if(pwfx->nAvgBytesPerSec == 0 || - pwfx->nBlockAlign == 0 || - fmtex->Samples.wValidBitsPerSample > pwfx->wBitsPerSample) - return E_INVALIDARG; - if(fmtex->Samples.wValidBitsPerSample < pwfx->wBitsPerSample) - goto unsupported; - if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE){ - if(fmtex->dwChannelMask == 0 || - fmtex->dwChannelMask & SPEAKER_RESERVED) - goto unsupported; - } + if(mode == AUDCLNT_SHAREMODE_SHARED) + params.fmt_out = CoTaskMemAlloc(sizeof(*params.fmt_out)); } + UNIX_CALL(is_format_supported, &params); - if(pwfx->nBlockAlign != pwfx->nChannels * pwfx->wBitsPerSample / 8 || - pwfx->nAvgBytesPerSec != pwfx->nBlockAlign * pwfx->nSamplesPerSec) - goto unsupported; - - if(pwfx->nChannels == 0) - return AUDCLNT_E_UNSUPPORTED_FORMAT; - - unit = get_audiounit(This->dataflow, This->adevid); - - converter = NULL; - hr = ca_setup_audiounit(This->dataflow, unit, pwfx, &dev_desc, &converter); - AudioComponentInstanceDispose(unit); - if(FAILED(hr)) - goto unsupported; - - if(converter) - AudioConverterDispose(converter); - - return S_OK; - -unsupported: - if(outpwfx){ - hr = IAudioClient3_GetMixFormat(&This->IAudioClient3_iface, outpwfx); - if(FAILED(hr)) - return hr; - return S_FALSE; - } + if(params.result == S_FALSE) + *outpwfx = &params.fmt_out->Format; + else + CoTaskMemFree(params.fmt_out); - return AUDCLNT_E_UNSUPPORTED_FORMAT; + return params.result; } static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index e247b789d55..23de92ecfdd 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -83,12 +83,23 @@ struct get_mix_format_params HRESULT result; }; +struct is_format_supported_params +{ + EDataFlow flow; + DWORD dev_id; + AUDCLNT_SHAREMODE share; + const WAVEFORMATEX *fmt_in; + WAVEFORMATEXTENSIBLE *fmt_out; + HRESULT result; +}; + enum unix_funcs { unix_get_endpoint_ids, unix_create_stream, unix_release_stream, unix_get_mix_format, + unix_is_format_supported, }; extern unixlib_handle_t coreaudio_handle; -- 2.23.0

2 1

[PATCH] po: Update Traditional Chinese translation.
by Chilung Chan Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Chilung Chan <eason066(a)gmail.com> --- Corrected the formatting of translation. My last patch seems to break down something on translation progress site. po/zh_TW.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 3371b0a1267..67c973cb091 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-11-20 21:33+0800\n" +"PO-Revision-Date: 2021-11-23 14:40+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -17352,7 +17352,7 @@ msgid "" "WARNING: Debugging this process may result in loss of data.\n" "Are you sure you wish to attach the debugger?" msgstr "" -"警告：對這個處理程序進行除錯可能會導致資料遺失。\n" +"警告: 對這個處理程序進行除錯可能會導致資料遺失。\n" "您確定要附加除錯程式嗎?" #: programs/taskmgr/taskmgr.rc:314 @@ -17440,8 +17440,8 @@ msgid "" msgstr "" "用法:\n" " uninstaller [選項]\n" -"選項:\n" "\n" +"選項:\n" " --help\t 顯示這個資訊。\n" " --list\t 列出安裝在這個 Wine prefix 中的所有應用程式。\n" " --remove {GUID} 解除安裝指定的應用程式。\n" -- 2.33.0.windows.2

2 1

[PATCH] windows.media.speech: Add stub SpeechSynthesizer class.
by Paul Gofman Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/windows.media.speech/main.c | 143 +++++++++++++++++++++- dlls/windows.media.speech/tests/speech.c | 19 ++- include/Makefile.in | 1 + include/windows.media.idl | 48 ++++++++ include/windows.media.speechsynthesis.idl | 41 +++++++ 5 files changed, 249 insertions(+), 3 deletions(-) create mode 100644 include/windows.media.idl diff --git a/dlls/windows.media.speech/main.c b/dlls/windows.media.speech/main.c index e34fa9d16b8..1802d19dff8 100644 --- a/dlls/windows.media.speech/main.c +++ b/dlls/windows.media.speech/main.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "winstring.h" #include "wine/debug.h" +#include "wine/heap.h" #include "objbase.h" #include "initguid.h" @@ -171,6 +172,132 @@ static struct voice_information_vector all_voices = 0 }; +struct speech_synthesizer +{ + ISpeechSynthesizer ISpeechSynthesizer_iface; + LONG ref; +}; + +static inline struct speech_synthesizer *impl_from_ISpeechSynthesizer(ISpeechSynthesizer *iface) +{ + return CONTAINING_RECORD(iface, struct speech_synthesizer, ISpeechSynthesizer_iface); +} + +static HRESULT STDMETHODCALLTYPE speech_synthesizer_QueryInterface( + ISpeechSynthesizer *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_ISpeechSynthesizer)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE speech_synthesizer_AddRef( + ISpeechSynthesizer *iface) +{ + struct speech_synthesizer *impl = impl_from_ISpeechSynthesizer(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + + TRACE("iface %p, ref %u.\n", iface, ref); + + return ref; +} + +static ULONG STDMETHODCALLTYPE speech_synthesizer_Release( + ISpeechSynthesizer *iface) +{ + struct speech_synthesizer *impl = impl_from_ISpeechSynthesizer(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + + TRACE("iface %p, ref %u.\n", iface, ref); + + if (!ref) + heap_free(impl); + + return ref; +} + +static HRESULT STDMETHODCALLTYPE speech_synthesizer_GetIids( + ISpeechSynthesizer *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub.\n", iface, iid_count, iids); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE speech_synthesizer_GetRuntimeClassName( + ISpeechSynthesizer *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub.\n", iface, class_name); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE speech_synthesizer_GetTrustLevel( + ISpeechSynthesizer *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub.\n", iface, trust_level); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE speech_synthesizer_SynthesizeTextToStreamAsync(ISpeechSynthesizer *iface, + HSTRING text, IAsyncOperation_SpeechSynthesisStream **operation) +{ + FIXME("iface %p, text %p, operation %p stub.\n", iface, text, operation); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE speech_synthesizer_SynthesizeSsmlToStreamAsync(ISpeechSynthesizer *iface, + HSTRING ssml, IAsyncOperation_SpeechSynthesisStream **operation) +{ + FIXME("iface %p, text %p, operation %p stub.\n", iface, ssml, operation); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE speech_synthesizer_put_Voice(ISpeechSynthesizer *iface, IVoiceInformation *value) +{ + FIXME("iface %p, value %p stub.\n", iface, value); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE speech_synthesizer_get_Voice(ISpeechSynthesizer *iface, IVoiceInformation **value) +{ + FIXME("iface %p, value %p stub.\n", iface, value); + + return E_NOTIMPL; +} + +static const struct ISpeechSynthesizerVtbl speech_synthesizer_vtbl = +{ + /* IUnknown methods */ + speech_synthesizer_QueryInterface, + speech_synthesizer_AddRef, + speech_synthesizer_Release, + /* IInspectable methods */ + speech_synthesizer_GetIids, + speech_synthesizer_GetRuntimeClassName, + speech_synthesizer_GetTrustLevel, + /* ISpeechSynthesizer methods */ + speech_synthesizer_SynthesizeTextToStreamAsync, + speech_synthesizer_SynthesizeSsmlToStreamAsync, + speech_synthesizer_put_Voice, + speech_synthesizer_get_Voice, +}; + struct windows_media_speech { IActivationFactory IActivationFactory_iface; @@ -259,8 +386,20 @@ static HRESULT STDMETHODCALLTYPE windows_media_speech_GetTrustLevel( static HRESULT STDMETHODCALLTYPE windows_media_speech_ActivateInstance( IActivationFactory *iface, IInspectable **instance) { - FIXME("iface %p, instance %p stub!\n", iface, instance); - return E_NOTIMPL; + struct speech_synthesizer *obj; + + TRACE("iface %p, instance %p.\n", iface, instance); + + if (!(obj = heap_alloc_zero(sizeof(*obj)))) + { + *instance = NULL; + return E_OUTOFMEMORY; + } + + obj->ISpeechSynthesizer_iface.lpVtbl = &speech_synthesizer_vtbl; + obj->ref = 1; + *instance = (IInspectable *)&obj->ISpeechSynthesizer_iface; + return S_OK; } static const struct IActivationFactoryVtbl activation_factory_vtbl = diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index c949b35900b..e27a2bfa4d4 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -44,9 +44,11 @@ static void test_SpeechSynthesizer(void) IVoiceInformation *voice; IInspectable *inspectable = NULL, *tmp_inspectable = NULL; IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; + ISpeechSynthesizer *synthesizer; HSTRING str; HRESULT hr; UINT32 size; + ULONG ref; hr = RoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); @@ -107,8 +109,23 @@ static void test_SpeechSynthesizer(void) IAgileObject_Release(agile_object); IInspectable_Release(inspectable); - IActivationFactory_Release(factory); + hr = IActivationFactory_QueryInterface(factory, &IID_ISpeechSynthesizer, (void **)&synthesizer); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + + hr = RoActivateInstance(str, &inspectable); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IInspectable_QueryInterface(inspectable, &IID_ISpeechSynthesizer, (void **)&synthesizer); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ref = ISpeechSynthesizer_Release(synthesizer); + ok(ref == 1, "Got unexpected ref %u.\n", ref); + + ref = IInspectable_Release(inspectable); + ok(!ref, "Got unexpected ref %u.\n", ref); + + IActivationFactory_Release(factory); WindowsDeleteString(str); RoUninitialize(); diff --git a/include/Makefile.in b/include/Makefile.in index 756e25dcc82..530c5b73f19 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -775,6 +775,7 @@ SOURCES = \ windows.gaming.input.idl \ windows.globalization.idl \ windows.h \ + windows.media.idl \ windows.media.devices.idl \ windows.media.speechsynthesis.idl \ windows.storage.streams.idl \ diff --git a/include/windows.media.idl b/include/windows.media.idl new file mode 100644 index 00000000000..94a9a516245 --- /dev/null +++ b/include/windows.media.idl @@ -0,0 +1,48 @@ +/* + * Copyright 2021 Paul Gofman for CodeWeavers + * + * 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "windows.foundation.idl"; + +namespace Windows { + namespace Media { + apicontract MediaControlContract; + interface IMediaControl; + } +} + +namespace Windows { + namespace Media { + [contractversion(1.0)] + apicontract MediaControlContract { + } + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [uuid(1803def8-dca5-4b6f-9c20-e3d3c0643625)] + interface IMediaMarker : IInspectable + { + [propget] HRESULT Time([out] [retval] Windows.Foundation.TimeSpan* value); + [propget] HRESULT MediaMarkerType([out] [retval] HSTRING* value); + [propget] HRESULT Text([out] [retval] HSTRING* value); + } + } +} diff --git a/include/windows.media.speechsynthesis.idl b/include/windows.media.speechsynthesis.idl index af4466681dc..169dfdf5a5e 100644 --- a/include/windows.media.speechsynthesis.idl +++ b/include/windows.media.speechsynthesis.idl @@ -22,6 +22,7 @@ import "inspectable.idl"; import "windows.foundation.idl"; +import "windows.media.idl"; namespace Windows { namespace Foundation { @@ -35,12 +36,20 @@ namespace Windows { interface ISpeechSynthesizer; interface ISpeechSynthesizer2; interface IVoiceInformation; + interface ISpeechSynthesisStream; runtimeclass SpeechSynthesizer; runtimeclass VoiceInformation; + runtimeclass SpeechSynthesisStream; } } } +namespace Windows { + namespace Media { + interface IMediaMarker; + } +} + namespace Windows { namespace Media { namespace SpeechSynthesis { @@ -48,6 +57,9 @@ namespace Windows { interface Windows.Foundation.Collections.IIterator<Windows.Media.SpeechSynthesis.VoiceInformation*>; interface Windows.Foundation.Collections.IIterable<Windows.Media.SpeechSynthesis.VoiceInformation*>; interface Windows.Foundation.Collections.IVectorView<Windows.Media.SpeechSynthesis.VoiceInformation*>; + interface Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>; + interface Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>; } } } @@ -63,6 +75,27 @@ namespace Windows { Female = 1 }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesisStream)] + [uuid(83E46E93-244C-4622-BA0B-6229C4D0D65D)] + interface ISpeechSynthesisStream : IInspectable + { + [propget] HRESULT Markers([out] [retval] Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>** value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizer), + uuid(ce9f7c76-97f4-4ced-ad68-d51c458e45c6) + ] + interface ISpeechSynthesizer : IInspectable + { + HRESULT SynthesizeTextToStreamAsync([in] HSTRING text, [out] [retval] Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*> **operation); + HRESULT SynthesizeSsmlToStreamAsync([in] HSTRING Ssml, [out] [retval] Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*> **operation); + [propput] HRESULT Voice([in] VoiceInformation *value); + [propget] HRESULT Voice([out] [retval] VoiceInformation **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechSynthesis.VoiceInformation), @@ -97,6 +130,14 @@ namespace Windows { [default] interface Windows.Media.SpeechSynthesis.IVoiceInformation; } + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [marshaling_behavior(agile)] + runtimeclass SpeechSynthesisStream + { + [default] interface Windows.Media.SpeechSynthesis.ISpeechSynthesisStream; + } + [ activatable(Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0), -- 2.33.1

3 2

[PATCH 1/3] chcp: Add internationalization support
by Hugh McMaster Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/chcp.com/Makefile.in | 5 ++- programs/chcp.com/chcp.rc | 29 ++++++++++++++ programs/chcp.com/main.c | 75 ++++++++++++++++++++++++++++++++--- programs/chcp.com/resource.h | 24 +++++++++++ 4 files changed, 127 insertions(+), 6 deletions(-) create mode 100644 programs/chcp.com/chcp.rc create mode 100644 programs/chcp.com/resource.h diff --git a/programs/chcp.com/Makefile.in b/programs/chcp.com/Makefile.in index 46ed25f3cea..2f6d273990a 100644 --- a/programs/chcp.com/Makefile.in +++ b/programs/chcp.com/Makefile.in @@ -1,6 +1,9 @@ -MODULE = chcp.com +MODULE = chcp.com +DELAYIMPORTS = user32 EXTRADLLFLAGS = -mconsole -municode C_SRCS = \ main.c + +RC_SRCS = chcp.rc diff --git a/programs/chcp.com/chcp.rc b/programs/chcp.com/chcp.rc new file mode 100644 index 00000000000..04d90d05942 --- /dev/null +++ b/programs/chcp.com/chcp.rc @@ -0,0 +1,29 @@ +/* + * Copyright 2021 Hugh McMaster + * + * 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 "resource.h" + +#pragma makedep po + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_ACTIVE_CODE_PAGE, "Active code page: %1!u!\n" + STRING_INVALID_CODE_PAGE, "Invalid code page\n" +} diff --git a/programs/chcp.com/main.c b/programs/chcp.com/main.c index 6ace10cf93e..5b3486a4366 100644 --- a/programs/chcp.com/main.c +++ b/programs/chcp.com/main.c @@ -16,20 +16,85 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" +#include <windows.h> +#include <stdlib.h> +#include "resource.h" -#include "wincon.h" -#include "stdlib.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(chcp); +static void output_writeconsole(const WCHAR *str, DWORD wlen) +{ + DWORD count, ret; + + ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL); + if (!ret) + { + DWORD len; + char *msgA; + + /* On Windows WriteConsoleW() fails if the output is redirected. So fall + * back to WriteFile(), assuming the console encoding is still the right + * one in that case. + */ + len = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, NULL, 0, NULL, NULL); + msgA = malloc(len); + + WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); + free(msgA); + } +} + +static void output_formatstring(const WCHAR *fmt, va_list va_args) +{ + WCHAR *str; + DWORD len; + + len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, + fmt, 0, 0, (WCHAR *)&str, 0, &va_args); + if (!len && GetLastError() != ERROR_NO_WORK_DONE) + { + WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); + return; + } + output_writeconsole(str, len); + LocalFree(str); +} + +static void WINAPIV output_message(unsigned int id, ...) +{ + WCHAR *fmt = NULL; + int len; + va_list va_args; + + if (!(len = LoadStringW(GetModuleHandleW(NULL), id, (WCHAR *)&fmt, 0))) + { + WINE_FIXME("LoadString failed with %d\n", GetLastError()); + return; + } + + len++; + fmt = malloc(len * sizeof(WCHAR)); + if (!fmt) return; + + LoadStringW(GetModuleHandleW(NULL), id, fmt, len); + + va_start(va_args, id); + output_formatstring(fmt, va_args); + va_end(va_args); + + free(fmt); +} + int __cdecl wmain(int argc, WCHAR *argv[]) { int i; if (argc == 1) { - printf("Active code page: %d\n", GetConsoleCP()); + output_message(STRING_ACTIVE_CODE_PAGE, GetConsoleCP()); return 0; } else if (argc == 2) @@ -39,7 +104,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (!success) { - printf("Invalid code page\n"); + output_message(STRING_INVALID_CODE_PAGE); } return !success; } diff --git a/programs/chcp.com/resource.h b/programs/chcp.com/resource.h new file mode 100644 index 00000000000..200cbb11d18 --- /dev/null +++ b/programs/chcp.com/resource.h @@ -0,0 +1,24 @@ +/* + * Copyright 2021 Hugh McMaster + * + * 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 <windef.h> + +/* Translation IDs */ + +#define STRING_ACTIVE_CODE_PAGE 100 +#define STRING_INVALID_CODE_PAGE 101 -- 2.34.0

1 2

[PATCH] dxva2: Introduce progressive processor device.
by Nikolay Sivov Nov. 23, 2021

Nov. 23, 2021

The point is to provide a device, with similar caps and NV12 support, while keeping software device on its own, the way it should be. This is based on research by Derek Lesho. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/main.c | 126 +++++++++++++++++++++++++++------ dlls/dxva2/tests/dxva2.c | 149 +++++++++++++++++++++++++++++++++++++++ dlls/evr/mixer.c | 2 + 3 files changed, 257 insertions(+), 20 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 401b5cc976b..5beac4164a6 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -34,6 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxva2); +#define D3DFMT_NV12 MAKEFOURCC('N','V','1','2') + enum device_handle_flags { HANDLE_FLAG_OPEN = 0x1, @@ -125,6 +127,22 @@ static struct video_processor *impl_from_IDirectXVideoProcessor(IDirectXVideoPro return CONTAINING_RECORD(iface, struct video_processor, IDirectXVideoProcessor_iface); } +static const DXVA2_VideoProcessorCaps software_processor_caps = +{ + .DeviceCaps = DXVA2_VPDev_SoftwareDevice, + .InputPool = D3DPOOL_SYSTEMMEM, + .VideoProcessorOperations = DXVA2_VideoProcess_PlanarAlpha | DXVA2_VideoProcess_YUV2RGB | + DXVA2_VideoProcess_StretchX | DXVA2_VideoProcess_StretchY | DXVA2_VideoProcess_SubRects | + DXVA2_VideoProcess_SubStreams | DXVA2_VideoProcess_SubStreamsExtended | DXVA2_VideoProcess_YUV2RGBExtended, +}; + +static const DXVA2_VideoProcessorCaps progressive_processor_caps = +{ + .DeviceCaps = DXVA2_VPDev_HardwareDevice, + .InputPool = D3DPOOL_DEFAULT, + .VideoProcessorOperations = DXVA2_VideoProcess_YUV2RGB | DXVA2_VideoProcess_StretchX | DXVA2_VideoProcess_StretchY, +}; + static HRESULT WINAPI video_processor_QueryInterface(IDirectXVideoProcessor *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IDirectXVideoProcessor) || @@ -210,12 +228,11 @@ static HRESULT WINAPI video_processor_GetVideoProcessorCaps(IDirectXVideoProcess if (IsEqualGUID(&processor->device, &DXVA2_VideoProcSoftwareDevice)) { - memset(caps, 0, sizeof(*caps)); - caps->DeviceCaps = DXVA2_VPDev_SoftwareDevice; - caps->InputPool = D3DPOOL_SYSTEMMEM; - caps->VideoProcessorOperations = DXVA2_VideoProcess_PlanarAlpha | DXVA2_VideoProcess_YUV2RGB | - DXVA2_VideoProcess_StretchX | DXVA2_VideoProcess_StretchY | DXVA2_VideoProcess_SubRects | - DXVA2_VideoProcess_SubStreams | DXVA2_VideoProcess_SubStreamsExtended | DXVA2_VideoProcess_YUV2RGBExtended; + *caps = software_processor_caps; + } + else if (IsEqualGUID(&processor->device, &DXVA2_VideoProcProgressiveDevice)) + { + *caps = progressive_processor_caps; } else { @@ -419,28 +436,66 @@ static HRESULT WINAPI device_manager_processor_service_RegisterVideoProcessorSof return E_NOTIMPL; } -static BOOL dxva_is_supported_stream_format(const DXVA2_VideoDesc *video_desc) +struct dxva_processor_device_desc +{ + const GUID *guid; + const D3DFORMAT *input_formats; +}; + +static const D3DFORMAT software_processor_input_formats[] = { - return video_desc->Format == D3DFMT_A8R8G8B8 || - video_desc->Format == D3DFMT_X8R8G8B8 || - video_desc->Format == D3DFMT_YUY2; + D3DFMT_A8R8G8B8, D3DFMT_X8R8G8B8, D3DFMT_YUY2, 0 +}; + +static const D3DFORMAT progressive_processor_input_formats[] = +{ + D3DFMT_A8R8G8B8, D3DFMT_X8R8G8B8, D3DFMT_YUY2, D3DFMT_NV12, 0 +}; + +static const struct dxva_processor_device_desc processor_devices[] = +{ + { &DXVA2_VideoProcProgressiveDevice, progressive_processor_input_formats }, + { &DXVA2_VideoProcSoftwareDevice, software_processor_input_formats }, +}; + +static BOOL dxva_is_supported_stream_format(const DXVA2_VideoDesc *video_desc, const D3DFORMAT *formats) +{ + while (*formats) + { + if (*formats == video_desc->Format) return TRUE; + formats++; + } + + return FALSE; } static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorDeviceGuids( IDirectXVideoProcessorService *iface, const DXVA2_VideoDesc *video_desc, UINT *count, GUID **guids) { + unsigned int i; + FIXME("%p, %p, %p, %p semi-stub.\n", iface, video_desc, count, guids); *count = 0; - if (!dxva_is_supported_stream_format(video_desc)) - return E_FAIL; - - if (!(*guids = CoTaskMemAlloc(sizeof(**guids)))) + if (!(*guids = CoTaskMemAlloc(ARRAY_SIZE(processor_devices) * sizeof(**guids)))) return E_OUTOFMEMORY; - memcpy(*guids, &DXVA2_VideoProcSoftwareDevice, sizeof(**guids)); - *count = 1; + for (i = 0; i < ARRAY_SIZE(processor_devices); ++i) + { + if (dxva_is_supported_stream_format(video_desc, processor_devices[i].input_formats)) + { + (*guids)[*count] = *processor_devices[i].guid; + *count += 1; + } + } + + if (!*count) + { + CoTaskMemFree(*guids); + *guids = NULL; + return E_FAIL; + } return S_OK; } @@ -453,7 +508,7 @@ static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorRenderTa if (IsEqualGUID(deviceguid, &DXVA2_VideoProcSoftwareDevice)) { - if (!dxva_is_supported_stream_format(video_desc)) + if (!dxva_is_supported_stream_format(video_desc, software_processor_input_formats)) { WARN("Unsupported content format %#x.\n", video_desc->Format); return E_FAIL; @@ -468,6 +523,23 @@ static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorRenderTa return S_OK; } + else if (IsEqualGUID(deviceguid, &DXVA2_VideoProcProgressiveDevice)) + { + if (!dxva_is_supported_stream_format(video_desc, progressive_processor_input_formats)) + { + WARN("Unsupported content format %#x.\n", video_desc->Format); + return E_FAIL; + } + + if (!(*formats = CoTaskMemAlloc(2 * sizeof(**formats)))) + return E_OUTOFMEMORY; + + *count = 2; + (*formats)[0] = D3DFMT_X8R8G8B8; + (*formats)[1] = D3DFMT_NV12; + + return S_OK; + } else FIXME("Unsupported device %s.\n", debugstr_guid(deviceguid)); @@ -484,12 +556,26 @@ static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorSubStrea } static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorCaps( - IDirectXVideoProcessorService *iface, REFGUID deviceguid, const DXVA2_VideoDesc *video_desc, + IDirectXVideoProcessorService *iface, REFGUID device, const DXVA2_VideoDesc *video_desc, D3DFORMAT rt_format, DXVA2_VideoProcessorCaps *caps) { - FIXME("%p, %s, %p, %u, %p.\n", iface, debugstr_guid(deviceguid), video_desc, rt_format, caps); + TRACE("%p, %s, %p, %u, %p.\n", iface, debugstr_guid(device), video_desc, rt_format, caps); - return E_NOTIMPL; + if (IsEqualGUID(device, &DXVA2_VideoProcSoftwareDevice)) + { + *caps = software_processor_caps; + } + else if (IsEqualGUID(device, &DXVA2_VideoProcProgressiveDevice)) + { + *caps = progressive_processor_caps; + } + else + { + FIXME("Unrecognized device %s.\n", debugstr_guid(device)); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI device_manager_processor_service_GetProcAmpRange( diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index e3307032ad4..01f8f568e6a 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -546,8 +546,157 @@ done: DestroyWindow(window); } +static BOOL check_format_list(D3DFORMAT format, const D3DFORMAT *list, unsigned int count) +{ + unsigned int i; + for (i = 0; i < count; ++i) + if (list[i] == format) return TRUE; + return FALSE; +} + +static void test_progressive_device(void) +{ + static const unsigned int processor_ops = DXVA2_VideoProcess_YUV2RGB | + DXVA2_VideoProcess_StretchX | DXVA2_VideoProcess_StretchY; + IDirectXVideoProcessorService *service; + IDirectXVideoProcessor *processor; + IDirect3DDeviceManager9 *manager; + D3DFORMAT format, *rt_formats; + DXVA2_VideoProcessorCaps caps; + DXVA2_VideoDesc video_desc; + IDirect3DDevice9 *device; + unsigned int count, i, j; + GUID guid, *guids; + IDirect3D9 *d3d; + HANDLE handle; + HWND window; + UINT token; + HRESULT hr; + + static const D3DFORMAT input_formats[] = + { + D3DFMT_A8R8G8B8, + D3DFMT_X8R8G8B8, + D3DFMT_YUY2, + MAKEFOURCC('N','V','1','2'), + }; + + static const D3DFORMAT support_rt_formats[] = + { + D3DFMT_X8R8G8B8, + MAKEFOURCC('N','V','1','2'), + D3DFMT_YUY2, + }; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + handle = NULL; + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoProcessorService, + (void **)&service); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + memset(&video_desc, 0, sizeof(video_desc)); + video_desc.SampleWidth = 64; + video_desc.SampleHeight = 64; + video_desc.Format = MAKEFOURCC('N','V','1','2'); + + hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &DXVA2_VideoProcProgressiveDevice, &video_desc, + D3DFMT_A8R8G8B8, 0, &processor); + if (FAILED(hr)) + { + win_skip("VideoProcProgressiveDevice is not supported.\n"); + goto unsupported; + } + IDirectXVideoProcessor_Release(processor); + + for (i = 0; i < ARRAY_SIZE(input_formats); ++i) + { + init_video_desc(&video_desc, input_formats[i]); + + /* Check that progressive device is returned for given input format. */ + count = 0; + hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(service, &video_desc, &count, &guids); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count > 0, "Unexpected device count.\n"); + for (j = 0; j < count; ++j) + { + if (IsEqualGUID(&guids[j], &DXVA2_VideoProcProgressiveDevice)) break; + } + ok(j < count, "Expected progressive device for format %#x.\n", input_formats[i]); + CoTaskMemFree(guids); + + count = 0; + hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(service, &DXVA2_VideoProcProgressiveDevice, + &video_desc, &count, &rt_formats); + ok(hr == S_OK, "Unexpected hr %#x, format %d.\n", hr, input_formats[i]); + ok(count > 0, "Unexpected format count %u.\n", count); + for (j = 0; j < count; ++j) + { + ok(check_format_list(rt_formats[j], support_rt_formats, ARRAY_SIZE(support_rt_formats)), + "Unexpected rt format %#x for input format %#x.\n", rt_formats[j], input_formats[i]); + } + CoTaskMemFree(rt_formats); + } + + memset(&video_desc, 0, sizeof(video_desc)); + video_desc.SampleWidth = 64; + video_desc.SampleHeight = 64; + video_desc.Format = MAKEFOURCC('N','V','1','2'); + + hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &DXVA2_VideoProcProgressiveDevice, &video_desc, + D3DFMT_A8R8G8B8, 0, &processor); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirectXVideoProcessor_GetVideoProcessorCaps(processor, &caps); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(caps.DeviceCaps == DXVA2_VPDev_HardwareDevice, "Unexpected device type %#x.\n", caps.DeviceCaps); + ok(caps.InputPool == D3DPOOL_DEFAULT, "Unexpected input pool %#x.\n", caps.InputPool); + ok(!caps.NumForwardRefSamples, "Unexpected sample count.\n"); + ok(!caps.NumBackwardRefSamples, "Unexpected sample count.\n"); + ok(!caps.Reserved, "Unexpected field.\n"); + ok((caps.VideoProcessorOperations & processor_ops) == processor_ops, "Unexpected processor operations %#x.\n", + caps.VideoProcessorOperations); + + hr = IDirectXVideoProcessor_GetCreationParameters(processor, &guid, NULL, &format, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &DXVA2_VideoProcProgressiveDevice), "Unexpected device guid.\n"); + ok(format == D3DFMT_A8R8G8B8, "Unexpected format %u.\n", format); + + IDirectXVideoProcessor_Release(processor); + +unsupported: + IDirectXVideoProcessorService_Release(service); + + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDirect3DDevice9_Release(device); + IDirect3DDeviceManager9_Release(manager); + +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(dxva2) { test_device_manager(); test_video_processor(); + test_progressive_device(); } diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 8fe80c2f4a9..5af5b2861b3 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -956,6 +956,8 @@ static HRESULT WINAPI video_mixer_transform_SetOutputType(IMFTransform *iface, D if (SUCCEEDED(hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &mixer->output.rt_formats[i].device, &video_desc, rt_format, MAX_MIXER_INPUT_SUBSTREAMS, &mixer->processor))) { + ERR("picked dxva device %s\n", debugstr_guid(&mixer->output.rt_formats[i].device)); + if (FAILED(IMFMediaType_GetBlob(type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&mixer->aperture, sizeof(mixer->aperture), NULL))) { -- 2.33.0

1 0

[PATCH] d3d10/effect: Fix freed register table pointer (Coverity).
by Nikolay Sivov Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 1b2aeb910af..cd6a3cfb238 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -319,7 +319,7 @@ static void d3d10_effect_preshader_clear(struct d3d10_effect_preshader *p) unsigned int i; for (i = 0; i < ARRAY_SIZE(p->reg_tables); ++i) - heap_free(&p->reg_tables[i].f); + heap_free(p->reg_tables[i].f); if (p->code) ID3D10Blob_Release(p->code); heap_free(p->vars); -- 2.33.0

2 1

[v2 PATCH 1/2] d3d10/effect: Parse through value expressions.
by Nikolay Sivov Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 35 +++++++++++++++++ dlls/d3d10/tests/effect.c | 78 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 7f83fb1182a..b35711b55e5 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -52,6 +52,7 @@ enum d3d10_effect_object_operation D3D10_EOO_CONST_INDEX = 3, D3D10_EOO_VAR_INDEX = 4, D3D10_EOO_INDEX_EXPRESSION = 5, + D3D10_EOO_VALUE_EXPRESSION = 6, D3D10_EOO_ANONYMOUS_SHADER = 7, }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3f35e9cc28a..d763c3fdeaf 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -289,6 +289,10 @@ struct d3d10_effect_prop_dependency struct d3d10_effect_variable *v; struct d3d10_effect_preshader index; } index_expr; + struct + { + struct d3d10_effect_preshader value; + } value_expr; }; }; @@ -392,6 +396,9 @@ static void d3d10_effect_clear_prop_dependencies(struct d3d10_effect_prop_depend case D3D10_EOO_INDEX_EXPRESSION: d3d10_effect_preshader_clear(&dep->index_expr.index); break; + case D3D10_EOO_VALUE_EXPRESSION: + d3d10_effect_preshader_clear(&dep->value_expr.value); + break; } } heap_free(d->entries); @@ -2632,6 +2639,34 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size return d3d10_effect_add_prop_dependency(d, &dep); + case D3D10_EOO_VALUE_EXPRESSION: + + if (value_offset >= data_size || !require_space(value_offset, 1, sizeof(uint32_t), data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", value_offset, (long)data_size); + return E_FAIL; + } + + data_ptr = data + value_offset; + read_dword(&data_ptr, &blob_size); + + if (!require_space(value_offset, 1, sizeof(uint32_t) + blob_size, data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", value_offset, (long)data_size); + return E_FAIL; + } + + dep.id = id; + dep.idx = idx; + dep.operation = operation; + if (FAILED(hr = parse_fx10_preshader(data_ptr, blob_size, effect, &dep.value_expr.value))) + { + WARN("Failed to parse preshader, hr %#x.\n", hr); + return hr; + } + + return d3d10_effect_add_prop_dependency(d, &dep); + case D3D10_EOO_ANONYMOUS_SHADER: /* Anonymous shader */ diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 7c2bba6d818..eae0036c0b6 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -7947,6 +7947,83 @@ static void test_effect_index_expression(void) ok(!refcount, "Device has %u references left.\n", refcount); } +#if 0 +float4 g_var; +float4 g_var2; +technique10 tech +{ + pass p0 + { + SetBlendState( NULL, g_var + 0.1f + g_var2, 0 ); + } + pass p1 + { + SetBlendState( NULL, g_var.x + g_var2 + g_var.y, 0 ); + } +} +#endif +static DWORD fx_test_value_expression[] = +{ + 0x43425844, 0xe517f17c, 0xe44eaede, 0xe4fd1240, 0xc67d5084, 0x00000001, 0x0000047c, 0x00000001, + 0x00000024, 0x30315846, 0x00000450, 0xfeff1001, 0x00000001, 0x00000002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00000330, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6f6c4724, + 0x736c6162, 0x6f6c6600, 0x00347461, 0x0000000d, 0x00000001, 0x00000000, 0x00000010, 0x00000010, + 0x00000010, 0x0000210a, 0x61765f67, 0x5f670072, 0x32726176, 0x63657400, 0x30700068, 0x00016000, + 0x42584400, 0x312ce543, 0xc3ebc897, 0xea47c0a2, 0x8a710323, 0x000001d2, 0x00016000, 0x00000300, + 0x00002c00, 0x0000d400, 0x0000f000, 0x41544300, 0x0000a042, 0x00001c00, 0x00007700, 0x58040000, + 0x00000246, 0x00001c00, 0x00010000, 0x00007400, 0x00004400, 0x00000200, 0x00000100, 0x00004c00, + 0x00000000, 0x00005c00, 0x01000200, 0x00000100, 0x00006400, 0x00000000, 0x765f6700, 0xab007261, + 0x030001ab, 0x04000100, 0x00000100, 0x00000000, 0x765f6700, 0x00327261, 0x030001ab, 0x04000100, + 0x00000100, 0x00000000, 0x00787400, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, + 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x494c43ab, 0x00001434, 0x00000400, + 0xcccccd00, 0x0000003d, 0x00000000, 0x00000000, 0x4c584600, 0x00006843, 0x00000200, 0x40000400, + 0x00000220, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0x00000200, 0x00000400, 0x00000000, + 0x00000700, 0x00000000, 0x40000400, 0x000002a0, 0x00000000, 0x00000100, 0x00000000, 0x00000000, + 0x00000700, 0x00000000, 0x00000000, 0x00000400, 0x00000000, 0xf0f0f000, 0x0f0f0ff0, 0x00ffff0f, + 0x00000100, 0x00000200, 0x00000000, 0x00000100, 0x00000200, 0x00000000, 0x00317000, 0x00000150, + 0x43425844, 0xc6a29e4c, 0x6292ed35, 0xd90bb8cb, 0x50dcd25f, 0x00000001, 0x00000150, 0x00000003, + 0x0000002c, 0x000000d4, 0x000000e0, 0x42415443, 0x000000a0, 0x0000001c, 0x00000077, 0x46580400, + 0x00000002, 0x0000001c, 0x00000100, 0x00000074, 0x00000044, 0x00000002, 0x00000001, 0x0000004c, + 0x00000000, 0x0000005c, 0x00010002, 0x00000001, 0x00000064, 0x00000000, 0x61765f67, 0xabab0072, + 0x00030001, 0x00040001, 0x00000001, 0x00000000, 0x61765f67, 0xab003272, 0x00030001, 0x00040001, + 0x00000001, 0x00000000, 0x4d007874, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, + 0x72656461, 0x6d6f4320, 0x656c6970, 0x30312072, 0xab00312e, 0x34494c43, 0x00000004, 0x00000000, + 0x434c5846, 0x00000068, 0x00000002, 0xa0400004, 0x00000002, 0x00000000, 0x00000002, 0x00000000, + 0x00000000, 0x00000002, 0x00000004, 0x00000000, 0x00000007, 0x00000000, 0xa0400004, 0x00000002, + 0x00000000, 0x00000002, 0x00000001, 0x00000000, 0x00000007, 0x00000000, 0x00000000, 0x00000004, + 0x00000000, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, 0x00000001, 0x00000002, 0x00000000, 0x00000001, + 0x00000002, 0x00000000, 0x00000004, 0x00000020, 0x00000000, 0x00000002, 0xffffffff, 0x00000000, + 0x00000030, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000036, + 0x00000014, 0x00000000, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x0000003d, 0x00000002, + 0x00000000, 0x00000042, 0x00000003, 0x00000000, 0x0000000a, 0x00000000, 0x00000006, 0x00000045, + 0x0000000b, 0x00000000, 0x00000001, 0x000001a9, 0x00000002, 0x00000000, 0x00000001, 0x000001b5, + 0x000001c1, 0x00000003, 0x00000000, 0x0000000a, 0x00000000, 0x00000006, 0x000001c4, 0x0000000b, + 0x00000000, 0x00000001, 0x00000318, 0x00000002, 0x00000000, 0x00000001, 0x00000324, +}; + +static void test_effect_value_expression(void) +{ + ID3D10Effect *effect; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = create_effect(fx_test_value_expression, 0, device, NULL, &effect); + ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + + effect->lpVtbl->Release(effect); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(effect) { test_effect_constant_buffer_type(); @@ -7972,4 +8049,5 @@ START_TEST(effect) test_effect_raw_value(); test_effect_dynamic_numeric_field(); test_effect_index_expression(); + test_effect_value_expression(); } -- 2.33.0

2 3

[PATCH v2] conhost: Only use the maximum character width if a double-byte character set is in use
by Hugh McMaster Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/window.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 319463537d5..7ad0d48effd 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -646,7 +646,7 @@ static HFONT select_font_config( struct console_config *config, unsigned int cp, lstrcpyW( config->face_name, lf->lfFaceName ); /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ - if (GetCPInfo( cp, &cpinfo ) && cpinfo.MaxCharSize > 1) + if (GetCPInfo( cp, &cpinfo ) && cpinfo.MaxCharSize == 2) config->cell_width = tm.tmMaxCharWidth; return font; @@ -713,7 +713,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) memcpy( font_info->face_name, logfont->lfFaceName, font_info->face_len * sizeof(WCHAR) ); /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ - if (GetCPInfo( console->output_cp, &cpinfo ) && cpinfo.MaxCharSize > 1) + if (GetCPInfo( console->output_cp, &cpinfo ) && cpinfo.MaxCharSize == 2) font_info->width = tm.tmMaxCharWidth; if (console->window->font) DeleteObject( console->window->font ); -- 2.34.0

1 0