- Wine-Devel - list.winehq.org

[PATCH 5/5] winealsa: Move set_volumes to the unixlib.
by Huw Davies March 11, 2022

March 11, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 50 ++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 12 +++++---- dlls/winealsa.drv/unixlib.h | 46 ++++++++------------------------- 3 files changed, 67 insertions(+), 41 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 365f5637b20..c199a2e603d 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -45,6 +45,43 @@ WINE_DEFAULT_DEBUG_CHANNEL(alsa); +struct alsa_stream +{ + snd_pcm_t *pcm_handle; + snd_pcm_uframes_t alsa_bufsize_frames, alsa_period_frames, safe_rewind_frames; + snd_pcm_hw_params_t *hw_params; /* does not hold state between calls */ + snd_pcm_format_t alsa_format; + + LARGE_INTEGER last_period_time; + + WAVEFORMATEX *fmt; + DWORD flags; + AUDCLNT_SHAREMODE share; + EDataFlow flow; + HANDLE event; + + BOOL need_remapping; + int alsa_channels; + int alsa_channel_map[32]; + + BOOL started, please_quit; + REFERENCE_TIME mmdev_period_rt; + UINT64 written_frames, last_pos_frames; + UINT32 bufsize_frames, held_frames, tmp_buffer_frames, mmdev_period_frames; + snd_pcm_uframes_t remapping_buf_frames; + UINT32 lcl_offs_frames; /* offs into local_buffer where valid data starts */ + UINT32 wri_offs_frames; /* where to write fresh data in local_buffer */ + UINT32 hidden_frames; /* ALSA reserve to ensure continuous rendering */ + UINT32 vol_adjusted_frames; /* Frames we've already adjusted the volume of but didn't write yet */ + UINT32 data_in_alsa_frames; + + BYTE *local_buffer, *tmp_buffer, *remapping_buf, *silence_buf; + LONG32 getbuf_last; /* <0 when using tmp_buffer */ + float *vols; + + pthread_mutex_t lock; +}; + #define EXTRA_SAFE_RT 40000 static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', @@ -2162,6 +2199,18 @@ static NTSTATUS get_position(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS set_volumes(void *args) +{ + struct set_volumes_params *params = args; + struct alsa_stream *stream = params->stream; + unsigned int i; + + for(i = 0; i < stream->fmt->nChannels; i++) + stream->vols[i] = params->volumes[i] * params->session_volumes[i] * params->master_volume; + + return STATUS_SUCCESS; +} + static NTSTATUS set_event_handle(void *args) { struct set_event_handle_params *params = args; @@ -2213,6 +2262,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_next_packet_size, get_frequency, get_position, + set_volumes, set_event_handle, is_started, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 0f6a30e0f45..c2ec3dd54af 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -334,12 +334,14 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) static void set_stream_volumes(ACImpl *This) { - struct alsa_stream *stream = This->stream; - unsigned int i; + struct set_volumes_params params; + + params.stream = This->stream; + params.master_volume = (This->session->mute ? 0.0f : This->session->master_vol); + params.volumes = This->vols; + params.session_volumes = This->session->channel_vols; - for(i = 0; i < stream->fmt->nChannels; i++) - stream->vols[i] = This->session->mute ? 0.0f : - This->vols[i] * This->session->channel_vols[i] * This->session->master_vol; + ALSA_CALL(set_volumes, &params); } HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index b73f40c8282..4326f79a50b 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -18,42 +18,7 @@ #include "audioclient.h" -struct alsa_stream -{ - snd_pcm_t *pcm_handle; - snd_pcm_uframes_t alsa_bufsize_frames, alsa_period_frames, safe_rewind_frames; - snd_pcm_hw_params_t *hw_params; /* does not hold state between calls */ - snd_pcm_format_t alsa_format; - - LARGE_INTEGER last_period_time; - - WAVEFORMATEX *fmt; - DWORD flags; - AUDCLNT_SHAREMODE share; - EDataFlow flow; - HANDLE event; - - BOOL need_remapping; - int alsa_channels; - int alsa_channel_map[32]; - - BOOL started, please_quit; - REFERENCE_TIME mmdev_period_rt; - UINT64 written_frames, last_pos_frames; - UINT32 bufsize_frames, held_frames, tmp_buffer_frames, mmdev_period_frames; - snd_pcm_uframes_t remapping_buf_frames; - UINT32 lcl_offs_frames; /* offs into local_buffer where valid data starts */ - UINT32 wri_offs_frames; /* where to write fresh data in local_buffer */ - UINT32 hidden_frames; /* ALSA reserve to ensure continuous rendering */ - UINT32 vol_adjusted_frames; /* Frames we've already adjusted the volume of but didn't write yet */ - UINT32 data_in_alsa_frames; - - BYTE *local_buffer, *tmp_buffer, *remapping_buf, *silence_buf; - LONG32 getbuf_last; /* <0 when using tmp_buffer */ - float *vols; - - pthread_mutex_t lock; -}; +struct alsa_stream; struct endpoint { @@ -209,6 +174,14 @@ struct get_position_params UINT64 *qpctime; }; +struct set_volumes_params +{ + struct alsa_stream *stream; + float master_volume; + const float *volumes; + const float *session_volumes; +}; + struct set_event_handle_params { struct alsa_stream *stream; @@ -243,6 +216,7 @@ enum alsa_funcs alsa_get_next_packet_size, alsa_get_frequency, alsa_get_position, + alsa_set_volumes, alsa_set_event_handle, alsa_is_started, }; -- 2.25.1

2 1

[PATCH 4/5] winealsa: Move is_started to the unixlib.
by Huw Davies March 11, 2022

March 11, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 11 +++++++++++ dlls/winealsa.drv/mmdevdrv.c | 19 ++++--------------- dlls/winealsa.drv/unixlib.h | 7 +++++++ 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 870ec4db151..365f5637b20 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2182,6 +2182,16 @@ static NTSTATUS set_event_handle(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS is_started(void *args) +{ + struct is_started_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + return alsa_unlock_result(stream, &params->result, stream->started ? S_OK : S_FALSE); +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -2204,4 +2214,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_frequency, get_position, set_event_handle, + is_started, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 6dfa3ad013f..0f6a30e0f45 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -25,7 +25,6 @@ #include <stdarg.h> #include <stdio.h> #include <math.h> -#include <pthread.h> #include "windef.h" #include "winbase.h" @@ -237,16 +236,6 @@ int WINAPI AUDDRV_GetPriority(void) return Priority_Neutral; } -static void alsa_lock(struct alsa_stream *stream) -{ - pthread_mutex_lock(&stream->lock); -} - -static void alsa_unlock(struct alsa_stream *stream) -{ - pthread_mutex_unlock(&stream->lock); -} - static HRESULT alsa_stream_release(struct alsa_stream *stream, HANDLE timer_thread) { struct release_stream_params params; @@ -1640,6 +1629,7 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, AudioSessionState *state) { AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); + struct is_started_params params; ACImpl *client; TRACE("(%p)->(%p)\n", This, state); @@ -1656,14 +1646,13 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, } LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry){ - alsa_lock(client->stream); - if(client->stream->started){ + params.stream = client->stream; + ALSA_CALL(is_started, &params); + if(params.result == S_OK){ *state = AudioSessionStateActive; - alsa_unlock(client->stream); LeaveCriticalSection(&g_sessions_lock); return S_OK; } - alsa_unlock(client->stream); } LeaveCriticalSection(&g_sessions_lock); diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 89b53fbcb9a..b73f40c8282 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -216,6 +216,12 @@ struct set_event_handle_params HRESULT result; }; +struct is_started_params +{ + struct alsa_stream *stream; + HRESULT result; +}; + enum alsa_funcs { alsa_get_endpoint_ids, @@ -238,6 +244,7 @@ enum alsa_funcs alsa_get_frequency, alsa_get_position, alsa_set_event_handle, + alsa_is_started, }; extern unixlib_handle_t alsa_handle; -- 2.25.1

2 1

[PATCH 3/5] winealsa: Move get_position to the unixlib.
by Huw Davies March 11, 2022

March 11, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 53 ++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 62 ++++-------------------------------- dlls/winealsa.drv/unixlib.h | 9 ++++++ 3 files changed, 68 insertions(+), 56 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 5f13ce07de6..870ec4db151 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2110,6 +2110,58 @@ static NTSTATUS get_frequency(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_position(void *args) +{ + struct get_position_params *params = args; + struct alsa_stream *stream = params->stream; + UINT64 position; + snd_pcm_state_t alsa_state; + + alsa_lock(stream); + + /* avail_update required to get accurate snd_pcm_state() */ + snd_pcm_avail_update(stream->pcm_handle); + alsa_state = snd_pcm_state(stream->pcm_handle); + + if(stream->flow == eRender){ + position = stream->written_frames - stream->held_frames; + + if(stream->started && alsa_state == SND_PCM_STATE_RUNNING && stream->held_frames) + /* we should be using snd_pcm_delay here, but it is broken + * especially during ALSA device underrun. instead, let's just + * interpolate between periods with the system timer. */ + position += interp_elapsed_frames(stream); + + position = min(position, stream->written_frames - stream->held_frames + stream->mmdev_period_frames); + + position = min(position, stream->written_frames); + }else + position = stream->written_frames + stream->held_frames; + + /* ensure monotic growth */ + if(position < stream->last_pos_frames) + position = stream->last_pos_frames; + else + stream->last_pos_frames = position; + + TRACE("frames written: %u, held: %u, state: 0x%x, position: %u\n", + (UINT32)(stream->written_frames%1000000000), stream->held_frames, + alsa_state, (UINT32)(position%1000000000)); + + if(stream->share == AUDCLNT_SHAREMODE_SHARED) + *params->pos = position * stream->fmt->nBlockAlign; + else + *params->pos = position; + + if(params->qpctime){ + LARGE_INTEGER stamp, freq; + NtQueryPerformanceCounter(&stamp, &freq); + *params->qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS set_event_handle(void *args) { struct set_event_handle_params *params = args; @@ -2150,5 +2202,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_current_padding, get_next_packet_size, get_frequency, + get_position, set_event_handle, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index fde97eb4cb7..6dfa3ad013f 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -951,15 +951,6 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, return S_OK; } -static snd_pcm_uframes_t interp_elapsed_frames(struct alsa_stream *stream) -{ - LARGE_INTEGER time_freq, current_time, time_diff; - QueryPerformanceFrequency(&time_freq); - QueryPerformanceCounter(&current_time); - time_diff.QuadPart = current_time.QuadPart - stream->last_period_time.QuadPart; - return MulDiv(time_diff.QuadPart, stream->fmt->nSamplesPerSec, time_freq.QuadPart); -} - static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); @@ -1494,61 +1485,20 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, UINT64 *qpctime) { ACImpl *This = impl_from_IAudioClock(iface); - struct alsa_stream *stream = This->stream; - UINT64 position; - snd_pcm_state_t alsa_state; + struct get_position_params params; TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); if(!pos) return E_POINTER; - alsa_lock(stream); - - /* avail_update required to get accurate snd_pcm_state() */ - snd_pcm_avail_update(stream->pcm_handle); - alsa_state = snd_pcm_state(stream->pcm_handle); - - if(stream->flow == eRender){ - position = stream->written_frames - stream->held_frames; - - if(stream->started && alsa_state == SND_PCM_STATE_RUNNING && stream->held_frames) - /* we should be using snd_pcm_delay here, but it is broken - * especially during ALSA device underrun. instead, let's just - * interpolate between periods with the system timer. */ - position += interp_elapsed_frames(stream); - - position = min(position, stream->written_frames - stream->held_frames + stream->mmdev_period_frames); - - position = min(position, stream->written_frames); - }else - position = stream->written_frames + stream->held_frames; - - /* ensure monotic growth */ - if(position < stream->last_pos_frames) - position = stream->last_pos_frames; - else - stream->last_pos_frames = position; - - TRACE("frames written: %u, held: %u, state: 0x%x, position: %u\n", - (UINT32)(stream->written_frames%1000000000), stream->held_frames, - alsa_state, (UINT32)(position%1000000000)); - - alsa_unlock(stream); - - if(stream->share == AUDCLNT_SHAREMODE_SHARED) - *pos = position * stream->fmt->nBlockAlign; - else - *pos = position; + params.stream = This->stream; + params.pos = pos; + params.qpctime = qpctime; - if(qpctime){ - LARGE_INTEGER stamp, freq; - QueryPerformanceCounter(&stamp); - QueryPerformanceFrequency(&freq); - *qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; - } + ALSA_CALL(get_position, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 6053fe9dc8a..89b53fbcb9a 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -201,6 +201,14 @@ struct get_frequency_params UINT64 *freq; }; +struct get_position_params +{ + struct alsa_stream *stream; + HRESULT result; + UINT64 *pos; + UINT64 *qpctime; +}; + struct set_event_handle_params { struct alsa_stream *stream; @@ -228,6 +236,7 @@ enum alsa_funcs alsa_get_current_padding, alsa_get_next_packet_size, alsa_get_frequency, + alsa_get_position, alsa_set_event_handle, }; -- 2.25.1

2 1

[PATCH 2/5] winealsa: Move get_frequency to the unixlib.
by Huw Davies March 11, 2022

March 11, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 17 +++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 12 ++++++------ dlls/winealsa.drv/unixlib.h | 8 ++++++++ 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 6234591aae4..5f13ce07de6 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2094,6 +2094,22 @@ static NTSTATUS get_next_packet_size(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_frequency(void *args) +{ + struct get_frequency_params *params = args; + struct alsa_stream *stream = params->stream; + UINT64 *freq = params->freq; + + alsa_lock(stream); + + if(stream->share == AUDCLNT_SHAREMODE_SHARED) + *freq = (UINT64)stream->fmt->nSamplesPerSec * stream->fmt->nBlockAlign; + else + *freq = stream->fmt->nSamplesPerSec; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS set_event_handle(void *args) { struct set_event_handle_params *params = args; @@ -2133,5 +2149,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_latency, get_current_padding, get_next_packet_size, + get_frequency, set_event_handle, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 7dacd2606cf..fde97eb4cb7 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1478,16 +1478,16 @@ static ULONG WINAPI AudioClock_Release(IAudioClock *iface) static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) { ACImpl *This = impl_from_IAudioClock(iface); - struct alsa_stream *stream = This->stream; + struct get_frequency_params params; TRACE("(%p)->(%p)\n", This, freq); - if(stream->share == AUDCLNT_SHAREMODE_SHARED) - *freq = (UINT64)stream->fmt->nSamplesPerSec * stream->fmt->nBlockAlign; - else - *freq = stream->fmt->nSamplesPerSec; + params.stream = This->stream; + params.freq = freq; - return S_OK; + ALSA_CALL(get_frequency, &params); + + return params.result; } static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 88f4fae4a9e..6053fe9dc8a 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -194,6 +194,13 @@ struct get_next_packet_size_params UINT32 *frames; }; +struct get_frequency_params +{ + struct alsa_stream *stream; + HRESULT result; + UINT64 *freq; +}; + struct set_event_handle_params { struct alsa_stream *stream; @@ -220,6 +227,7 @@ enum alsa_funcs alsa_get_latency, alsa_get_current_padding, alsa_get_next_packet_size, + alsa_get_frequency, alsa_set_event_handle, }; -- 2.25.1

2 1

[PATCH 1/5] winealsa: Move get_next_packet_size to the unixlib.
by Huw Davies March 11, 2022

March 11, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 13 +++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 11 +++++------ dlls/winealsa.drv/unixlib.h | 8 ++++++++ 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 02063fd3374..6234591aae4 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2082,6 +2082,18 @@ static NTSTATUS get_current_padding(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_next_packet_size(void *args) +{ + struct get_next_packet_size_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + *params->frames = stream->held_frames < stream->mmdev_period_frames ? 0 : stream->mmdev_period_frames; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS set_event_handle(void *args) { struct set_event_handle_params *params = args; @@ -2120,5 +2132,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_buffer_size, get_latency, get_current_padding, + get_next_packet_size, set_event_handle, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index b50025aa77c..7dacd2606cf 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1414,20 +1414,19 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( IAudioCaptureClient *iface, UINT32 *frames) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct alsa_stream *stream = This->stream; + struct get_next_packet_size_params params; TRACE("(%p)->(%p)\n", This, frames); if(!frames) return E_POINTER; - alsa_lock(stream); - - *frames = stream->held_frames < stream->mmdev_period_frames ? 0 : stream->mmdev_period_frames; + params.stream = This->stream; + params.frames = frames; - alsa_unlock(stream); + ALSA_CALL(get_next_packet_size, &params); - return S_OK; + return params.result; } static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index ddca1a3100c..88f4fae4a9e 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -187,6 +187,13 @@ struct get_current_padding_params UINT32 *padding; }; +struct get_next_packet_size_params +{ + struct alsa_stream *stream; + HRESULT result; + UINT32 *frames; +}; + struct set_event_handle_params { struct alsa_stream *stream; @@ -212,6 +219,7 @@ enum alsa_funcs alsa_get_buffer_size, alsa_get_latency, alsa_get_current_padding, + alsa_get_next_packet_size, alsa_set_event_handle, }; -- 2.25.1

2 1

[PATCH] wined3d: Use list_empty() in shader_glsl_destroy().
by Zebediah Figura March 11, 2022

March 11, 2022

From: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b2912d2c525..1086eafad4f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11151,7 +11151,7 @@ static void shader_glsl_destroy(struct wined3d_shader *shader) TRACE("Deleting linked programs.\n"); linked_programs = &shader->linked_programs; - if (linked_programs->next) + if (!list_empty(linked_programs)) { struct glsl_shader_prog_link *entry, *entry2; UINT i; -- 2.35.1

2 1

[PATCH 5/5] d2d1: Shrink stroke width for d2d_transformed_geometry_StrokeContainsPoint().
by Zhiyi Zhang March 11, 2022

March 11, 2022

So that stroke width won't be transformed. Fix PowerPoint 2016 text in TextBoxes can not be selected properly. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d2d1/geometry.c | 4 ++++ dlls/d2d1/tests/d2d1.c | 10 ++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 7f02a63f284..eb1bb353b4c 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -5036,9 +5036,13 @@ static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_StrokeContainsPoint(ID iface, debug_d2d_point_2f(&point), stroke_width, stroke_style, transform, tolerance, contains); g = geometry->transform; + stroke_width /= g.m11; if (transform) d2d_matrix_multiply(&g, transform); + if (tolerance <= 0.0f) + tolerance = D2D1_DEFAULT_FLATTENING_TOLERANCE; + return ID2D1Geometry_StrokeContainsPoint(geometry->u.transformed.src_geometry, point, stroke_width, stroke_style, &g, tolerance, contains); } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 731ef6e0807..90445ba84fc 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10372,7 +10372,6 @@ static void test_stroke_contains_point(BOOL d3d11) float stroke_width; BOOL matrix; BOOL contains; - BOOL todo; } rectangle_tests[] = { @@ -10535,19 +10534,19 @@ static void test_stroke_contains_point(BOOL d3d11) { /* 0. Stroked area hittesting. Edge. Tolerance is 0.0f */ {{{{0.0f}}}, {0.74f, 2.5f}, 0.0f, 1.0f, FALSE, TRUE}, - {{{{0.0f}}}, {0.75f, 2.5f}, 0.0f, 1.0f, FALSE, FALSE, TRUE}, + {{{{0.0f}}}, {0.75f, 2.5f}, 0.0f, 1.0f, FALSE, FALSE}, /* 2. Stroked area hittesting. Edge. Tolerance is negative */ {{{{0.0f}}}, {0.74f, 2.5f}, -1.0f, 1.0f, FALSE, TRUE}, - {{{{0.0f}}}, {0.75f, 2.5f}, -1.0f, 1.0f, FALSE, FALSE, TRUE}, + {{{{0.0f}}}, {0.75f, 2.5f}, -1.0f, 1.0f, FALSE, FALSE}, /* 4. Stroked area hittesting. Edge. Tolerance is close to zero */ {{{{0.0f}}}, {0.501f, 2.5f}, 0.001f, 1.0f, FALSE, TRUE}, - {{{{0.0f}}}, {0.502f, 2.5f}, 0.001f, 1.0f, FALSE, FALSE, TRUE}, + {{{{0.0f}}}, {0.502f, 2.5f}, 0.001f, 1.0f, FALSE, FALSE}, /* 6. Stroked area hittesting. Edge. Tolerance is D2D1_DEFAULT_FLATTENING_TOLERANCE */ {{{{0.0f}}}, {0.74f, 2.5f}, 0.25f, 1.0f, FALSE, TRUE}, - {{{{0.0f}}}, {0.75f, 2.5f}, 0.25f, 1.0f, FALSE, FALSE, TRUE}, + {{{{0.0f}}}, {0.75f, 2.5f}, 0.25f, 1.0f, FALSE, FALSE}, }; hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); @@ -10657,7 +10656,6 @@ static void test_stroke_contains_point(BOOL d3d11) test->stroke_width, NULL, test->matrix ? &test->transform : NULL, test->tolerance, &contains); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine_if(test->todo) ok(contains == test->contains, "Got unexpected result %#x.\n", contains); winetest_pop_context(); -- 2.32.0

3 2

[PATCH 4/5] d2d1/tests: Add d2d_transformed_geometry_StrokeContainsPoint() tests.
by Zhiyi Zhang March 11, 2022

March 11, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d1e8b97ed7d..731ef6e0807 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10352,7 +10352,9 @@ static void test_effect_crop(BOOL d3d11) static void test_stroke_contains_point(BOOL d3d11) { + ID2D1TransformedGeometry *transformed_geometry; ID2D1RectangleGeometry *rectangle; + D2D1_MATRIX_3X2_F matrix; ID2D1GeometrySink *sink; ID2D1PathGeometry *path; ID2D1Factory *factory; @@ -10370,6 +10372,7 @@ static void test_stroke_contains_point(BOOL d3d11) float stroke_width; BOOL matrix; BOOL contains; + BOOL todo; } rectangle_tests[] = { @@ -10527,6 +10530,24 @@ static void test_stroke_contains_point(BOOL d3d11) {{{{1.0f, 0.0f, 1.0f, 1.0f}}}, {1425.0f, 827.6f}, 0.1f, 5.0f, TRUE, FALSE}, {{{{1.0f, 0.0f, 1.0f, 1.0f}}}, {1620.1f, 800.0f}, 0.1f, 5.0f, TRUE, FALSE}, {{{{1.0f, 0.0f, 1.0f, 1.0f}}}, {1620.4f, 800.0f}, 0.1f, 5.0f, TRUE, TRUE}, + }, + transformed_tests[] = + { + /* 0. Stroked area hittesting. Edge. Tolerance is 0.0f */ + {{{{0.0f}}}, {0.74f, 2.5f}, 0.0f, 1.0f, FALSE, TRUE}, + {{{{0.0f}}}, {0.75f, 2.5f}, 0.0f, 1.0f, FALSE, FALSE, TRUE}, + + /* 2. Stroked area hittesting. Edge. Tolerance is negative */ + {{{{0.0f}}}, {0.74f, 2.5f}, -1.0f, 1.0f, FALSE, TRUE}, + {{{{0.0f}}}, {0.75f, 2.5f}, -1.0f, 1.0f, FALSE, FALSE, TRUE}, + + /* 4. Stroked area hittesting. Edge. Tolerance is close to zero */ + {{{{0.0f}}}, {0.501f, 2.5f}, 0.001f, 1.0f, FALSE, TRUE}, + {{{{0.0f}}}, {0.502f, 2.5f}, 0.001f, 1.0f, FALSE, FALSE, TRUE}, + + /* 6. Stroked area hittesting. Edge. Tolerance is D2D1_DEFAULT_FLATTENING_TOLERANCE */ + {{{{0.0f}}}, {0.74f, 2.5f}, 0.25f, 1.0f, FALSE, TRUE}, + {{{{0.0f}}}, {0.75f, 2.5f}, 0.25f, 1.0f, FALSE, FALSE, TRUE}, }; hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); @@ -10616,6 +10637,34 @@ static void test_stroke_contains_point(BOOL d3d11) ID2D1PathGeometry_Release(path); + set_rect(&rect, 0.0f, 0.0f, 5.0f, 5.0f); + hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &rectangle); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + set_matrix_identity(&matrix); + scale_matrix(&matrix, 2.0f, 4.0f); + hr = ID2D1Factory_CreateTransformedGeometry(factory, (ID2D1Geometry *)rectangle, &matrix, + &transformed_geometry); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + for (i = 0; i < ARRAY_SIZE(transformed_tests); ++i) + { + const struct contains_point_test *test = &transformed_tests[i]; + + winetest_push_context("Test %u", i); + + contains = !test->contains; + hr = ID2D1TransformedGeometry_StrokeContainsPoint(transformed_geometry, test->point, + test->stroke_width, NULL, test->matrix ? &test->transform : NULL, test->tolerance, + &contains); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + todo_wine_if(test->todo) + ok(contains == test->contains, "Got unexpected result %#x.\n", contains); + + winetest_pop_context(); + } + ID2D1TransformedGeometry_Release(transformed_geometry); + ID2D1RectangleGeometry_Release(rectangle); + ID2D1Factory_Release(factory); } -- 2.32.0

2 1

[PATCH 2/5] d2d1/tests: Test d2d_device_context_SetTarget() with bitmaps of D2D1_ALPHA_MODE_IGNORE.
by Zhiyi Zhang March 11, 2022

March 11, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 50 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3ade9634069..7c54f365e06 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4341,18 +4341,22 @@ static void test_bitmap_formats(BOOL d3d11) static void test_alpha_mode(BOOL d3d11) { D2D1_RENDER_TARGET_PROPERTIES rt_desc; + D2D1_BITMAP_PROPERTIES1 bitmap_desc1; D2D1_BITMAP_PROPERTIES bitmap_desc; ID2D1SolidColorBrush *color_brush; ID2D1BitmapBrush *bitmap_brush; struct d2d1_test_context ctx; + ID2D1DeviceContext *context; + ID2D1Bitmap1 *bitmap1; ID2D1RenderTarget *rt; + IDXGISurface *surface; ID2D1Bitmap *bitmap; D2D1_COLOR_F color; + BOOL match, match2; D2D1_RECT_F rect; D2D1_SIZE_U size; ULONG refcount; HRESULT hr; - BOOL match; static const DWORD bitmap_data[] = { @@ -4546,8 +4550,50 @@ static void test_alpha_mode(BOOL d3d11) refcount = ID2D1Bitmap_Release(bitmap); ok(refcount == 1, "Bitmap has %lu references left.\n", refcount); - ID2D1SolidColorBrush_Release(color_brush); ID2D1BitmapBrush_Release(bitmap_brush); + + hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&context); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + set_size_u(&size, 4, 4); + memset(&bitmap_desc1, 0, sizeof(bitmap_desc1)); + bitmap_desc1.dpiX = 96.0f; + bitmap_desc1.dpiY = 96.0f; + bitmap_desc1.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc1.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc1.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; + hr = ID2D1DeviceContext_CreateBitmap(context, size, bitmap_data, 4 * sizeof(*bitmap_data), + &bitmap_desc1, &bitmap1); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ID2D1DeviceContext_BeginDraw(context); + ID2D1DeviceContext_SetTarget(context, (ID2D1Image *)bitmap1); + set_rect(&rect, 0.0f, 2.0f, 1.0f, 2.0f); + ID2D1SolidColorBrush_SetOpacity(color_brush, 1.0f); + ID2D1DeviceContext_FillRectangle(context, &rect, (ID2D1Brush *)color_brush); + set_rect(&rect, 1.0f, 2.0f, 3.0f, 3.0f); + ID2D1SolidColorBrush_SetOpacity(color_brush, 0.75f); + ID2D1DeviceContext_FillRectangle(context, &rect, (ID2D1Brush *)color_brush); + set_rect(&rect, 3.0f, 2.0f, 3.0f, 3.0f); + ID2D1SolidColorBrush_SetOpacity(color_brush, 0.25f); + ID2D1DeviceContext_FillRectangle(context, &rect, (ID2D1Brush *)color_brush); + hr = ID2D1DeviceContext_EndDraw(context, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + surface = ctx.surface; + hr = ID2D1Bitmap1_GetSurface(bitmap1, &ctx.surface); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + match = compare_surface(&ctx, "e7ee77e89745fa5d195fd78bd398738330cfcde8"); + match2 = compare_surface(&ctx, "4855c7c082c8ede364cf6e2dcde83f95b88aecbe"); + todo_wine + ok(match || broken(match2) /* Win7 TestBots */, "Surface does not match.\n"); + IDXGISurface_Release(ctx.surface); + ctx.surface = surface; + ID2D1DeviceContext_SetTarget(context, NULL); + + ID2D1Bitmap1_Release(bitmap1); + ID2D1DeviceContext_Release(context); + ID2D1SolidColorBrush_Release(color_brush); ID2D1RenderTarget_Release(rt); release_test_context(&ctx); } -- 2.32.0

2 1

[PATCH 3/5] d2d1: Use newer blend options in d2d_device_context_SetTarget() for bitmaps of D2D1_ALPHA_MODE_IGNORE.
by Zhiyi Zhang March 11, 2022

March 11, 2022

When bitmap alpha mode is D2D1_ALPHA_MODE_IGNORE, D3D11_BLEND_ZERO is used for SrcBlendAlpha and D3D11_BLEND_ONE for DestBlendAlpha on Win7. However, tests show that D3D11_BLEND_ONE is used for SrcBlendAlpha and D3D11_BLEND_INV_SRC_ALPHA for DestBlendAlpha on Win8+. The patch changes d2d_device_context_SetTarget() to use the Win8+ behaviour. Fix PowerPoint 2016 slideshow artifacts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d2d1/device.c | 12 ++---------- dlls/d2d1/tests/d2d1.c | 1 - 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 47da411f3b6..ea38ca41c8c 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -2069,16 +2069,8 @@ static void STDMETHODCALLTYPE d2d_device_context_SetTarget(ID2D1DeviceContext *i blend_desc.RenderTarget[0].SrcBlend = D3D11_BLEND_ONE; blend_desc.RenderTarget[0].DestBlend = D3D11_BLEND_INV_SRC_ALPHA; blend_desc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD; - if (context->desc.pixelFormat.alphaMode == D2D1_ALPHA_MODE_IGNORE) - { - blend_desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ZERO; - blend_desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ONE; - } - else - { - blend_desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE; - blend_desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_INV_SRC_ALPHA; - } + blend_desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE; + blend_desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_INV_SRC_ALPHA; blend_desc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD; blend_desc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL; if (FAILED(hr = ID3D11Device1_CreateBlendState(context->d3d_device, &blend_desc, &context->bs))) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 7c54f365e06..d1e8b97ed7d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4585,7 +4585,6 @@ static void test_alpha_mode(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); match = compare_surface(&ctx, "e7ee77e89745fa5d195fd78bd398738330cfcde8"); match2 = compare_surface(&ctx, "4855c7c082c8ede364cf6e2dcde83f95b88aecbe"); - todo_wine ok(match || broken(match2) /* Win7 TestBots */, "Surface does not match.\n"); IDXGISurface_Release(ctx.surface); ctx.surface = surface; -- 2.32.0

2 1