March 2022 - Wine-devel - list.winehq.org

[PATCH 4/4] winealsa: Move release_capture_buffer to the unixlib.
by Huw Davies 09 Mar '22

09 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 29 +++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 31 +++++-------------------------- dlls/winealsa.drv/unixlib.h | 8 ++++++++ 3 files changed, 42 insertions(+), 26 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 60ef49c4c1a..02063fd3374 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1752,6 +1752,34 @@ static NTSTATUS get_capture_buffer(void *args) return alsa_unlock_result(stream, &params->result, *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY); } +static NTSTATUS release_capture_buffer(void *args) +{ + struct release_capture_buffer_params *params = args; + struct alsa_stream *stream = params->stream; + UINT32 done = params->done; + + alsa_lock(stream); + + if(!done){ + stream->getbuf_last = 0; + return alsa_unlock_result(stream, &params->result, S_OK); + } + + if(!stream->getbuf_last) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_OUT_OF_ORDER); + + if(stream->getbuf_last != done) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_INVALID_SIZE); + + stream->written_frames += done; + stream->held_frames -= done; + stream->lcl_offs_frames += done; + stream->lcl_offs_frames %= stream->bufsize_frames; + stream->getbuf_last = 0; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -2086,6 +2114,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_render_buffer, release_render_buffer, get_capture_buffer, + release_capture_buffer, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index cecb358bab7..b50025aa77c 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1398,37 +1398,16 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( IAudioCaptureClient *iface, UINT32 done) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct alsa_stream *stream = This->stream; + struct release_capture_buffer_params params; TRACE("(%p)->(%u)\n", This, done); - alsa_lock(stream); - - if(!done){ - stream->getbuf_last = 0; - alsa_unlock(stream); - return S_OK; - } - - if(!stream->getbuf_last){ - alsa_unlock(stream); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(stream->getbuf_last != done){ - alsa_unlock(stream); - return AUDCLNT_E_INVALID_SIZE; - } + params.stream = This->stream; + params.done = done; - stream->written_frames += done; - stream->held_frames -= done; - stream->lcl_offs_frames += done; - stream->lcl_offs_frames %= stream->bufsize_frames; - stream->getbuf_last = 0; + ALSA_CALL(release_capture_buffer, &params); - alsa_unlock(stream); - - return S_OK; + return params.result; } static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index c4efe5ad764..ddca1a3100c 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -141,6 +141,13 @@ struct get_capture_buffer_params UINT64 *qpcpos; }; +struct release_capture_buffer_params +{ + struct alsa_stream *stream; + UINT32 done; + HRESULT result; +}; + struct is_format_supported_params { const char *alsa_name; @@ -199,6 +206,7 @@ enum alsa_funcs alsa_get_render_buffer, alsa_release_render_buffer, alsa_get_capture_buffer, + alsa_release_capture_buffer, alsa_is_format_supported, alsa_get_mix_format, alsa_get_buffer_size, -- 2.25.1

2 1

[PATCH 3/4] winealsa: Move get_capture_buffer to the unixlib.
by Huw Davies 09 Mar '22

09 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 62 ++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 69 +++++------------------------------- dlls/winealsa.drv/unixlib.h | 12 +++++++ 3 files changed, 83 insertions(+), 60 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 302a525e52d..60ef49c4c1a 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1691,6 +1691,67 @@ static NTSTATUS release_render_buffer(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_capture_buffer(void *args) +{ + struct get_capture_buffer_params *params = args; + struct alsa_stream *stream = params->stream; + UINT32 *frames = params->frames; + SIZE_T size; + + alsa_lock(stream); + + if(stream->getbuf_last) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_OUT_OF_ORDER); + + if(stream->held_frames < stream->mmdev_period_frames){ + *frames = 0; + return alsa_unlock_result(stream, &params->result, AUDCLNT_S_BUFFER_EMPTY); + } + *frames = stream->mmdev_period_frames; + + if(stream->lcl_offs_frames + *frames > stream->bufsize_frames){ + UINT32 chunk_bytes, offs_bytes, frames_bytes; + if(stream->tmp_buffer_frames < *frames){ + if(stream->tmp_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); + stream->tmp_buffer = NULL; + } + size = *frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, + MEM_COMMIT, PAGE_READWRITE)){ + stream->tmp_buffer_frames = 0; + return alsa_unlock_result(stream, &params->result, E_OUTOFMEMORY); + } + stream->tmp_buffer_frames = *frames; + } + + *params->data = stream->tmp_buffer; + chunk_bytes = (stream->bufsize_frames - stream->lcl_offs_frames) * + stream->fmt->nBlockAlign; + offs_bytes = stream->lcl_offs_frames * stream->fmt->nBlockAlign; + frames_bytes = *frames * stream->fmt->nBlockAlign; + memcpy(stream->tmp_buffer, stream->local_buffer + offs_bytes, chunk_bytes); + memcpy(stream->tmp_buffer + chunk_bytes, stream->local_buffer, + frames_bytes - chunk_bytes); + }else + *params->data = stream->local_buffer + + stream->lcl_offs_frames * stream->fmt->nBlockAlign; + + stream->getbuf_last = *frames; + *params->flags = 0; + + if(params->devpos) + *params->devpos = stream->written_frames; + if(params->qpcpos){ /* fixme: qpc of recording time */ + LARGE_INTEGER stamp, freq; + NtQueryPerformanceCounter(&stamp, &freq); + *params->qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } + + return alsa_unlock_result(stream, &params->result, *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY); +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -2024,6 +2085,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = timer_loop, get_render_buffer, release_render_buffer, + get_capture_buffer, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index e5512880442..cecb358bab7 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1369,8 +1369,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, UINT64 *qpcpos) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct alsa_stream *stream = This->stream; - SIZE_T size; + struct get_capture_buffer_params params; TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); @@ -1383,66 +1382,16 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, if(!frames || !flags) return E_POINTER; - alsa_lock(stream); - - if(stream->getbuf_last){ - alsa_unlock(stream); - return AUDCLNT_E_OUT_OF_ORDER; - } - - /* hr = GetNextPacketSize(iface, frames); */ - if(stream->held_frames < stream->mmdev_period_frames){ - *frames = 0; - alsa_unlock(stream); - return AUDCLNT_S_BUFFER_EMPTY; - } - *frames = stream->mmdev_period_frames; - - if(stream->lcl_offs_frames + *frames > stream->bufsize_frames){ - UINT32 chunk_bytes, offs_bytes, frames_bytes; - if(stream->tmp_buffer_frames < *frames){ - if(stream->tmp_buffer){ - size = 0; - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); - stream->tmp_buffer = NULL; - } - size = *frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, - MEM_COMMIT, PAGE_READWRITE)){ - stream->tmp_buffer_frames = 0; - alsa_unlock(stream); - return E_OUTOFMEMORY; - } - stream->tmp_buffer_frames = *frames; - } - - *data = stream->tmp_buffer; - chunk_bytes = (stream->bufsize_frames - stream->lcl_offs_frames) * - stream->fmt->nBlockAlign; - offs_bytes = stream->lcl_offs_frames * stream->fmt->nBlockAlign; - frames_bytes = *frames * stream->fmt->nBlockAlign; - memcpy(stream->tmp_buffer, stream->local_buffer + offs_bytes, chunk_bytes); - memcpy(stream->tmp_buffer + chunk_bytes, stream->local_buffer, - frames_bytes - chunk_bytes); - }else - *data = stream->local_buffer + - stream->lcl_offs_frames * stream->fmt->nBlockAlign; - - stream->getbuf_last = *frames; - *flags = 0; - - if(devpos) - *devpos = stream->written_frames; - if(qpcpos){ /* fixme: qpc of recording time */ - LARGE_INTEGER stamp, freq; - QueryPerformanceCounter(&stamp); - QueryPerformanceFrequency(&freq); - *qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; - } + params.stream = This->stream; + params.data = data; + params.frames = frames; + params.flags = flags; + params.devpos = devpos; + params.qpcpos = qpcpos; - alsa_unlock(stream); + ALSA_CALL(get_capture_buffer, &params); - return *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY; + return params.result; } static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index bef38c2a1a9..c4efe5ad764 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -130,6 +130,17 @@ struct release_render_buffer_params HRESULT result; }; +struct get_capture_buffer_params +{ + struct alsa_stream *stream; + HRESULT result; + BYTE **data; + UINT32 *frames; + UINT *flags; + UINT64 *devpos; + UINT64 *qpcpos; +}; + struct is_format_supported_params { const char *alsa_name; @@ -187,6 +198,7 @@ enum alsa_funcs alsa_timer_loop, alsa_get_render_buffer, alsa_release_render_buffer, + alsa_get_capture_buffer, alsa_is_format_supported, alsa_get_mix_format, alsa_get_buffer_size, -- 2.25.1

2 1

[PATCH 2/4] winealsa: Move release_render_buffer to the unixlib.
by Huw Davies 09 Mar '22

09 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 58 ++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 73 +++--------------------------------- dlls/winealsa.drv/unixlib.h | 9 +++++ 3 files changed, 73 insertions(+), 67 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 57a605b6bdf..302a525e52d 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1634,6 +1634,63 @@ static NTSTATUS get_render_buffer(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static void alsa_wrap_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 written_frames) +{ + snd_pcm_uframes_t write_offs_frames = stream->wri_offs_frames; + UINT32 write_offs_bytes = write_offs_frames * stream->fmt->nBlockAlign; + snd_pcm_uframes_t chunk_frames = stream->bufsize_frames - write_offs_frames; + UINT32 chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; + UINT32 written_bytes = written_frames * stream->fmt->nBlockAlign; + + if(written_bytes <= chunk_bytes){ + memcpy(stream->local_buffer + write_offs_bytes, buffer, written_bytes); + }else{ + memcpy(stream->local_buffer + write_offs_bytes, buffer, chunk_bytes); + memcpy(stream->local_buffer, buffer + chunk_bytes, + written_bytes - chunk_bytes); + } +} + +static NTSTATUS release_render_buffer(void *args) +{ + struct release_render_buffer_params *params = args; + struct alsa_stream *stream = params->stream; + UINT32 written_frames = params->written_frames; + BYTE *buffer; + + alsa_lock(stream); + + if(!written_frames){ + stream->getbuf_last = 0; + return alsa_unlock_result(stream, &params->result, S_OK); + } + + if(!stream->getbuf_last) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_OUT_OF_ORDER); + + if(written_frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_INVALID_SIZE); + + if(stream->getbuf_last >= 0) + buffer = stream->local_buffer + stream->wri_offs_frames * stream->fmt->nBlockAlign; + else + buffer = stream->tmp_buffer; + + if(params->flags & AUDCLNT_BUFFERFLAGS_SILENT) + silence_buffer(stream, buffer, written_frames); + + if(stream->getbuf_last < 0) + alsa_wrap_buffer(stream, buffer, written_frames); + + stream->wri_offs_frames += written_frames; + stream->wri_offs_frames %= stream->bufsize_frames; + stream->held_frames += written_frames; + stream->written_frames += written_frames; + stream->getbuf_last = 0; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -1966,6 +2023,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = reset, timer_loop, get_render_buffer, + release_render_buffer, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 5d99ede8a4f..e5512880442 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -689,18 +689,6 @@ static HRESULT get_audio_session(const GUID *sessionguid, return S_OK; } -static void silence_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 frames) -{ - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; - if((stream->fmt->wFormatTag == WAVE_FORMAT_PCM || - (stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && - stream->fmt->wBitsPerSample == 8) - memset(buffer, 128, frames * stream->fmt->nBlockAlign); - else - memset(buffer, 0, frames * stream->fmt->nBlockAlign); -} - static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, REFERENCE_TIME period, const WAVEFORMATEX *fmt, @@ -1314,70 +1302,21 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return params.result; } -static void alsa_wrap_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 written_frames) -{ - snd_pcm_uframes_t write_offs_frames = stream->wri_offs_frames; - UINT32 write_offs_bytes = write_offs_frames * stream->fmt->nBlockAlign; - snd_pcm_uframes_t chunk_frames = stream->bufsize_frames - write_offs_frames; - UINT32 chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; - UINT32 written_bytes = written_frames * stream->fmt->nBlockAlign; - - if(written_bytes <= chunk_bytes){ - memcpy(stream->local_buffer + write_offs_bytes, buffer, written_bytes); - }else{ - memcpy(stream->local_buffer + write_offs_bytes, buffer, chunk_bytes); - memcpy(stream->local_buffer, buffer + chunk_bytes, - written_bytes - chunk_bytes); - } -} - static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( IAudioRenderClient *iface, UINT32 written_frames, DWORD flags) { ACImpl *This = impl_from_IAudioRenderClient(iface); - struct alsa_stream *stream = This->stream; - BYTE *buffer; + struct release_render_buffer_params params; TRACE("(%p)->(%u, %x)\n", This, written_frames, flags); - alsa_lock(stream); - - if(!written_frames){ - stream->getbuf_last = 0; - alsa_unlock(stream); - return S_OK; - } - - if(!stream->getbuf_last){ - alsa_unlock(stream); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(written_frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)){ - alsa_unlock(stream); - return AUDCLNT_E_INVALID_SIZE; - } - - if(stream->getbuf_last >= 0) - buffer = stream->local_buffer + stream->wri_offs_frames * stream->fmt->nBlockAlign; - else - buffer = stream->tmp_buffer; - - if(flags & AUDCLNT_BUFFERFLAGS_SILENT) - silence_buffer(stream, buffer, written_frames); - - if(stream->getbuf_last < 0) - alsa_wrap_buffer(stream, buffer, written_frames); - - stream->wri_offs_frames += written_frames; - stream->wri_offs_frames %= stream->bufsize_frames; - stream->held_frames += written_frames; - stream->written_frames += written_frames; - stream->getbuf_last = 0; + params.stream = This->stream; + params.written_frames = written_frames; + params.flags = flags; - alsa_unlock(stream); + ALSA_CALL(release_render_buffer, &params); - return S_OK; + return params.result; } static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index fb137d6b9ff..bef38c2a1a9 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -122,6 +122,14 @@ struct get_render_buffer_params BYTE **data; }; +struct release_render_buffer_params +{ + struct alsa_stream *stream; + UINT32 written_frames; + UINT flags; + HRESULT result; +}; + struct is_format_supported_params { const char *alsa_name; @@ -178,6 +186,7 @@ enum alsa_funcs alsa_reset, alsa_timer_loop, alsa_get_render_buffer, + alsa_release_render_buffer, alsa_is_format_supported, alsa_get_mix_format, alsa_get_buffer_size, -- 2.25.1

2 1

[PATCH 1/2] dlls/windowscodecs/tests: use correct integral type
by Eric Pouech 09 Mar '22

09 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/windowscodecs/tests/info.c | 7 ++++--- dlls/windowscodecs/tests/metadata.c | 9 +++++---- dlls/windowscodecs/tests/palette.c | 18 +++++++++--------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 339555f23fe..31416f3d8f1 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -114,7 +114,7 @@ static void test_decoder_info(void) IWICBitmapDecoderInfo *decoder_info, *decoder_info2; IWICComponentInfo *info; HRESULT hr; - ULONG len; + UINT len; WCHAR value[256]; CLSID clsid; GUID pixelformats[32]; @@ -292,7 +292,7 @@ static void test_pixelformat_info(void) IWICPixelFormatInfo *pixelformat_info; IWICPixelFormatInfo2 *pixelformat_info2; HRESULT hr; - ULONG len, known_len; + UINT len, known_len; WCHAR value[256]; GUID guid; WICComponentType componenttype; @@ -499,7 +499,8 @@ static void test_reader_info(void) HRESULT hr; CLSID clsid; GUID container_formats[10]; - UINT count, size, tid; + UINT count, size; + DWORD tid; HANDLE thread; WICMetadataPattern *patterns; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index bec8bb08c76..8eaf22a300c 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -321,7 +321,8 @@ static void test_metadata_tEXt(void) IWICMetadataReader *reader; IWICEnumMetadataItem *enumerator; PROPVARIANT schema, id, value; - ULONG items_returned, count; + ULONG items_returned; + UINT count; GUID format; PropVariantInit(&schema); @@ -438,7 +439,7 @@ static void test_metadata_gAMA(void) HRESULT hr; IWICMetadataReader *reader; PROPVARIANT schema, id, value; - ULONG count; + UINT count; GUID format; static const WCHAR ImageGamma[] = {'I','m','a','g','e','G','a','m','m','a',0}; @@ -483,7 +484,7 @@ static void test_metadata_cHRM(void) HRESULT hr; IWICMetadataReader *reader; PROPVARIANT schema, id, value; - ULONG count; + UINT count; GUID format; int i; static const WCHAR expected_names[8][12] = { @@ -799,7 +800,7 @@ static void test_metadata_IFD(void) IWICMetadataReader *reader; IWICMetadataBlockReader *blockreader; PROPVARIANT schema, id, value; - ULONG count; + UINT count; GUID format; char *IFD_data_swapped; #ifdef WORDS_BIGENDIAN diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 583fa66c80e..d07b936ca9e 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -205,7 +205,7 @@ static void test_custom_palette(void) } } -static void generate_gray16_palette(DWORD *entries, UINT count) +static void generate_gray16_palette(WICColor *entries, UINT count) { UINT i; @@ -218,7 +218,7 @@ static void generate_gray16_palette(DWORD *entries, UINT count) } } -static void generate_gray256_palette(DWORD *entries, UINT count) +static void generate_gray256_palette(WICColor *entries, UINT count) { UINT i; @@ -231,7 +231,7 @@ static void generate_gray256_palette(DWORD *entries, UINT count) } } -static void generate_halftone8_palette(DWORD *entries, UINT count, BOOL add_transparent) +static void generate_halftone8_palette(WICColor *entries, UINT count, BOOL add_transparent) { UINT i; @@ -260,7 +260,7 @@ static void generate_halftone8_palette(DWORD *entries, UINT count, BOOL add_tran entries[i] = 0; } -static void generate_halftone27_palette(DWORD *entries, UINT count, BOOL add_transparent) +static void generate_halftone27_palette(WICColor *entries, UINT count, BOOL add_transparent) { static const BYTE halftone_values[4] = { 0x00,0x80,0xff }; UINT i; @@ -283,7 +283,7 @@ static void generate_halftone27_palette(DWORD *entries, UINT count, BOOL add_tra entries[i] = 0; } -static void generate_halftone64_palette(DWORD *entries, UINT count, BOOL add_transparent) +static void generate_halftone64_palette(WICColor *entries, UINT count, BOOL add_transparent) { static const BYTE halftone_values[4] = { 0x00,0x55,0xaa,0xff }; UINT i; @@ -313,7 +313,7 @@ static void generate_halftone64_palette(DWORD *entries, UINT count, BOOL add_tra entries[i] = 0; } -static void generate_halftone125_palette(DWORD *entries, UINT count, BOOL add_transparent) +static void generate_halftone125_palette(WICColor *entries, UINT count, BOOL add_transparent) { static const BYTE halftone_values[5] = { 0x00, 0x40, 0x80, 0xbf, 0xff }; UINT i; @@ -336,7 +336,7 @@ static void generate_halftone125_palette(DWORD *entries, UINT count, BOOL add_tr entries[i] = 0; } -static void generate_halftone216_palette(DWORD *entries, UINT count, BOOL add_transparent) +static void generate_halftone216_palette(WICColor *entries, UINT count, BOOL add_transparent) { static const BYTE halftone_values[6] = { 0x00,0x33,0x66,0x99,0xcc,0xff }; UINT i; @@ -366,7 +366,7 @@ static void generate_halftone216_palette(DWORD *entries, UINT count, BOOL add_tr entries[i] = 0; } -static void generate_halftone252_palette(DWORD *entries, UINT count, BOOL add_transparent) +static void generate_halftone252_palette(WICColor *entries, UINT count, BOOL add_transparent) { static const BYTE halftone_values_rb[6] = { 0x00,0x33,0x66,0x99,0xcc,0xff }; static const BYTE halftone_values_g[7] = { 0x00,0x2b,0x55,0x80,0xaa,0xd5,0xff }; @@ -389,7 +389,7 @@ static void generate_halftone252_palette(DWORD *entries, UINT count, BOOL add_tr entries[i] = 0; } -static void generate_halftone256_palette(DWORD *entries, UINT count, BOOL add_transparent) +static void generate_halftone256_palette(WICColor *entries, UINT count, BOOL add_transparent) { static const BYTE halftone_values_b[4] = { 0x00,0x55,0xaa,0xff }; static const BYTE halftone_values_gr[8] = { 0x00,0x24,0x49,0x6d,0x92,0xb6,0xdb,0xff };

2 3

[PATCH 1/4] winealsa: Move get_render_buffer to the unixlib.
by Huw Davies 09 Mar '22

09 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 48 ++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 54 ++++-------------------------------- dlls/winealsa.drv/unixlib.h | 9 ++++++ 3 files changed, 63 insertions(+), 48 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index d7c6ae7779c..57a605b6bdf 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1587,6 +1587,53 @@ static NTSTATUS timer_loop(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_render_buffer(void *args) +{ + struct get_render_buffer_params *params = args; + struct alsa_stream *stream = params->stream; + UINT32 write_pos, frames = params->frames; + SIZE_T size; + + alsa_lock(stream); + + if(stream->getbuf_last) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_OUT_OF_ORDER); + + if(!frames) + return alsa_unlock_result(stream, &params->result, S_OK); + + /* held_frames == GetCurrentPadding_nolock(); */ + if(stream->held_frames + frames > stream->bufsize_frames) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_BUFFER_TOO_LARGE); + + write_pos = stream->wri_offs_frames; + if(write_pos + frames > stream->bufsize_frames){ + if(stream->tmp_buffer_frames < frames){ + if(stream->tmp_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); + stream->tmp_buffer = NULL; + } + size = frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, + MEM_COMMIT, PAGE_READWRITE)){ + stream->tmp_buffer_frames = 0; + return alsa_unlock_result(stream, &params->result, E_OUTOFMEMORY); + } + stream->tmp_buffer_frames = frames; + } + *params->data = stream->tmp_buffer; + stream->getbuf_last = -frames; + }else{ + *params->data = stream->local_buffer + write_pos * stream->fmt->nBlockAlign; + stream->getbuf_last = frames; + } + + silence_buffer(stream, *params->data, frames); + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -1918,6 +1965,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = stop, reset, timer_loop, + get_render_buffer, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 7a99a6b5d43..5d99ede8a4f 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1297,9 +1297,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BYTE **data) { ACImpl *This = impl_from_IAudioRenderClient(iface); - struct alsa_stream *stream = This->stream; - UINT32 write_pos; - SIZE_T size; + struct get_render_buffer_params params; TRACE("(%p)->(%u, %p)\n", This, frames, data); @@ -1307,53 +1305,13 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return E_POINTER; *data = NULL; - alsa_lock(stream); - - if(stream->getbuf_last){ - alsa_unlock(stream); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(!frames){ - alsa_unlock(stream); - return S_OK; - } - - /* held_frames == GetCurrentPadding_nolock(); */ - if(stream->held_frames + frames > stream->bufsize_frames){ - alsa_unlock(stream); - return AUDCLNT_E_BUFFER_TOO_LARGE; - } - - write_pos = stream->wri_offs_frames; - if(write_pos + frames > stream->bufsize_frames){ - if(stream->tmp_buffer_frames < frames){ - if(stream->tmp_buffer){ - size = 0; - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); - stream->tmp_buffer = NULL; - } - size = frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, - MEM_COMMIT, PAGE_READWRITE)){ - stream->tmp_buffer_frames = 0; - alsa_unlock(stream); - return E_OUTOFMEMORY; - } - stream->tmp_buffer_frames = frames; - } - *data = stream->tmp_buffer; - stream->getbuf_last = -frames; - }else{ - *data = stream->local_buffer + write_pos * stream->fmt->nBlockAlign; - stream->getbuf_last = frames; - } - - silence_buffer(stream, *data, frames); + params.stream = This->stream; + params.frames = frames; + params.data = data; - alsa_unlock(stream); + ALSA_CALL(get_render_buffer, &params); - return S_OK; + return params.result; } static void alsa_wrap_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 written_frames) diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index bd3a1a4bc6a..fb137d6b9ff 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -114,6 +114,14 @@ struct timer_loop_params struct alsa_stream *stream; }; +struct get_render_buffer_params +{ + struct alsa_stream *stream; + UINT32 frames; + HRESULT result; + BYTE **data; +}; + struct is_format_supported_params { const char *alsa_name; @@ -169,6 +177,7 @@ enum alsa_funcs alsa_stop, alsa_reset, alsa_timer_loop, + alsa_get_render_buffer, alsa_is_format_supported, alsa_get_mix_format, alsa_get_buffer_size, -- 2.25.1

2 1

[PATCH] dlls/windowscodecsext/tests: enable compilation with long types
by Eric Pouech 09 Mar '22

09 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/windowscodecsext/tests/Makefile.in | 1 - dlls/windowscodecsext/tests/transform.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecsext/tests/Makefile.in b/dlls/windowscodecsext/tests/Makefile.in index 22c052f8384..d99067ef296 100644 --- a/dlls/windowscodecsext/tests/Makefile.in +++ b/dlls/windowscodecsext/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = windowscodecsext.dll IMPORTS = windowscodecsext ole32 diff --git a/dlls/windowscodecsext/tests/transform.c b/dlls/windowscodecsext/tests/transform.c index e76f9fe8a4f..01f0d8a289e 100644 --- a/dlls/windowscodecsext/tests/transform.c +++ b/dlls/windowscodecsext/tests/transform.c @@ -32,28 +32,28 @@ static void test_WICCreateColorTransform_Proxy(void) IWICColorTransform *transform; hr = WICCreateColorTransform_Proxy( NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %08lx\n", hr ); transform = NULL; hr = WICCreateColorTransform_Proxy( &transform ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (transform) IWICColorTransform_Release( transform ); hr = CoInitializeEx( NULL, COINIT_APARTMENTTHREADED ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); transform = NULL; hr = WICCreateColorTransform_Proxy( &transform ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (transform) IWICColorTransform_Release( transform ); CoUninitialize(); hr = CoInitializeEx( NULL, COINIT_MULTITHREADED ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); transform = NULL; hr = WICCreateColorTransform_Proxy( &transform ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (transform) IWICColorTransform_Release( transform ); CoUninitialize(); }

2 1

[PATCH vkd3d v2] vkd3d: Handle D3D12_APPEND_ALIGNED_ELEMENT for <4 byte wide elements.
by Conor McCarthy 09 Mar '22

09 Mar '22

In d3d12, input element alignment needs to be the _minimum_ of 4 and the size of the type. See the D3D11 spec, section 4.4.6, which behaves similarly: https://microsoft.github.io/DirectX-Specs/d3d/archive/D3D11_3_FunctionalSpe… This is correctly taken into account when generating, e.g., the vertex_buffer_stride_align_mask used for validation, but is not taken into account when D3D12_APPEND_ALIGNED_ELEMENT is used to automatically place input elements. Currently, vkd3d always assumes the alignment is 4. This means that, for example, bytes or shorts should be packed tightly together when D3D12_APPEND_ALIGNED_ELEMENT is used, but are instead padded to 4 bytes. Fixing this makes units appear in Age of Empires IV. (CrossOver bug 19924 --CM). From: David Gow <david(a)ingeniumdigital.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v2: Fix patch issue. --- libs/vkd3d/state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 0e7800a4..72422897 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2430,9 +2430,9 @@ static HRESULT compute_input_layout_offsets(const struct d3d12_device *device, if (e->AlignedByteOffset != D3D12_APPEND_ALIGNED_ELEMENT) offsets[i] = e->AlignedByteOffset; else - offsets[i] = input_slot_offsets[e->InputSlot]; + offsets[i] = align(input_slot_offsets[e->InputSlot], min(4, format->byte_count)); - input_slot_offsets[e->InputSlot] = align(offsets[i] + format->byte_count, 4); + input_slot_offsets[e->InputSlot] = offsets[i] + format->byte_count; } return S_OK; -- 2.34.1

3 2

[PATCH v3 1/6] windows.media.speech: Create private header.
by Bernhard Kölbl 09 Mar '22

09 Mar '22

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/main.c | 17 ++---------- dlls/windows.media.speech/private.h | 41 +++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 15 deletions(-) create mode 100644 dlls/windows.media.speech/private.h diff --git a/dlls/windows.media.speech/main.c b/dlls/windows.media.speech/main.c index d14d06773f7..94e6e5f9b2c 100644 --- a/dlls/windows.media.speech/main.c +++ b/dlls/windows.media.speech/main.c @@ -17,23 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winstring.h" -#include "wine/debug.h" -#include "objbase.h" - #include "initguid.h" -#include "activation.h" +#include "private.h" -#define WIDL_using_Windows_Foundation -#define WIDL_using_Windows_Foundation_Collections -#include "windows.foundation.h" -#define WIDL_using_Windows_Media_SpeechSynthesis -#include "windows.media.speechsynthesis.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(speech); diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h new file mode 100644 index 00000000000..0af024d0a72 --- /dev/null +++ b/dlls/windows.media.speech/private.h @@ -0,0 +1,41 @@ +/* WinRT Windows.Media.Speech private header + * + * Copyright 2022 Bernhard Kölbl + * + * 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 + */ + +#ifndef __WINE_WINDOWS_MEDIA_SPEECH_PRIVATE_H +#define __WINE_WINDOWS_MEDIA_SPEECH_PRIVATE_H + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "objbase.h" + +#include "activation.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Globalization +#include "windows.globalization.h" +#define WIDL_using_Windows_Media_SpeechSynthesis +#include "windows.media.speechsynthesis.h" + +#endif -- 2.35.1

2 11

[PATCH 08/10] win32u: Move GetWindowRect implementation from user32.
by Jacek Caban 09 Mar '22

09 Mar '22

3 2

[PATCH v2] wined3d: Allow changing settings using a new WINE_D3D_CONFIG environment variable.
by Zebediah Figura 09 Mar '22

09 Mar '22

This can be significantly more convenient than modifying the registry. config_list_get_value() is based on vkd3d_debug_list_has_member() by Józef Kucia. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/wined3d_main.c | 104 ++++++++++++++++++++++++++++-------- 1 file changed, 81 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 5bddc2587f4..524dc7508f9 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -150,17 +150,67 @@ struct wined3d * CDECL wined3d_create(DWORD flags) return object; } -static DWORD get_config_key(HKEY defkey, HKEY appkey, const char *name, char *buffer, DWORD size) +static bool is_option_separator(char c) { + return c == ',' || c == ';' || c == '\0'; +} + +static const char *config_list_get_value(const char *string, const char *key, size_t *len) +{ + const char *p, *end; + char prev_char; + + p = string; + while (p) + { + if ((p = strstr(p, key))) + { + prev_char = p > string ? p[-1] : 0; + p += strlen(key); + + if (is_option_separator(prev_char) && *p == '=') + { + if ((end = strpbrk(p + 1, ",;"))) + *len = end - p + 1; + else + *len = strlen(p + 1); + return p + 1; + } + } + } + + return NULL; +} + +static DWORD get_config_key(HKEY defkey, HKEY appkey, const char *env, const char *name, char *buffer, DWORD size) +{ + const char *env_value; + size_t env_len; + + if ((env_value = config_list_get_value(env, name, &env_len)) && env_len < size) + { + memcpy(buffer, env_value, env_len); + buffer[env_len] = 0; + return 0; + } if (appkey && !RegQueryValueExA(appkey, name, 0, NULL, (BYTE *)buffer, &size)) return 0; if (defkey && !RegQueryValueExA(defkey, name, 0, NULL, (BYTE *)buffer, &size)) return 0; return ERROR_FILE_NOT_FOUND; } -static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *name, DWORD *value) +static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *env, const char *name, DWORD *value) { DWORD type, data, size; + const char *env_value; + size_t env_len; + char *end; + if ((env_value = config_list_get_value(env, name, &env_len))) + { + *value = strtoul(env_value, &end, 0); + if (end != env_value) + return 0; + } size = sizeof(data); if (appkey && !RegQueryValueExA(appkey, name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) goto success; size = sizeof(data); @@ -202,6 +252,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) DWORD wined3d_context_tls_idx; char buffer[MAX_PATH+10]; DWORD size = sizeof(buffer); + const char *env; HKEY hkey = 0; HKEY appkey = 0; DWORD tmpvalue; @@ -259,17 +310,24 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) } } - if (hkey || appkey) + /* Allow modifying settings using the WINE_D3D_CONFIG environment variable, + * which takes precedence over registry keys. An example is as follows: + * + * WINE_D3D_CONFIG=csmt=0x1,shader_backend=glsl + */ + env = getenv("WINE_D3D_CONFIG"); + + if (hkey || appkey || env) { - if (!get_config_key_dword(hkey, appkey, "csmt", &wined3d_settings.cs_multithreaded)) + if (!get_config_key_dword(hkey, appkey, env, "csmt", &wined3d_settings.cs_multithreaded)) ERR_(winediag)("Setting multithreaded command stream to %#x.\n", wined3d_settings.cs_multithreaded); - if (!get_config_key_dword(hkey, appkey, "MaxVersionGL", &tmpvalue)) + if (!get_config_key_dword(hkey, appkey, env, "MaxVersionGL", &tmpvalue)) { ERR_(winediag)("Setting maximum allowed wined3d GL version to %u.%u.\n", tmpvalue >> 16, tmpvalue & 0xffff); wined3d_settings.max_gl_version = tmpvalue; } - if (!get_config_key(hkey, appkey, "shader_backend", buffer, size)) + if (!get_config_key(hkey, appkey, env, "shader_backend", buffer, size)) { if (!_strnicmp(buffer, "glsl", -1)) { @@ -293,10 +351,10 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) ERR_(winediag)("The GLSL shader backend has been disabled. You get to keep all the pieces if it breaks.\n"); TRACE("Use of GL Shading Language disabled.\n"); } - if (!get_config_key(hkey, appkey, "OffscreenRenderingMode", buffer, size) + if (!get_config_key(hkey, appkey, env, "OffscreenRenderingMode", buffer, size) && !strcmp(buffer,"backbuffer")) wined3d_settings.offscreen_rendering_mode = ORM_BACKBUFFER; - if ( !get_config_key_dword( hkey, appkey, "VideoPciDeviceID", &tmpvalue) ) + if (!get_config_key_dword(hkey, appkey, env, "VideoPciDeviceID", &tmpvalue)) { int pci_device_id = tmpvalue; @@ -311,7 +369,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.pci_device_id = pci_device_id; } } - if ( !get_config_key_dword( hkey, appkey, "VideoPciVendorID", &tmpvalue) ) + if (!get_config_key_dword(hkey, appkey, env, "VideoPciVendorID", &tmpvalue)) { int pci_vendor_id = tmpvalue; @@ -326,7 +384,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.pci_vendor_id = pci_vendor_id; } } - if ( !get_config_key( hkey, appkey, "VideoMemorySize", buffer, size) ) + if (!get_config_key(hkey, appkey, env, "VideoMemorySize", buffer, size)) { int TmpVideoMemorySize = atoi(buffer); if(TmpVideoMemorySize > 0) @@ -339,7 +397,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) else ERR("VideoMemorySize is %i but must be >0\n", TmpVideoMemorySize); } - if ( !get_config_key( hkey, appkey, "WineLogo", buffer, size) ) + if (!get_config_key(hkey, appkey, env, "WineLogo", buffer, size)) { size_t len = strlen(buffer) + 1; @@ -348,32 +406,32 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) else memcpy(wined3d_settings.logo, buffer, len); } - if (!get_config_key_dword(hkey, appkey, "MultisampleTextures", &wined3d_settings.multisample_textures)) + if (!get_config_key_dword(hkey, appkey, env, "MultisampleTextures", &wined3d_settings.multisample_textures)) ERR_(winediag)("Setting multisample textures to %#x.\n", wined3d_settings.multisample_textures); - if (!get_config_key_dword(hkey, appkey, "SampleCount", &wined3d_settings.sample_count)) + if (!get_config_key_dword(hkey, appkey, env, "SampleCount", &wined3d_settings.sample_count)) ERR_(winediag)("Forcing sample count to %u. This may not be compatible with all applications.\n", wined3d_settings.sample_count); - if (!get_config_key(hkey, appkey, "CheckFloatConstants", buffer, size) + if (!get_config_key(hkey, appkey, env, "CheckFloatConstants", buffer, size) && !strcmp(buffer, "enabled")) { TRACE("Checking relative addressing indices in float constants.\n"); wined3d_settings.check_float_constants = TRUE; } - if (!get_config_key_dword(hkey, appkey, "strict_shader_math", &wined3d_settings.strict_shader_math)) + if (!get_config_key_dword(hkey, appkey, env, "strict_shader_math", &wined3d_settings.strict_shader_math)) ERR_(winediag)("Setting strict shader math to %#x.\n", wined3d_settings.strict_shader_math); - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelVS", &wined3d_settings.max_sm_vs)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelVS", &wined3d_settings.max_sm_vs)) TRACE("Limiting VS shader model to %u.\n", wined3d_settings.max_sm_vs); - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelHS", &wined3d_settings.max_sm_hs)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelHS", &wined3d_settings.max_sm_hs)) TRACE("Limiting HS shader model to %u.\n", wined3d_settings.max_sm_hs); - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelDS", &wined3d_settings.max_sm_ds)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelDS", &wined3d_settings.max_sm_ds)) TRACE("Limiting DS shader model to %u.\n", wined3d_settings.max_sm_ds); - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelGS", &wined3d_settings.max_sm_gs)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelGS", &wined3d_settings.max_sm_gs)) TRACE("Limiting GS shader model to %u.\n", wined3d_settings.max_sm_gs); - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelPS", &wined3d_settings.max_sm_ps)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelPS", &wined3d_settings.max_sm_ps)) TRACE("Limiting PS shader model to %u.\n", wined3d_settings.max_sm_ps); - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelCS", &wined3d_settings.max_sm_cs)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelCS", &wined3d_settings.max_sm_cs)) TRACE("Limiting CS shader model to %u.\n", wined3d_settings.max_sm_cs); - if (!get_config_key(hkey, appkey, "renderer", buffer, size)) + if (!get_config_key(hkey, appkey, env, "renderer", buffer, size)) { if (!strcmp(buffer, "vulkan")) { @@ -391,7 +449,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.renderer = WINED3D_RENDERER_NO3D; } } - if (!get_config_key_dword(hkey, appkey, "cb_access_map_w", &tmpvalue) && tmpvalue) + if (!get_config_key_dword(hkey, appkey, env, "cb_access_map_w", &tmpvalue) && tmpvalue) { TRACE("Forcing all constant buffers to be write-mappable.\n"); wined3d_settings.cb_access_map_w = TRUE; -- 2.35.1

2 1