February 2022 - Wine-Commits

Huw Davies : winealsa: Store the session master volume in the stream.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 4f8a2e456b805159ffd459fbdc23bb4c76e018da URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f8a2e456b805159ffd459fb… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 18 08:29:30 2022 +0000 winealsa: Store the session master volume in the stream. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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;

1 0

Huw Davies : winealsa: Store the session mute state in the stream volumes.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 444d429fcc910765c8942a5447394b8b6e53b3f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=444d429fcc910765c8942a54… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 18 08:29:31 2022 +0000 winealsa: Store the session mute state in the stream volumes. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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; }

1 0

Huw Davies : winealsa: Store the channel volumes in the stream.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: f608d78910894de739d4f7bba08f03f179b270e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f608d78910894de739d4f7bb… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 18 08:29:27 2022 +0000 winealsa: Store the channel volumes in the stream. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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

1 0

Zebediah Figura : wined3d: Introduce a wined3d_texture_update_sub_resource() helper.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 81068b89d8e37a5fb82fe18432104bb92bb0b384 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81068b89d8e37a5fb82fe184… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 20 23:22:23 2022 -0600 wined3d: Introduce a wined3d_texture_update_sub_resource() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 30 ++---------------------------- dlls/wined3d/texture.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 3 +++ 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 7280739b8b2..f294be29091 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2739,43 +2739,17 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi const struct wined3d_cs_update_sub_resource *op = data; struct wined3d_resource *resource = op->resource; const struct wined3d_box *box = &op->box; - unsigned int width, height, depth, level; struct wined3d_context *context; - struct wined3d_texture *texture; - struct wined3d_box src_box; context = context_acquire(cs->c.device, NULL, 0); if (resource->type == WINED3D_RTYPE_BUFFER) - { wined3d_buffer_update_sub_resource(buffer_from_resource(resource), context, &op->bo, box->left, box->right - box->left); - goto done; - } - - texture = wined3d_texture_from_resource(resource); - - level = op->sub_resource_idx % texture->level_count; - width = wined3d_texture_get_level_width(texture, level); - height = wined3d_texture_get_level_height(texture, level); - depth = wined3d_texture_get_level_depth(texture, level); - - /* Only load the sub-resource for partial updates. */ - if (!box->left && !box->top && !box->front - && box->right == width && box->bottom == height && box->back == depth) - wined3d_texture_prepare_location(texture, op->sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); else - wined3d_texture_load_location(texture, op->sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - - wined3d_box_set(&src_box, 0, 0, box->right - box->left, box->bottom - box->top, 0, box->back - box->front); - texture->texture_ops->texture_upload_data(context, &op->bo.addr, texture->resource.format, &src_box, - op->row_pitch, op->slice_pitch, texture, op->sub_resource_idx, - WINED3D_LOCATION_TEXTURE_RGB, box->left, box->top, box->front); - - wined3d_texture_validate_location(texture, op->sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_invalidate_location(texture, op->sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_update_sub_resource(texture_from_resource(resource), + op->sub_resource_idx, context, &op->bo, box, op->row_pitch, op->slice_pitch); -done: context_release(context); wined3d_resource_release(resource); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1323d533eff..3bbdb492998 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4533,6 +4533,32 @@ void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~dst_location); } +void wined3d_texture_update_sub_resource(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context, const struct upload_bo *upload_bo, const struct wined3d_box *box, + unsigned int row_pitch, unsigned int slice_pitch) +{ + unsigned int level = sub_resource_idx % texture->level_count; + unsigned int width = wined3d_texture_get_level_width(texture, level); + unsigned int height = wined3d_texture_get_level_height(texture, level); + unsigned int depth = wined3d_texture_get_level_depth(texture, level); + struct wined3d_box src_box; + + /* Only load the sub-resource for partial updates. */ + if (!box->left && !box->top && !box->front + && box->right == width && box->bottom == height && box->back == depth) + wined3d_texture_prepare_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); + else + wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); + + wined3d_box_set(&src_box, 0, 0, box->right - box->left, box->bottom - box->top, 0, box->back - box->front); + texture->texture_ops->texture_upload_data(context, &upload_bo->addr, texture->resource.format, + &src_box, row_pitch, slice_pitch, texture, sub_resource_idx, + WINED3D_LOCATION_TEXTURE_RGB, box->left, box->top, box->front); + + wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(texture, sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); +} + static void wined3d_texture_no3d_upload_data(struct wined3d_context *context, const struct wined3d_const_bo_address *src_bo_addr, const struct wined3d_format *src_format, const struct wined3d_box *src_box, unsigned int src_row_pitch, unsigned int src_slice_pitch, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 989fd33d2bf..277d5a94fb0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4643,6 +4643,9 @@ BOOL wined3d_texture_can_use_pbo(const struct wined3d_texture *texture, const st void wined3d_texture_sub_resources_destroyed(struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_translate_drawable_coords(const struct wined3d_texture *texture, HWND window, RECT *rect) DECLSPEC_HIDDEN; +void wined3d_texture_update_sub_resource(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context, const struct upload_bo *upload_bo, const struct wined3d_box *box, + unsigned int row_pitch, unsigned int slice_pitch) DECLSPEC_HIDDEN; void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Load the apiset schema at startup.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: e3c9d73cd1d092542d846a368196e26cd5c44972 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3c9d73cd1d092542d846a36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 21 22:23:03 2022 +0100 ntdll: Load the apiset schema at startup. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 96301b1654e..98a5c933215 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1992,6 +1992,82 @@ static void load_ntdll(void) } +/*********************************************************************** + * load_apiset_dll + */ +static void load_apiset_dll(void) +{ + static WCHAR path[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', + 's','y','s','t','e','m','3','2','\\', + 'a','p','i','s','e','t','s','c','h','e','m','a','.','d','l','l',0}; + const char *pe_dir = get_pe_dir( current_machine ); + const IMAGE_NT_HEADERS *nt; + const IMAGE_SECTION_HEADER *sec; + API_SET_NAMESPACE *map; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + NTSTATUS status; + HANDLE handle, mapping; + SIZE_T size; + char *name; + void *ptr; + UINT i; + + init_unicode_string( &str, path ); + InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); + + name = malloc( strlen( ntdll_dir ) + strlen( pe_dir ) + sizeof("/apisetschema.dll") ); + if (build_dir) sprintf( name, "%s/dlls/apisetschema/apisetschema.dll", build_dir ); + else sprintf( name, "%s%s/apisetschema.dll", dll_dir, pe_dir ); + status = open_unix_file( &handle, name, GENERIC_READ | SYNCHRONIZE, &attr, 0, + FILE_SHARE_READ | FILE_SHARE_DELETE, FILE_OPEN, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE, NULL, 0 ); + free( name ); + + if (!status) + { + status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ, + NULL, NULL, PAGE_READONLY, SEC_COMMIT, handle ); + NtClose( handle ); + } + if (!status) + { + ptr = NULL; + size = 0; + status = NtMapViewOfSection( mapping, NtCurrentProcess(), &ptr, + is_win64 && wow_peb ? 0x7fffffff : 0, 0, NULL, + &size, ViewShare, 0, PAGE_READONLY ); + NtClose( mapping ); + } + if (!status) + { + nt = get_rva( ptr, ((IMAGE_DOS_HEADER *)ptr)->e_lfanew ); + sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + nt->FileHeader.SizeOfOptionalHeader); + + for (i = 0; i < nt->FileHeader.NumberOfSections; i++, sec++) + { + if (memcmp( (char *)sec->Name, ".apiset", 8 )) continue; + map = (API_SET_NAMESPACE *)((char *)ptr + sec->PointerToRawData); + if (sec->PointerToRawData < size && + size - sec->PointerToRawData >= sec->Misc.VirtualSize && + map->Version == 6 && + map->Size <= sec->Misc.VirtualSize) + { + NtCurrentTeb()->Peb->ApiSetMap = map; + if (wow_peb) wow_peb->ApiSetMap = PtrToUlong(map); + NtUnmapViewOfSection( NtCurrentProcess(), ptr ); + TRACE( "loaded %s apiset at %p\n", debugstr_w(path), map ); + return; + } + break; + } + NtUnmapViewOfSection( NtCurrentProcess(), ptr ); + status = STATUS_APISET_NOT_PRESENT; + } + ERR( "failed to load apiset: %x\n", status ); +} + + /*********************************************************************** * load_wow64_ntdll */ @@ -2098,6 +2174,7 @@ static void start_main_thread(void) NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); load_ntdll(); if (main_image_info.Machine != current_machine) load_wow64_ntdll( main_image_info.Machine ); + load_apiset_dll(); ntdll_init_syscalls( 0, &syscall_table, p__wine_syscall_dispatcher ); status = p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); if (status == STATUS_REVISION_MISMATCH)

1 0

Santino Mazza : ncrypt: Check null handle when setting or getting properties.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: ebf4953e90fddc672f55b498cbfb66ba7e8fef15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebf4953e90fddc672f55b498… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Mon Feb 21 12:13:42 2022 +0100 ncrypt: Check null handle when setting or getting properties. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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); }

1 0

Eric Pouech : vnbt.vxd: Enable compilation with long types.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 164e38039506a064c5a1d3918362068a4656be8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=164e38039506a064c5a1d391… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:58:55 2022 +0100 vnbt.vxd: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vnbt.vxd/Makefile.in | 1 - dlls/vnbt.vxd/vnbt.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/vnbt.vxd/Makefile.in b/dlls/vnbt.vxd/Makefile.in index 61d0c786c36..8fc6b3e4a73 100644 --- a/dlls/vnbt.vxd/Makefile.in +++ b/dlls/vnbt.vxd/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vnbt.vxd IMPORTS = iphlpapi ws2_32 diff --git a/dlls/vnbt.vxd/vnbt.c b/dlls/vnbt.vxd/vnbt.c index fd1dbdcbe6a..ea9b48f7f06 100644 --- a/dlls/vnbt.vxd/vnbt.c +++ b/dlls/vnbt.vxd/vnbt.c @@ -149,7 +149,7 @@ BOOL WINAPI VNBT_DeviceIoControl(DWORD dwIoControlCode, * to unimplemented... */ default: - FIXME( "Unimplemented control %d for VxD device VNB\n", + FIXME( "Unimplemented control %ld for VxD device VNB\n", dwIoControlCode ); error = ERROR_NOT_SUPPORTED; break;

1 0

Eric Pouech : vmm.vxd: Enable compilation with long types.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 6d376641f5ba26d654d7cd4c44642c9bba69126a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d376641f5ba26d654d7cd4c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:58:49 2022 +0100 vmm.vxd: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vmm.vxd/Makefile.in | 1 - dlls/vmm.vxd/vmm.c | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/vmm.vxd/Makefile.in b/dlls/vmm.vxd/Makefile.in index 9d4818c1926..28a5302f532 100644 --- a/dlls/vmm.vxd/Makefile.in +++ b/dlls/vmm.vxd/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vmm.vxd C_SRCS = \ diff --git a/dlls/vmm.vxd/vmm.c b/dlls/vmm.vxd/vmm.c index 373e826efe8..699f1444206 100644 --- a/dlls/vmm.vxd/vmm.c +++ b/dlls/vmm.vxd/vmm.c @@ -144,7 +144,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context ) ULONG npages = stack32_pop( context ); ULONG flags = stack32_pop( context ); - TRACE("PageReserve: page: %08x, npages: %08x, flags: %08x partial stub!\n", + TRACE("PageReserve: page: %08lx, npages: %08lx, flags: %08lx partial stub!\n", page, npages, flags ); if ( page == PR_SYSTEM ) { @@ -175,8 +175,8 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context ) ULONG pagerdata = stack32_pop( context ); ULONG flags = stack32_pop( context ); - TRACE("PageCommit: page: %08x, npages: %08x, hpd: %08x pagerdata: " - "%08x, flags: %08x partial stub\n", + TRACE("PageCommit: page: %08lx, npages: %08lx, hpd: %08lx pagerdata: " + "%08lx, flags: %08lx partial stub\n", page, npages, hpd, pagerdata, flags ); if ( flags & PC_USER ) @@ -202,7 +202,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context ) ULONG npages = stack32_pop( context ); ULONG flags = stack32_pop( context ); - TRACE("PageDecommit: page: %08x, npages: %08x, flags: %08x partial stub\n", + TRACE("PageDecommit: page: %08lx, npages: %08lx, flags: %08lx partial stub\n", page, npages, flags ); address = (LPVOID )( page * page_size ); ret = VirtualFree ( address, npages * page_size, MEM_DECOMMIT ); @@ -223,7 +223,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context ) ULONG permand = stack32_pop ( context ); ULONG permor = stack32_pop ( context ); - TRACE("PageModifyPermissions %08x %08x %08x %08x partial stub\n", + TRACE("PageModifyPermissions %08lx %08lx %08lx %08lx partial stub\n", page, npages, permand, permor ); address = (LPVOID )( page * page_size ); @@ -264,7 +264,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context ) ERR("Can't change page permissions for %p\n", address ); return 0xffffffff; } - TRACE("Returning: %08x\n", pg_old_perm ); + TRACE("Returning: %08lx\n", pg_old_perm ); return pg_old_perm; } @@ -274,7 +274,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context ) LPVOID hmem = (LPVOID) stack32_pop( context ); DWORD flags = stack32_pop( context ); - TRACE("PageFree: hmem: %p, flags: %08x partial stub\n", + TRACE("PageFree: hmem: %p, flags: %08lx partial stub\n", hmem, flags ); ret = VirtualFree ( hmem, 0, MEM_RELEASE ); @@ -413,7 +413,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context ) * implementation of this. */ - FIXME("GetDemandPageInfo(%08x %08x): stub!\n", dinfo, flags); + FIXME("GetDemandPageInfo(%08lx %08lx): stub!\n", dinfo, flags); return 0; } @@ -462,10 +462,10 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context ) default: if (LOWORD(service) < N_VMM_SERVICE) - FIXME( "Unimplemented service %s (%08x)\n", + FIXME( "Unimplemented service %s (%08lx)\n", VMM_Service_Name[LOWORD(service)], service); else - FIXME( "Unknown service %08x\n", service); + FIXME( "Unknown service %08lx\n", service); return 0xffffffff; /* FIXME */ } }

1 0

Eric Pouech : oledb32/tests: Don't outdent todo_wine*.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 231ecf85866062a89a63ff10dd64832f18ac6d8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=231ecf85866062a89a63ff10… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 08:08:09 2022 +0100 oledb32/tests: Don't outdent todo_wine*. This prevents -Wmisleading-indentation warnings (Mingw GCC11). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/database.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 8bdb1f948f4..c3551d085f1 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -596,7 +596,7 @@ static void test_rowposition(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IConnectionPointContainer_EnumConnectionPoints(cpc, &enum_points); -todo_wine + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { hr = IEnumConnectionPoints_Next(enum_points, 1, &cp, NULL);

1 0

Eric Pouech : ole32/tests: Don't outdent todo_wine*.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 3a843a43b4f104949ad66a7886bb175a3dec2bc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a843a43b4f104949ad66a78… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 08:07:39 2022 +0100 ole32/tests: Don't outdent todo_wine*. This prevents -Wmisleading-indentation warnings (Mingw GCC11). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 2 +- dlls/ole32/tests/ole2.c | 2 +- dlls/ole32/tests/storage32.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index b5eb5f2ffb4..afbea762e89 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2809,7 +2809,7 @@ static void test_item_moniker(void) moniker3 = (void *)0xdeadbeef; hr = IMoniker_CommonPrefixWith(moniker, moniker2, &moniker3); -todo_wine + todo_wine { ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); ok(!moniker3, "Unexpected object.\n"); diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 69d8a0c0e93..c463e74c8cb 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1234,7 +1234,7 @@ static void test_OleLoad(IStorage *pStorage) if (fmt == CF_METAFILEPICT) ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, advf = %#x\n", hr, fmt, header.advf); else if (fmt == CF_ENHMETAFILE) -todo_wine + todo_wine ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, advf = %#x\n", hr, fmt, header.advf); else ok(hr == OLE_E_BLANK || hr == OLE_E_NOTRUNNING || hr == E_FAIL, "OleDraw should fail: %#x, cfFormat = %u, advf = %#x\n", hr, fmt, header.advf); diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index b05baddac98..9f4311cd07c 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3313,7 +3313,7 @@ static void test_direct_swmr(void) /* it's possible to create in writer mode */ hr = StgCreateDocfile(fileW, STGM_CREATE | STGM_READWRITE | STGM_SHARE_DENY_WRITE | STGM_DIRECT_SWMR, 0, &stg); -todo_wine + todo_wine ok(hr == S_OK, "got %08x\n", hr); if (hr == S_OK) { IStorage_Release(stg);

1 0