February 2022 - Wine-Devel - list.winehq.org

[PATCH 6/7] winealsa: Pass a stream ptr to alsa_{read|write}_data().
by Huw Davies Feb. 21, 2022

Feb. 21, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 14dfbd07acb..c9a7c331158 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1470,9 +1470,8 @@ static BYTE *remap_channels(struct alsa_stream *stream, BYTE *buf, snd_pcm_ufram return stream->remapping_buf; } -static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames) +static void adjust_buffer_volume(const struct alsa_stream *stream, BYTE *buf, snd_pcm_uframes_t frames) { - struct alsa_stream *stream = This->stream; BOOL adjust = FALSE; UINT32 i, channels, mute = 0; BYTE *end; @@ -1587,12 +1586,11 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ } } -static snd_pcm_sframes_t alsa_write_best_effort(ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames) +static snd_pcm_sframes_t alsa_write_best_effort(struct alsa_stream *stream, BYTE *buf, snd_pcm_uframes_t frames) { - struct alsa_stream *stream = This->stream; snd_pcm_sframes_t written; - adjust_buffer_volume(This, buf, frames); + adjust_buffer_volume(stream, buf, frames); /* Mark the frames we've already adjusted */ if (stream->vol_adjusted_frames < frames) @@ -1625,11 +1623,10 @@ static snd_pcm_sframes_t alsa_write_best_effort(ACImpl *This, BYTE *buf, snd_pcm return written; } -static snd_pcm_sframes_t alsa_write_buffer_wrap(ACImpl *This, BYTE *buf, +static snd_pcm_sframes_t alsa_write_buffer_wrap(struct alsa_stream *stream, BYTE *buf, snd_pcm_uframes_t buflen, snd_pcm_uframes_t offs, snd_pcm_uframes_t to_write) { - struct alsa_stream *stream = This->stream; snd_pcm_sframes_t ret = 0; while(to_write){ @@ -1641,7 +1638,7 @@ static snd_pcm_sframes_t alsa_write_buffer_wrap(ACImpl *This, BYTE *buf, else chunk = to_write; - tmp = alsa_write_best_effort(This, buf + offs * stream->fmt->nBlockAlign, chunk); + tmp = alsa_write_best_effort(stream, buf + offs * stream->fmt->nBlockAlign, chunk); if(tmp < 0) return ret; if(!tmp) @@ -1663,9 +1660,8 @@ static UINT buf_ptr_diff(UINT left, UINT right, UINT bufsize) return bufsize - (left - right); } -static UINT data_not_in_alsa(ACImpl *This) +static UINT data_not_in_alsa(struct alsa_stream *stream) { - struct alsa_stream *stream = This->stream; UINT32 diff; diff = buf_ptr_diff(stream->lcl_offs_frames, stream->wri_offs_frames, stream->bufsize_frames); @@ -1692,9 +1688,8 @@ static UINT data_not_in_alsa(ACImpl *This) * * During Stop, we rewind the ALSA buffer */ -static void alsa_write_data(ACImpl *This) +static void alsa_write_data(struct alsa_stream *stream) { - struct alsa_stream *stream = This->stream; snd_pcm_sframes_t written; snd_pcm_uframes_t avail, max_copy_frames, data_frames_played; int err; @@ -1723,13 +1718,13 @@ static void alsa_write_data(ACImpl *This) * continuous rendering. Additional benefit: Force ALSA to start. */ if(stream->data_in_alsa_frames == 0 && stream->held_frames < stream->alsa_period_frames) { - alsa_write_best_effort(This, stream->silence_buf, + alsa_write_best_effort(stream, stream->silence_buf, stream->alsa_period_frames - stream->held_frames); stream->vol_adjusted_frames = 0; } if(stream->started) - max_copy_frames = data_not_in_alsa(This); + max_copy_frames = data_not_in_alsa(stream); else max_copy_frames = 0; @@ -1747,7 +1742,7 @@ static void alsa_write_data(ACImpl *This) to_write = min(avail, max_copy_frames); - written = alsa_write_buffer_wrap(This, stream->local_buffer, + written = alsa_write_buffer_wrap(stream, stream->local_buffer, stream->bufsize_frames, stream->lcl_offs_frames, to_write); if(written <= 0) break; @@ -1763,9 +1758,8 @@ static void alsa_write_data(ACImpl *This) SetEvent(stream->event); } -static void alsa_read_data(ACImpl *This) +static void alsa_read_data(struct alsa_stream *stream) { - struct alsa_stream *stream = This->stream; snd_pcm_sframes_t nread; UINT32 pos = stream->wri_offs_frames, limit = stream->held_frames; unsigned int i; @@ -1833,9 +1827,9 @@ static void CALLBACK alsa_push_buffer_data(void *user, BOOLEAN timer) QueryPerformanceCounter(&stream->last_period_time); if(This->dataflow == eRender) - alsa_write_data(This); + alsa_write_data(stream); else if(This->dataflow == eCapture) - alsa_read_data(This); + alsa_read_data(stream); LeaveCriticalSection(&This->lock); } @@ -1923,7 +1917,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) offs = stream->wri_offs_frames - stream->held_frames; /* fill it with data */ - written = alsa_write_buffer_wrap(This, stream->local_buffer, + written = alsa_write_buffer_wrap(stream, stream->local_buffer, stream->bufsize_frames, offs, avail); if(written > 0){ -- 2.25.1

2 1

[PATCH 5/7] winealsa: Store the session mute state in the stream volumes.
by Huw Davies Feb. 21, 2022

Feb. 21, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 45 +++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 959157ade87..14dfbd07acb 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -327,7 +327,8 @@ static void set_stream_volumes(ACImpl *This) unsigned int i; for(i = 0; i < stream->fmt->nChannels; i++) - stream->vols[i] = This->vols[i] * This->session->channel_vols[i] * This->session->master_vol; + stream->vols[i] = This->session->mute ? 0.0f : + This->vols[i] * This->session->channel_vols[i] * This->session->master_vol; } HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, @@ -1469,30 +1470,32 @@ static BYTE *remap_channels(struct alsa_stream *stream, BYTE *buf, snd_pcm_ufram return stream->remapping_buf; } -static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames, BOOL mute) +static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames) { struct alsa_stream *stream = This->stream; BOOL adjust = FALSE; - UINT32 i, channels; + UINT32 i, channels, mute = 0; BYTE *end; if (stream->vol_adjusted_frames >= frames) return; channels = stream->fmt->nChannels; - if (mute) + /* Adjust the buffer based on the volume for each channel */ + for (i = 0; i < channels; i++) + { + adjust |= stream->vols[i] != 1.0f; + if (stream->vols[i] == 0.0f) + mute++; + } + + if (mute == channels) { int err = snd_pcm_format_set_silence(stream->alsa_format, buf, frames * channels); if (err < 0) WARN("Setting buffer to silence failed: %d (%s)\n", err, snd_strerror(err)); return; } - - /* Adjust the buffer based on the volume for each channel */ - for (i = 0; i < channels; i++) - { - adjust |= stream->vols[i] != 1.0f; - } if (!adjust) return; /* Skip the frames we've already adjusted before */ @@ -1584,13 +1587,12 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ } } -static snd_pcm_sframes_t alsa_write_best_effort(ACImpl *This, BYTE *buf, - snd_pcm_uframes_t frames, BOOL mute) +static snd_pcm_sframes_t alsa_write_best_effort(ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames) { struct alsa_stream *stream = This->stream; snd_pcm_sframes_t written; - adjust_buffer_volume(This, buf, frames, mute); + adjust_buffer_volume(This, buf, frames); /* Mark the frames we've already adjusted */ if (stream->vol_adjusted_frames < frames) @@ -1639,7 +1641,7 @@ static snd_pcm_sframes_t alsa_write_buffer_wrap(ACImpl *This, BYTE *buf, else chunk = to_write; - tmp = alsa_write_best_effort(This, buf + offs * stream->fmt->nBlockAlign, chunk, This->session->mute); + tmp = alsa_write_best_effort(This, buf + offs * stream->fmt->nBlockAlign, chunk); if(tmp < 0) return ret; if(!tmp) @@ -1722,7 +1724,7 @@ static void alsa_write_data(ACImpl *This) if(stream->data_in_alsa_frames == 0 && stream->held_frames < stream->alsa_period_frames) { alsa_write_best_effort(This, stream->silence_buf, - stream->alsa_period_frames - stream->held_frames, FALSE); + stream->alsa_period_frames - stream->held_frames); stream->vol_adjusted_frames = 0; } @@ -1766,6 +1768,7 @@ static void alsa_read_data(ACImpl *This) struct alsa_stream *stream = This->stream; snd_pcm_sframes_t nread; UINT32 pos = stream->wri_offs_frames, limit = stream->held_frames; + unsigned int i; if(!stream->started) goto exit; @@ -1799,7 +1802,10 @@ static void alsa_read_data(ACImpl *This) } } - if(This->session->mute){ + for(i = 0; i < stream->fmt->nChannels; i++) + if(stream->vols[i] != 0.0f) + break; + if(i == stream->fmt->nChannels){ /* mute */ int err; if((err = snd_pcm_format_set_silence(stream->alsa_format, stream->local_buffer + pos * stream->fmt->nBlockAlign, @@ -3129,13 +3135,20 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); AudioSession *session = This->session; + ACImpl *client; TRACE("(%p)->(%u, %s)\n", session, mute, debugstr_guid(context)); if(context) FIXME("Notifications not supported yet\n"); + EnterCriticalSection(&g_sessions_lock); + session->mute = mute; + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client); + + LeaveCriticalSection(&g_sessions_lock); return S_OK; } -- 2.25.1

2 1

[PATCH 4/7] winealsa: Store the session master volume in the stream.
by Huw Davies Feb. 21, 2022

Feb. 21, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 222decdb150..959157ade87 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -327,7 +327,7 @@ static void set_stream_volumes(ACImpl *This) unsigned int i; for(i = 0; i < stream->fmt->nChannels; i++) - stream->vols[i] = This->vols[i] * This->session->channel_vols[i]; + stream->vols[i] = This->vols[i] * This->session->channel_vols[i] * This->session->master_vol; } HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, @@ -1472,7 +1472,6 @@ static BYTE *remap_channels(struct alsa_stream *stream, BYTE *buf, snd_pcm_ufram static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames, BOOL mute) { struct alsa_stream *stream = This->stream; - float vol[ARRAY_SIZE(stream->alsa_channel_map)]; BOOL adjust = FALSE; UINT32 i, channels; BYTE *end; @@ -1492,8 +1491,7 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ /* Adjust the buffer based on the volume for each channel */ for (i = 0; i < channels; i++) { - vol[i] = stream->vols[i] * This->session->master_vol; - adjust |= vol[i] != 1.0f; + adjust |= stream->vols[i] != 1.0f; } if (!adjust) return; @@ -1510,7 +1508,7 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ do \ { \ for (i = 0; i < channels; i++) \ - p[i] = p[i] * vol[i]; \ + p[i] = p[i] * stream->vols[i]; \ p += i; \ } while ((BYTE*)p != end); \ } while (0) @@ -1548,7 +1546,7 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ v[3] = q[2] & ~0xff; for (k = 0; k < 4; k++) { - v[k] = (INT32)((INT32)v[k] * vol[i]); + v[k] = (INT32)((INT32)v[k] * stream->vols[i]); v[k] &= mask; if (++i == channels) i = 0; } @@ -1559,7 +1557,7 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ p = (BYTE*)q; while (p != end) { - UINT32 v = (INT32)((INT32)(p[0] << 8 | p[1] << 16 | p[2] << 24) * vol[i]); + UINT32 v = (INT32)((INT32)(p[0] << 8 | p[1] << 16 | p[2] << 24) * stream->vols[i]); v &= mask; *p++ = v >> 8 & 0xff; *p++ = v >> 16 & 0xff; @@ -1575,7 +1573,7 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ do { for (i = 0; i < channels; i++) - p[i] = (int)((p[i] - 128) * vol[i]) + 128; + p[i] = (int)((p[i] - 128) * stream->vols[i]) + 128; p += i; } while ((BYTE*)p != end); break; @@ -3086,6 +3084,7 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); AudioSession *session = This->session; + ACImpl *client; TRACE("(%p)->(%f, %s)\n", session, level, wine_dbgstr_guid(context)); @@ -3101,6 +3100,9 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( session->master_vol = level; + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client); + LeaveCriticalSection(&g_sessions_lock); return S_OK; -- 2.25.1

2 1

[PATCH 3/7] winealsa: Store the session channel vols in the stream.
by Huw Davies Feb. 21, 2022

Feb. 21, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 8f198531cc0..222decdb150 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -327,7 +327,7 @@ static void set_stream_volumes(ACImpl *This) unsigned int i; for(i = 0; i < stream->fmt->nChannels; i++) - stream->vols[i] = This->vols[i]; + stream->vols[i] = This->vols[i] * This->session->channel_vols[i]; } HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, @@ -1493,7 +1493,6 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ for (i = 0; i < channels; i++) { vol[i] = stream->vols[i] * This->session->master_vol; - vol[i] *= This->session->channel_vols[i]; adjust |= vol[i] != 1.0f; } if (!adjust) return; @@ -3375,6 +3374,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; + ACImpl *client; TRACE("(%p)->(%d, %f, %s)\n", session, index, level, wine_dbgstr_guid(context)); @@ -3394,6 +3394,9 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( session->channel_vols[index] = level; + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client); + LeaveCriticalSection(&g_sessions_lock); return S_OK; @@ -3425,6 +3428,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; unsigned int i; + ACImpl *client; TRACE("(%p)->(%d, %p, %s)\n", session, count, levels, wine_dbgstr_guid(context)); @@ -3445,6 +3449,9 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( for(i = 0; i < count; ++i) session->channel_vols[i] = levels[i]; + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client); + LeaveCriticalSection(&g_sessions_lock); return S_OK; -- 2.25.1

2 1

[PATCH 2/7] winealsa: Remove an unnecessary check on the session channel count.
by Huw Davies Feb. 21, 2022

Feb. 21, 2022

This must always be at least equal to any given stream's channels. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index d1f9a1d35a4..8f198531cc0 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1491,13 +1491,11 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ /* Adjust the buffer based on the volume for each channel */ for (i = 0; i < channels; i++) - vol[i] = stream->vols[i] * This->session->master_vol; - for (i = 0; i < min(channels, This->session->channel_count); i++) { + vol[i] = stream->vols[i] * This->session->master_vol; vol[i] *= This->session->channel_vols[i]; adjust |= vol[i] != 1.0f; } - while (i < channels) adjust |= vol[i++] != 1.0f; if (!adjust) return; /* Skip the frames we've already adjusted before */ -- 2.25.1

2 1

[PATCH 1/7] winealsa: Store the channel volumes in the stream.
by Huw Davies Feb. 21, 2022

Feb. 21, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 24 +++++++++++++++++++++++- dlls/winealsa.drv/unixlib.h | 1 + 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 48694710719..d1f9a1d35a4 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -321,6 +321,15 @@ static snd_pcm_stream_t alsa_get_direction(EDataFlow flow) return (flow == eRender) ? SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE; } +static void set_stream_volumes(ACImpl *This) +{ + struct alsa_stream *stream = This->stream; + unsigned int i; + + for(i = 0; i < stream->fmt->nChannels; i++) + stream->vols[i] = This->vols[i]; +} + HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, UINT *num, UINT *def_index) { @@ -591,6 +600,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); HeapFree(GetProcessHeap(), 0, stream->hw_params); CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream->vols); HeapFree(GetProcessHeap(), 0, stream); } HeapFree(GetProcessHeap(), 0, This); @@ -1171,6 +1181,14 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, for(i = 0; i < This->channel_count; ++i) This->vols[i] = 1.f; + stream->vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); + if(!stream->vols){ + hr = E_OUTOFMEMORY; + goto exit; + } + for(i = 0; i < fmt->nChannels; ++i) + stream->vols[i] = 1.f; + stream->share = mode; stream->flags = flags; @@ -1194,11 +1212,13 @@ exit: stream->local_buffer = NULL; CoTaskMemFree(stream->fmt); stream->fmt = NULL; + HeapFree(GetProcessHeap(), 0, stream->vols); HeapFree(GetProcessHeap(), 0, stream); HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; }else{ This->stream = stream; + set_stream_volumes(This); } LeaveCriticalSection(&This->lock); @@ -1471,7 +1491,7 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ /* Adjust the buffer based on the volume for each channel */ for (i = 0; i < channels; i++) - vol[i] = This->vols[i] * This->session->master_vol; + vol[i] = stream->vols[i] * This->session->master_vol; for (i = 0; i < min(channels, This->session->channel_count); i++) { vol[i] *= This->session->channel_vols[i]; @@ -3214,6 +3234,7 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( EnterCriticalSection(&This->lock); This->vols[index] = level; + set_stream_volumes(This); LeaveCriticalSection(&This->lock); @@ -3258,6 +3279,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( for(i = 0; i < count; ++i) This->vols[i] = levels[i]; + set_stream_volumes(This); LeaveCriticalSection(&This->lock); diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index cd8d303b5d3..f121763952c 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -49,6 +49,7 @@ struct alsa_stream BYTE *local_buffer, *tmp_buffer, *remapping_buf, *silence_buf; LONG32 getbuf_last; /* <0 when using tmp_buffer */ + float *vols; }; struct endpoint -- 2.25.1

2 1

[PATCH] include/windows.foundation.collections.idl: Add missing required iface for IMapView.
by Bernhard Kölbl Feb. 21, 2022

Feb. 21, 2022

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- include/windows.foundation.collections.idl | 36 ++++++++++++++-------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index a2d2d75ec4f..0be8ab41e95 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -74,18 +74,6 @@ cpp_quote("#endif") namespace Collections { - [ - contract(Windows.Foundation.FoundationContract, 1.0), - uuid(e480ce40-a338-4ada-adcf-272272e48cb9) - ] - interface IMapView<K, V> : IInspectable - { - HRESULT Lookup([in] K key, [out] V *value); - [propget] HRESULT Size([out] unsigned int *size); - HRESULT HasKey([in] K key, [out] boolean *found); - HRESULT Split([out] IMapView<K, V> **first, [out] IMapView<K, V> **second); - } - [ contract(Windows.Foundation.FoundationContract, 1.0), uuid(6a79e863-4300-459a-9966-cbb660963ee1) @@ -107,6 +95,30 @@ cpp_quote("#endif") HRESULT First([out, retval] Windows.Foundation.Collections.IIterator<T> **value); } + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(02b51929-c1c4-4a7e-8940-0312b5c18500) + ] + interface IKeyValuePair<K, V> : IInspectable + { + [propget] HRESULT Key([out] K *key); + [propget] HRESULT Value([out] V *value); + } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(e480ce40-a338-4ada-adcf-272272e48cb9) + ] + interface IMapView<K, V> : IInspectable + requires + IIterable<IKeyValuePair<K, V>* > + { + HRESULT Lookup([in] K key, [out] V *value); + [propget] HRESULT Size([out] unsigned int *size); + HRESULT HasKey([in] K key, [out] boolean *found); + HRESULT Split([out] IMapView<K, V> **first, [out] IMapView<K, V> **second); + } + [ contract(Windows.Foundation.FoundationContract, 1.0), uuid(bbe1fa4c-b0e3-4583-baef-1f1b2e483e56) -- 2.35.1

1 0

[tools 1/2] testbot/VMs: Make sure $VM->Errors does not overflow.
by Francois Gouget Feb. 21, 2022

Feb. 21, 2022

The Errors field definition only allows two digits which sounds like more than enough for a count of consecutive errors but can overflow in a few days if the VM hosts are knocked out, which then causes the scripts to die. It would be easy to increase the maximum number of digits but that would only postpone the issue so add VM::AddError() to make sure the field does not overflow. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 3 +-- testbot/bin/WineRunBuild.pl | 3 +-- testbot/bin/WineRunReconfig.pl | 3 +-- testbot/bin/WineRunTask.pl | 3 +-- testbot/bin/WineRunWineTest.pl | 3 +-- testbot/lib/WineTestBot/Engine/Scheduler.pm | 6 ++---- testbot/lib/WineTestBot/VMs.pm | 9 +++++++++ 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 47839b611d..a025085d44 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -189,8 +189,7 @@ sub FatalError($) } $VM->ChildDeadline(undef); $VM->ChildPid(undef); - my $Errors = ($VM->Errors || 0) + 1; - $VM->Errors($Errors); + my $Errors = $VM->AddError(); my ($ErrProperty, $SaveErrMessage) = $VM->Save(); if (defined $SaveErrMessage) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 8585882b7d..50696b7091 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -241,8 +241,7 @@ sub WrapUpAndExit($;$$$$) $VM->Status($NewVMStatus); if ($NewVMStatus eq 'offline') { - my $Errors = ($VM->Errors || 0) + 1; - $VM->Errors($Errors); + $VM->AddError(); } else { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 373e657dc4..b4035cb021 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -243,8 +243,7 @@ sub WrapUpAndExit($;$$$$) $VM->Status($NewVMStatus); if ($NewVMStatus eq 'offline') { - my $Errors = ($VM->Errors || 0) + 1; - $VM->Errors($Errors); + $VM->AddError(); } else { diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 58e055ca8d..511bde0424 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -275,8 +275,7 @@ sub WrapUpAndExit($;$$$$) $VM->Status($NewVMStatus); if ($NewVMStatus eq 'offline') { - my $Errors = ($VM->Errors || 0) + 1; - $VM->Errors($Errors); + $VM->AddError(); } else { diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index c9a57bb86c..c1a37aec5f 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -272,8 +272,7 @@ sub WrapUpAndExit($;$$$$) $VM->Status($NewVMStatus); if ($NewVMStatus eq 'offline') { - my $Errors = ($VM->Errors || 0) + 1; - $VM->Errors($Errors); + $VM->AddError(); } else { diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 800d136835..f606c0d07b 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -272,8 +272,7 @@ sub _CheckAndClassifyVMs() $FoundVMErrors = 1; if ($VM->Status eq "reverting" or $VM->Status eq "sleeping") { - my $Errors = ($VM->Errors || 0) + 1; - $VM->Errors($Errors); + my $Errors = $VM->AddError(); $VM->Status("offline"); NotifyAdministrator("Putting the $VMKey VM offline", "The last $Errors revert operations timed out.\n\n". @@ -360,8 +359,7 @@ sub _CheckAndClassifyVMs() $FoundVMErrors = 1; $VM->ChildDeadline(undef); $VM->ChildPid(undef); - my $Errors = ($VM->Errors || 0) + 1; - $VM->Errors($Errors); + my $Errors = $VM->AddError(); if ($Errors >= $MaxVMErrors) { $VM->Status("offline"); diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 596499acd0..60a52b86c5 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -264,6 +264,15 @@ sub Status($;$) return $NewStatus; } +sub AddError($) +{ + my ($self) = @_; + + my $Errors = ($self->Errors || 0) + 1; + $self->Errors($Errors) if ($Errors <= 99); + return $Errors; +} + =pod =over 12 -- 2.30.2

1 1

[PATCH] dlls/oleaut32: Do not skip the first character
by David Kahurani Feb. 21, 2022

Feb. 21, 2022

Added a test case too thanks to Fabian Maurer Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52476 Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/oleaut32/tests/vartest.c | 5 +++++ dlls/oleaut32/variant.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index f25a448..44b2dd8 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1764,6 +1764,11 @@ static void test_VarParseNumFromStrEn(void) /** NUMPRS_DECIMAL **/ + /* Decimal with no leading zero */ + CONVERT(".308", NUMPRS_DECIMAL); + EXPECT(3, NUMPRS_DECIMAL, NUMPRS_DECIMAL, 4, 0, -3); + EXPECT2(3, 0); + /* With flag, consumes decimal point */ CONVERT("1.1", NUMPRS_DECIMAL); EXPECT(2,NUMPRS_DECIMAL,NUMPRS_DECIMAL,3,0,-1); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index bf8f041..66bd905 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1633,7 +1633,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla /* If we have no digits so far, skip leading zeros */ if (!pNumprs->cDig) { - while (lpszStr[1] == '0') + while (lpszStr[0] == '0') { dwState |= B_LEADING_ZERO; cchUsed++; -- 2.25.1

3 6

[PATCH] user32: Add stubs for RegisterSuspendResumeNotification/UnregisterSuspendResumeNotification.
by Wen Wang Feb. 21, 2022

Feb. 21, 2022

Signed-off-by: Wen Wang <v72807647(a)gmail.com> --- dlls/user32/misc.c | 19 +++++++++++++++++++ dlls/user32/user32.spec | 2 ++ include/winuser.h | 2 ++ 3 files changed, 23 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 25d0b676667..e8b63028460 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -443,6 +443,25 @@ BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY handle) return TRUE; } +/********************************************************************** + * RegisterSuspendResumeNotification [USER32.@] + */ +HPOWERNOTIFY WINAPI RegisterSuspendResumeNotification(HANDLE recipient, DWORD flags) +{ + FIXME("(%p,%x): stub\n", recipient, flags); + return (HPOWERNOTIFY)0xdeadbeef; +} + +/********************************************************************** + * UnregisterSuspendResumeNotification [USER32.@] + */ +BOOL WINAPI UnregisterSuspendResumeNotification(HPOWERNOTIFY handle) +{ + FIXME("(%p): stub\n", handle); + return TRUE; +} + + /***************************************************************************** * GetGestureConfig (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 3baa7594e84..432211efb7a 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -605,6 +605,7 @@ @ stub RegisterNetworkCapabilities @ stdcall RegisterPointerDeviceNotifications(long long) @ stdcall RegisterPowerSettingNotification(long ptr long) +@ stdcall RegisterSuspendResumeNotification(long long) @ stdcall RegisterRawInputDevices(ptr long long) @ stdcall RegisterServicesProcess(long) @ stdcall RegisterShellHookWindow (long) @@ -783,6 +784,7 @@ @ stdcall UnregisterHotKey(long long) NtUserUnregisterHotKey # @ stub UnregisterMessagePumpHook @ stdcall UnregisterPowerSettingNotification(ptr) +@ stdcall UnregisterSuspendResumeNotification(ptr) @ stdcall UnregisterTouchWindow(long) @ stdcall UnregisterUserApiHook() @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) diff --git a/include/winuser.h b/include/winuser.h index 898c9034e33..0197c986033 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4126,6 +4126,7 @@ WINUSERAPI HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE,LPVOID,DWORD); WINUSERAPI BOOL WINAPI RegisterHotKey(HWND,INT,UINT,UINT); WINUSERAPI BOOL WINAPI RegisterPointerDeviceNotifications(HWND,BOOL); WINUSERAPI HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE,LPCGUID,DWORD); +WINUSERAPI HPOWERNOTIFY WINAPI RegisterSuspendResumeNotification(HANDLE,DWORD); WINUSERAPI BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE,UINT,UINT); WINUSERAPI BOOL WINAPI RegisterShellHookWindow(HWND); WINUSERAPI BOOL WINAPI RegisterTouchWindow(HWND,ULONG); @@ -4300,6 +4301,7 @@ WINUSERAPI BOOL WINAPI UnregisterClassW(LPCWSTR,HINSTANCE); WINUSERAPI BOOL WINAPI UnregisterDeviceNotification(HDEVNOTIFY); WINUSERAPI BOOL WINAPI UnregisterHotKey(HWND,INT); WINUSERAPI BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY); +WINUSERAPI BOOL WINAPI UnregisterSuspendResumeNotification(HPOWERNOTIFY); WINUSERAPI BOOL WINAPI UnregisterTouchWindow(HWND); WINUSERAPI BOOL WINAPI UpdateWindow(HWND); WINUSERAPI BOOL WINAPI UserHandleGrantAccess(HANDLE,HANDLE,BOOL); -- 2.32.0

2 1

[PATCH] crypt32: CryptAcquireCertificatePrivateKey() should reset last error code on success.
by Dmitry Timoshkov Feb. 21, 2022

Feb. 21, 2022

One of Chrome crypto plugins depends on this. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 1 + dlls/crypt32/tests/cert.c | 59 ++++++++++++++------------------------- 2 files changed, 22 insertions(+), 38 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 33811dfadc1..81ebb59d27c 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1006,6 +1006,7 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, HeapFree(GetProcessHeap(), 0, info); if (cert_in_store) CertFreeCertificateContext(cert_in_store); + if (ret) SetLastError(0); return ret; } diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index b96f94cc662..bc79b4931f7 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3906,55 +3906,42 @@ static void testAcquireCertPrivateKey(void) CERT_KEY_CONTEXT keyContext; /* Don't cache provider */ + SetLastError(0xdeadbeef); ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &certCSP, &keySpec, &callerFree); - ok(ret || - broken(!ret), /* win95 */ - "CryptAcquireCertificatePrivateKey failed: %08x\n", - GetLastError()); - if (ret) - { - ok(callerFree, "Expected callerFree to be TRUE\n"); - CryptReleaseContext(certCSP, 0); - } + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08x\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08x\n", GetLastError()); + ok(callerFree, "Expected callerFree to be TRUE\n"); + CryptReleaseContext(certCSP, 0); + SetLastError(0xdeadbeef); ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &certCSP, NULL, NULL); - ok(ret || - broken(!ret), /* win95 */ - "CryptAcquireCertificatePrivateKey failed: %08x\n", - GetLastError()); + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08x\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08x\n", GetLastError()); CryptReleaseContext(certCSP, 0); /* Use the key prov info's caching (there shouldn't be any) */ + SetLastError(0xdeadbeef); ret = pCryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_USE_PROV_INFO_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret || - broken(!ret), /* win95 */ - "CryptAcquireCertificatePrivateKey failed: %08x\n", - GetLastError()); - if (ret) - { - ok(callerFree, "Expected callerFree to be TRUE\n"); - CryptReleaseContext(certCSP, 0); - } + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08x\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08x\n", GetLastError()); + ok(callerFree, "Expected callerFree to be TRUE\n"); + CryptReleaseContext(certCSP, 0); /* Cache it (and check that it's cached) */ + SetLastError(0xdeadbeef); ret = pCryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_CACHE_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret || - broken(!ret), /* win95 */ - "CryptAcquireCertificatePrivateKey failed: %08x\n", - GetLastError()); + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08x\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08x\n", GetLastError()); ok(!callerFree, "Expected callerFree to be FALSE\n"); size = sizeof(keyContext); ret = CertGetCertificateContextProperty(cert, CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); - ok(ret || - broken(!ret), /* win95 */ - "CertGetCertificateContextProperty failed: %08x\n", - GetLastError()); + ok(ret, "CertGetCertificateContextProperty failed: %08x\n", GetLastError()); /* Remove the cached provider */ CryptReleaseContext(keyContext.hCryptProv, 0); @@ -3965,21 +3952,17 @@ static void testAcquireCertPrivateKey(void) CertSetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, 0, &keyProvInfo); /* Now use the key prov info's caching */ + SetLastError(0xdeadbeef); ret = pCryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_USE_PROV_INFO_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret || - broken(!ret), /* win95 */ - "CryptAcquireCertificatePrivateKey failed: %08x\n", - GetLastError()); + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08x\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08x\n", GetLastError()); ok(!callerFree, "Expected callerFree to be FALSE\n"); size = sizeof(keyContext); ret = CertGetCertificateContextProperty(cert, CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); - ok(ret || - broken(!ret), /* win95 */ - "CertGetCertificateContextProperty failed: %08x\n", - GetLastError()); + ok(ret, "CertGetCertificateContextProperty failed: %08x\n", GetLastError()); CryptReleaseContext(certCSP, 0); CryptDestroyKey(key); -- 2.35.1

1 0

[PATCH 0/9] Fix sock_send reordering issue (#52401)
by Jinoh Kang Feb. 21, 2022

Feb. 21, 2022

This fixes the send part of the issue #52401 [1]: "Improper synchronization in sock_recv/sock_send leads to arbitrary reordering of completion of I/O requests", which was initially reported (outside Bugzilla) by Dongwan Kim [2]. [1] https://bugs.winehq.org/show_bug.cgi?id=52401 [2] https://www.winehq.org/pipermail/wine-devel/2021-May/186454.html Jinoh Kang (9): server: Actually set initial status in set_async_direct_result handler. server: Add async_initial_status_callback. server: Defer postprocessing until after setting initial status in recv_socket handler. server: Defer postprocessing until after setting initial status in send_socket handler. server: Compact struct set_async_direct_result_reply. server: Add mark_pending field to set_async_direct_result request. server: Attempt to complete I/O request immediately in send_socket. ntdll: Don't call try_send before server call in sock_send. server: Replace redundant send_socket status fields with force_async boolean field. dlls/ntdll/unix/socket.c | 84 +++++++++++++++++-------- dlls/ntdll/unix/sync.c | 9 +-- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ws2_32/tests/sock.c | 14 ++--- server/async.c | 44 ++++++++++--- server/file.h | 2 + server/protocol.def | 7 ++- server/sock.c | 112 +++++++++++++++++++-------------- 8 files changed, 179 insertions(+), 95 deletions(-) -- 2.34.1

2 10

[PATCH v3 4/4] ncrypt/tests: Test for NCryptSetProperty
by Hans Leidekker Feb. 21, 2022

Feb. 21, 2022

From: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/tests/ncrypt.c | 46 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 58173fd0ff0..d1bcbbcab2a 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -205,6 +205,51 @@ static void test_get_property(void) NCryptFreeObject(prov); } +static void test_set_property(void) +{ + NCRYPT_PROV_HANDLE prov; + SECURITY_STATUS ret; + NCRYPT_KEY_HANDLE key; + DWORD keylength; + + ret = NCryptOpenStorageProvider(&prov, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptImportKey(prov, 0, BCRYPT_RSAPUBLIC_BLOB, NULL, &key, rsa_key_blob, sizeof(rsa_key_blob), 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + keylength = 2048; + ret = NCryptSetProperty(key, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, sizeof(keylength), 0); + ok(ret == ERROR_SUCCESS || broken(ret == NTE_INVALID_HANDLE), "got %#lx\n", ret); + + ret = NCryptSetProperty(0, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, sizeof(keylength), 0); + ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); + + todo_wine + { + ret = NCryptSetProperty(key, NCRYPT_NAME_PROPERTY, (BYTE *)L"Key name", sizeof(L"Key name"), 0); + ok(ret == NTE_NOT_SUPPORTED, "got %#lx\n", ret); + NCryptFreeObject(key); + + key = 0; + ret = NCryptCreatePersistedKey(prov, &key, BCRYPT_RSA_ALGORITHM, NULL, 0, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(key, "got null handle\n"); + + keylength = 2048; + ret = NCryptSetProperty(key, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, sizeof(keylength), 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptSetProperty(key, NCRYPT_NAME_PROPERTY, (BYTE *)L"Key name", sizeof(L"Key name"), 0); + ok(ret == NTE_NOT_SUPPORTED, "got %#lx\n", ret); + + ret = NCryptSetProperty(key, L"My Custom Property", (BYTE *)L"value", sizeof(L"value"), 0); + ok(ret == NTE_NOT_SUPPORTED, "got %#lx\n", ret); + } + NCryptFreeObject(key); + NCryptFreeObject(prov); +} + static void test_create_persisted_key(void) { NCRYPT_PROV_HANDLE prov; @@ -255,5 +300,6 @@ START_TEST(ncrypt) test_key_import_rsa(); test_free_object(); test_get_property(); + test_set_property(); test_create_persisted_key(); } -- 2.30.2

1 0

[PATCH v3 3/4] ncrypt/tests: Test for NCryptCreatePersistedKey.
by Hans Leidekker Feb. 21, 2022

Feb. 21, 2022

From: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/tests/ncrypt.c | 50 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 7ca20b2bfa6..58173fd0ff0 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -136,7 +136,7 @@ static void test_key_import_rsa(void) NCryptFreeObject(prov); } -static void test_ncrypt_free_object(void) +static void test_free_object(void) { NCRYPT_PROV_HANDLE prov; NCRYPT_KEY_HANDLE key; @@ -205,9 +205,55 @@ static void test_get_property(void) NCryptFreeObject(prov); } +static void test_create_persisted_key(void) +{ + NCRYPT_PROV_HANDLE prov; + NCRYPT_KEY_HANDLE key; + SECURITY_STATUS ret; + DWORD size, keylength; + WCHAR alggroup[4]; + + ret = NCryptOpenStorageProvider(&prov, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + todo_wine { + key = 0; + ret = NCryptCreatePersistedKey(0, &key, BCRYPT_RSA_ALGORITHM, NULL, 0, 0); + ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); + + ret = NCryptCreatePersistedKey(prov, &key, NULL, NULL, 0, 0); + ok(ret == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER) || broken(ret == NTE_FAIL), "got %#lx\n", ret); + + ret = NCryptCreatePersistedKey(prov, &key, BCRYPT_RSA_ALGORITHM, NULL, 0, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(key, "got null handle\n"); + + ret = NCryptGetProperty(key, NCRYPT_ALGORITHM_GROUP_PROPERTY, NULL, 0, &size, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(size == 8, "got %lu\n", size); + + size = 0; + alggroup[0] = 0; + ret = NCryptGetProperty(key, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)alggroup, sizeof(alggroup), &size, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(size == 8, "got %lu\n", size); + ok(!lstrcmpW(alggroup, L"RSA"), "The string doesn't match with 'RSA'\n"); + + ret = NCryptGetProperty(key, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, sizeof(keylength), &size, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(size == 4, "got %lu\n", size); + ok(keylength == 1024, "got %lu\n", keylength); + + NCryptFinalizeKey(key, 0); + NCryptFreeObject(key); + NCryptFreeObject(prov); + } +} + START_TEST(ncrypt) { test_key_import_rsa(); - test_ncrypt_free_object(); + test_free_object(); test_get_property(); + test_create_persisted_key(); } -- 2.30.2

1 0

[PATCH v3 2/4] ncrypt: Check null handle when setting or getting properties.
by Hans Leidekker Feb. 21, 2022

Feb. 21, 2022

From: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 3 +++ dlls/ncrypt/tests/ncrypt.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f8ae2d7a796..68d9d884618 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -164,7 +164,9 @@ SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE handle, const WCHAR *name TRACE("(%#Ix, %s, %p, %lu, %p, %#lx)\n", handle, wine_dbgstr_w(name), output, outsize, result, flags); if (flags) FIXME("flags %#lx not supported\n", flags); + if (!object) return NTE_INVALID_HANDLE; if (!(property = get_object_property(object, name))) return NTE_INVALID_PARAMETER; + *result = property->value_size; if (!output) return ERROR_SUCCESS; if (outsize < property->value_size) return NTE_BUFFER_TOO_SMALL; @@ -376,6 +378,7 @@ SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE handle, const WCHAR *name TRACE("(%#Ix, %s, %p, %lu, %#lx)\n", handle, wine_dbgstr_w(name), input, insize, flags); if (flags) FIXME("flags %#lx not supported\n", flags); + if (!object) return NTE_INVALID_HANDLE; return set_object_property(object, name, input, insize); } diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 891e5b60254..7ca20b2bfa6 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -199,6 +199,9 @@ static void test_get_property(void) ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); ok(keylength == 1024, "got %lu\n", keylength); + ret = NCryptGetProperty(0, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, size, &size, 0); + ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); + NCryptFreeObject(prov); } -- 2.30.2

1 0

[PATCH v3 1/4] ncrypt: Validate existence of property before creating one.
by Hans Leidekker Feb. 21, 2022

Feb. 21, 2022

From: Santino Mazza <mazzasantino1206(a)gmail.com> v3: Fix realloc() usage. Various small cleanups. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 4f9a2f357bd..f8ae2d7a796 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -144,12 +144,12 @@ SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE handle) return ret; } -static const struct object_property *get_object_property(struct object *object, const WCHAR *name) +static struct object_property *get_object_property(struct object *object, const WCHAR *name) { unsigned int i; for (i = 0; i < object->num_properties; i++) { - const struct object_property *property = &object->properties[i]; + struct object_property *property = &object->properties[i]; if (!lstrcmpW(property->key, name)) return property; } return NULL; @@ -181,17 +181,16 @@ static struct object *allocate_object(enum object_type type) return ret; } -static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *name, BYTE *value, DWORD value_size) +struct object_property *add_object_property(struct object *object, const WCHAR *name) { struct object_property *property; - FIXME("check duplicates\n"); if (!object->num_properties) { if (!(object->properties = malloc(sizeof(*property)))) { ERR("Error allocating memory.\n"); - return NTE_NO_MEMORY; + return NULL; } property = &object->properties[object->num_properties++]; } @@ -201,7 +200,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n if (!(tmp = realloc(object->properties, sizeof(*property) * (object->num_properties + 1)))) { ERR("Error allocating memory.\n"); - return NTE_NO_MEMORY; + return NULL; } object->properties = tmp; property = &object->properties[object->num_properties++]; @@ -211,12 +210,22 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n if (!(property->key = malloc((lstrlenW(name) + 1) * sizeof(WCHAR)))) { ERR("Error allocating memory.\n"); - return NTE_NO_MEMORY; + return NULL; } lstrcpyW(property->key, name); + return property; +} + +static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *name, BYTE *value, DWORD value_size) +{ + struct object_property *property = get_object_property(object, name); + void *tmp; + + if (!property && !(property = add_object_property(object, name))) return NTE_NO_MEMORY; + property->value_size = value_size; - if (!(property->value = malloc(value_size))) + if (!(tmp = realloc(property->value, value_size))) { ERR("Error allocating memory.\n"); free(property->key); @@ -224,7 +233,9 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n return NTE_NO_MEMORY; } + property->value = tmp; memcpy(property->value, value, value_size); + return ERROR_SUCCESS; } -- 2.30.2

1 0

[PATCH 1/2] makedep: Build Unix libraries with WINE_NO_LONG_TYPES.
by Jacek Caban Feb. 21, 2022

Feb. 21, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I don't know if there are other plans for unix libs, but it seems to me that WINE_NO_LONG_TYPES fits them well. dlls/bcrypt/gnutls.c | 4 ++-- tools/makedep.c | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-)

3 4

[PATCH] windowscodecs: Correctly handle 8bpp custom conversions
by Alistair Leslie-Hughes Feb. 21, 2022

Feb. 21, 2022

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/windowscodecs/converter.c | 2 +- dlls/windowscodecs/tests/converter.c | 34 ++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index c321627885b..b27d478f717 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -1703,7 +1703,7 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, case WICBitmapPaletteTypeCustom: IWICPalette_Release(palette); palette = NULL; - if (bpp <= 8) return E_INVALIDARG; + if (bpp < 8) return E_INVALIDARG; break; case WICBitmapPaletteTypeMedianCut: diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index df6528afa71..456b3502c77 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -637,6 +637,39 @@ static void test_default_converter(void) DeleteTestBitmap(src_obj); } +static void test_converter_8bppGray(void) +{ + BitmapTestSrc *src_obj; + IWICFormatConverter *converter; + BOOL can_convert = TRUE; + HRESULT hr; + + CreateTestBitmap(&testdata_32bppBGRA, &src_obj); + + hr = CoCreateInstance(&CLSID_WICDefaultFormatConverter, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICFormatConverter, (void**)&converter); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICFormatConverter_CanConvert(converter, &GUID_WICPixelFormat32bppBGRA, + &GUID_WICPixelFormat8bppGray, &can_convert); + ok(SUCCEEDED(hr), "CanConvert returned %x\n", hr); + ok(can_convert, "expected TRUE, got %i\n", can_convert); + + hr = IWICFormatConverter_Initialize(converter, &src_obj->IWICBitmapSource_iface, + &GUID_WICPixelFormat8bppGray, WICBitmapDitherTypeNone, NULL, 0.0, + WICBitmapPaletteTypeCustom); + ok(SUCCEEDED(hr), "Initialize returned %x\n", hr); + + if (SUCCEEDED(hr)) + compare_bitmap_data(&testdata_32bppBGRA, &testdata_8bppGray, (IWICBitmapSource*)converter, "8bppGray converter"); + + IWICFormatConverter_Release(converter); + } + + DeleteTestBitmap(src_obj); +} + typedef struct property_opt_test_data { LPCOLESTR name; @@ -1922,6 +1955,7 @@ START_TEST(converter) test_invalid_conversion(); test_default_converter(); + test_converter_8bppGray(); test_converter_8bppIndexed(); test_encoder(&testdata_8bppIndexed, &CLSID_WICGifEncoder, -- 2.34.1

3 3

Minimal custom build for win64 Server app
by dravion＠mail.de Feb. 21, 2022

Feb. 21, 2022

Hello everyone, I tried to read the docs and researched the Forum and Stackoverflow for some pointers but right know i think only a Developer can answer this build specific Question. My Project: Right know, iam trying to package a Server App (hMailServer) for Debian but also for MacOS which can run headless on WINE right now. It only needs the Console Subsystem or can run as Windows Service, so there is really no X11 or GUI stuff going on. The server simply starts with wine c:\hMailServer\Bin\hMailServer.exe or it can be register itself as Windows Service by running c:\hMailServer\Bin\hMailServer.exe /Register Right now, it runs on Debian11 Bullseye AMD64 and MacOS 12 Monterey this way in 64-Bit mode (AMD64/x86_64) just fine. Now i want to package it as Debian *.deb package and MacOS *.pkg Installer package but i dont want to interfere with a existing WINE Installation on the target System nor i want the User for example to Setup WINE on MacOS with brew or on Linux with apt-get ect. hMailServer is a very popular and easy to use Windows 32 and 64-Bit Software and i want it to stay it that way, even on Linux and MacOS. Long story short: I want to package hMailServer for Linux and MacOS and have all dependencies for WINE aboard. I want the User to install the package so it just runs, like it does for Windows. So i tried to built my custom WINE Version to make it as small as possible ./configure CFLAGS="-Os" --verbose --without-x --prefix=/opt/build/wine --disable-win16 --disable-tests --without-freetype --without-gstreamer --without-openal --without-gettext --without-ldap --without-vkd3d --without-netapi --without-oss --without-opencl --without-pulse --without-usb --without-pcap --without-vulkan --without-sane --without-sdl --without-cups --without-krb5 --without-gphoto --without-capi --without-fontconfig --without-udev --without-dbus --without-mingw --without-gnutls --without-opengl -disable-win64 --without-x --disable-winemenubuilder make & make install But even then, the resulted WINE binaries in "/opt/build/wine" are hugh (over 700 MBytes whyle hMailServer is only 20 MBytes in total!) I think thats way to big and i want to cut it down even more. My question: Is there a clean way or undocumented build switches so i can only bring the console Subsystem up and running without the whole other stuff like DirectX ect? Just console subsystem running "bare streams" without X11, DirectX, Vulkan3D ect, ect. Ok, i hope some experienced WINE Developer can give me some hints how to cut down this 700 MByte Monster even a bit more down. Please; Dont give me tips like, let the user install WINE completely, thats not what i want. I just want the required dependencies for running a Windows Console (CUI) into my installer package, thats all. Thanks in advance, Dravion

4 10

[PATCH v3 5/5] comctl32: LVM_INSERTITEM handler should send notifications with uChanged = LVIF_STATE.
by Dmitry Timoshkov Feb. 21, 2022

Feb. 21, 2022

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/listview.c | 8 +++++++- dlls/comctl32/tests/listview.c | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 5c3b1a1636c..a961c8d4032 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4257,7 +4257,13 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL nmlv.uNewState = (item.state & ~stateMask) | (lpLVItem->state & stateMask); nmlv.uOldState = item.state; } - nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; + /* According to the tests uChanged in the notification for a new item + * has only LVIF_STATE flag set. + */ + if (isNew) + nmlv.uChanged = LVIF_STATE; + else + nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; nmlv.lParam = item.lParam; /* Send LVN_ITEMCHANGING notification if the item is not being diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 92e11685331..3810cd8f4bc 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6023,7 +6023,7 @@ static void test_LVM_INSERTITEM(void) if ((insert_item[i].mask & LVIF_STATE) && (insert_item[i].state & (LVIS_FOCUSED | LVIS_SELECTED))) { sprintf(buf, "%d: insert focused", i); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, insert_item[i].mask != LVIF_STATE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, FALSE); } else { @@ -6100,7 +6100,7 @@ static void test_insertitem(void) item.lParam = 0xdeadbeef; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 3, "got %d\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_selected_seq, "insert selected", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_selected_seq, "insert selected", FALSE); /* insert item 4 */ item.mask = LVIF_PARAM; -- 2.35.1

2 4

[PATCH] dlls/oleaut32: Do not skip the first character
by David Kahurani Feb. 21, 2022

Feb. 21, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52476 Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/oleaut32/variant.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index bf8f041..66bd905 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1633,7 +1633,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla /* If we have no digits so far, skip leading zeros */ if (!pNumprs->cDig) { - while (lpszStr[1] == '0') + while (lpszStr[0] == '0') { dwState |= B_LEADING_ZERO; cchUsed++; -- 2.25.1

2 1

[PATCH v3 4/5] comctl32: LVM_INSERTITEM handler should send LVN_ITEMCHANGING/LVN_ITEMCHANGED notifications when the item state includes LVIS_FOCUSED | LVIS_SELECTED.
by Dmitry Timoshkov Feb. 21, 2022

Feb. 21, 2022

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/listview.c | 10 ++++++---- dlls/comctl32/tests/listview.c | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cd7fec28e27..5c3b1a1636c 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4260,11 +4260,12 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; nmlv.lParam = item.lParam; - /* Send LVN_ITEMCHANGING notification, if the item is not being inserted + /* Send LVN_ITEMCHANGING notification if the item is not being + inserted or its state includes LVIS_FOCUSED | LVIS_SELECTED, and we are _NOT_ virtual (LVS_OWNERDATA), and change notifications are enabled. Even nothing really changed we still need to send this, in this case uChanged mask is just set to passed item mask. */ - if (lpItem && !isNew && (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE)) + if (lpItem && (!isNew || ((uChanged & LVIF_STATE) && (lpLVItem->state & (LVIS_FOCUSED | LVIS_SELECTED)))) && (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE)) { HWND hwndSelf = infoPtr->hwndSelf; @@ -4352,8 +4353,9 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL } } - /* if we're inserting the item, we're done */ - if (isNew) return TRUE; + /* if we're inserting the item and its state doesn't specify LVIS_FOCUSED | LVIS_SELECTED, we're done */ + if (isNew && !((uChanged & LVIF_STATE) && (lpLVItem->state & (LVIS_FOCUSED | LVIS_SELECTED)))) + return TRUE; /* send LVN_ITEMCHANGED notification */ if (lpLVItem->mask & LVIF_PARAM) nmlv.lParam = lpLVItem->lParam; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 4c2dd534dbd..92e11685331 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6023,7 +6023,7 @@ static void test_LVM_INSERTITEM(void) if ((insert_item[i].mask & LVIF_STATE) && (insert_item[i].state & (LVIS_FOCUSED | LVIS_SELECTED))) { sprintf(buf, "%d: insert focused", i); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, insert_item[i].mask != LVIF_STATE); } else { @@ -6060,7 +6060,7 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 0, "got %d\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, "insert focused 0", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, "insert focused 0", FALSE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); @@ -6073,7 +6073,7 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 1, "got %d\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused1_seq, "insert focused 1", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused1_seq, "insert focused 1", FALSE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); -- 2.35.1

2 2

want to say hi
by dravion＠mail.de Feb. 21, 2022

Feb. 21, 2022

Hi everyone

1 0

[PATCH v3 0/5] Fix for BZ52048
by Eric Pouech Feb. 21, 2022

Feb. 21, 2022

As described in bugzilla ticket, when calling CreateProcess: - with "default" console inheritance (no CREATE_NEW_CONSOLE nor DETACHED_PROCESS flags), - when parent is not attached to a console - and when the child's subsystem is CUI , native behaves as if CREATE_NEW_CONSOLE was passed. builtin doesn't... this serie: - adds a test case for showing the CUI/GUI discrepancies - fixes kernelbase accordingly - but also requires to fix all usage of CreateProcess in Wine Code that would now generate the creation of a console + one patch of wow64 redirection (only for CUI executables) + when looking to the other usage of CreateProcess, I only convinced myself to adapt one of them V1 => V2: - don't mess up with the number of patches in the serie - no longer modify makedep for creating cui vs gui test executable, but copy current *_test.exe executable and adapt its subsystem to the need V2 => V3: - removed the hacks in wow64 redirect, and let programs/uninstaller and programs/wusa belong to the GUI subsystem instead - force console creation for wine initial process when a) none of the unix fd are attached to a TTY, b) the initial process is in CUI subsystem Note to Jacek: - I still think we may have side effects of this serie. a) with spurious window creation (eg 'wine ping >& out < /dev/null' will generate one, which could be typical in shell scripting), b) will prevent program to run on headless setup (while they used to) - so I put the change for initial process in a separate patch - I'm not convinced at all that the evolution to the initial process is a good choice (if caller isn't attached to a Unix console, it's a bit awkward to end up with creating a graphical console). Furthermore, wineconsole provides thes ability to create a console when needed. And Marvin will generate errors for Chinese and Japanese VM in console testing that are independant of this serie. A+ --- Eric Pouech (5): dlls/kernel32/tests: add some console tests about creating cui vs gui processes programs/wusa: set subsystem to GUI programs/uninstaller: set subsystem to GUI dlls/kernelbase: handle corner case in CreateProcess dlls/ntdll: allocate a console for initial CUI process when not attached to a Unix console dlls/kernel32/tests/console.c | 85 ++++++++++++++++++++++++++++++++ dlls/kernelbase/process.c | 6 ++- dlls/ntdll/unix/env.c | 2 + programs/services/services.c | 2 +- programs/uninstaller/Makefile.in | 2 +- programs/wusa/Makefile.in | 2 +- 6 files changed, 95 insertions(+), 4 deletions(-)

3 13

[PATCH 1/2] kernel32: Add CreateBoundaryDescriptorA semi-stub.
by Mohamad Al-Jaf Feb. 21, 2022

Feb. 21, 2022

Needed for IE11. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- Documentation written in my own words. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/sync.c | 35 +++++++++++++++++++++++++++++++++++ include/namespaceapi.h | 2 ++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7db82db375d..e040fedab08 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -266,7 +266,7 @@ @ stdcall CopyLZFile(long long) LZCopy @ stdcall CreateActCtxA(ptr) @ stdcall -import CreateActCtxW(ptr) -# @ stub CreateBoundaryDescriptorA +@ stdcall CreateBoundaryDescriptorA(str long) @ stdcall -import CreateBoundaryDescriptorW(wstr long) @ stdcall -import CreateConsoleScreenBuffer(long long ptr long ptr) @ stdcall -import CreateDirectoryA(str ptr) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 219800a46e5..27a1ab86d8a 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -190,6 +190,41 @@ HANDLE WINAPI DECLSPEC_HOTPATCH OpenMutexA( DWORD access, BOOL inherit, LPCSTR n } +/****************************************************************************** + * CreateBoundaryDescriptorA (KERNEL32.@) + * + * Creates and returns a handle to a boundary descriptor. + * + * PARAMS + * name [I] Boundary descriptor name + * flags [I] Flags for the descriptor + * + * RETURNS + * Success: Handle to boundary descriptor + * Failure: NULL + */ +HANDLE WINAPI CreateBoundaryDescriptorA( LPCSTR name, ULONG flags ) +{ + DWORD len; + HANDLE ret; + LPWSTR str = NULL; + + FIXME("%s %u - semi-stub\n", debugstr_a(name), flags); + + if(name) + { + len = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 ); + str = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, name, -1, str, len ); + } + + ret = CreateBoundaryDescriptorW( str, flags ); + + HeapFree( GetProcessHeap(), 0, str ); + return ret; +} + + /* diff --git a/include/namespaceapi.h b/include/namespaceapi.h index 9446806f82e..f219a2a7488 100644 --- a/include/namespaceapi.h +++ b/include/namespaceapi.h @@ -27,7 +27,9 @@ extern "C" { WINBASEAPI BOOL WINAPI AddSIDToBoundaryDescriptor(HANDLE*,PSID); WINBASEAPI BOOLEAN WINAPI ClosePrivateNamespace(HANDLE,ULONG); +WINBASEAPI HANDLE WINAPI CreateBoundaryDescriptorA(LPCSTR,ULONG); WINBASEAPI HANDLE WINAPI CreateBoundaryDescriptorW(LPCWSTR,ULONG); +#define CreateBoundaryDescriptor WINELIB_NAME_AW(CreateBoundaryDescriptor) WINBASEAPI HANDLE WINAPI CreatePrivateNamespaceW(LPSECURITY_ATTRIBUTES,LPVOID,LPCWSTR); WINBASEAPI void WINAPI DeleteBoundaryDescriptor(HANDLE); WINBASEAPI HANDLE WINAPI OpenPrivateNamespaceW(LPVOID,LPCWSTR); -- 2.35.1

2 5