- Wine-Devel - list.winehq.org

[PATCH 1/4] jscript: Use enum to pass enumeration type to jsdisp_next_prop.
by Jacek Caban April 20, 2021

April 20, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 8 ++++---- dlls/jscript/jscript.h | 7 ++++++- dlls/jscript/object.c | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-)

1 0

[PATCH 1/5] wined3d: Pass a wined3d_device_context to wined3d_device_get_rendertarget_view().
by Zebediah Figura April 20, 2021

April 20, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/device.c | 6 ++++-- dlls/d3d8/device.c | 6 +++--- dlls/d3d9/device.c | 6 +++--- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/surface.c | 2 +- dlls/ddraw/viewport.c | 4 ++-- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 10 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 460e9c2bf4a..b95423c4c7c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2054,6 +2054,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargets(ID3D11D UINT render_target_view_count, ID3D11RenderTargetView **render_target_views, ID3D11DepthStencilView **depth_stencil_view) { + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct wined3d_rendertarget_view *wined3d_view; @@ -2068,7 +2069,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargets(ID3D11D for (i = 0; i < render_target_view_count; ++i) { - if (!(wined3d_view = wined3d_device_get_rendertarget_view(device->wined3d_device, i)) + if (!(wined3d_view = wined3d_device_context_get_rendertarget_view(context->wined3d_context, i)) || !(view_impl = wined3d_rendertarget_view_get_parent(wined3d_view))) { render_target_views[i] = NULL; @@ -5417,7 +5418,8 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetRenderTargets(ID3D10Device1 *ifa for (i = 0; i < view_count; ++i) { - if (!(wined3d_view = wined3d_device_get_rendertarget_view(device->wined3d_device, i)) + if (!(wined3d_view = wined3d_device_context_get_rendertarget_view( + device->immediate_context.wined3d_context, i)) || !(view_impl = wined3d_rendertarget_view_get_parent(wined3d_view))) { render_target_views[i] = NULL; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index fe36f70c075..4f76a55172c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1505,7 +1505,7 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, /* If no render target is passed in check the size against the current RT */ if (!render_target) { - if (!(original_rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0))) + if (!(original_rtv = wined3d_device_context_get_rendertarget_view(device->immediate_context, 0))) { wined3d_mutex_unlock(); return D3DERR_NOTFOUND; @@ -1570,7 +1570,7 @@ static HRESULT WINAPI d3d8_device_GetRenderTarget(IDirect3DDevice8 *iface, IDire return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - if ((wined3d_rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0))) + if ((wined3d_rtv = wined3d_device_context_get_rendertarget_view(device->immediate_context, 0))) { /* We want the sub resource parent here, since the view itself may be * internal to wined3d and may not have a parent. */ @@ -1737,7 +1737,7 @@ static HRESULT WINAPI d3d8_device_SetViewport(IDirect3DDevice8 *iface, const D3D TRACE("iface %p, viewport %p.\n", iface, viewport); wined3d_mutex_lock(); - if (!(rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0))) + if (!(rtv = wined3d_device_context_get_rendertarget_view(device->immediate_context, 0))) { wined3d_mutex_unlock(); return D3DERR_NOTFOUND; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 139e4f3f6e4..f7a6e04beae 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1151,7 +1151,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, } } - rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0); + rtv = wined3d_device_context_get_rendertarget_view(device->immediate_context, 0); device->render_targets[0] = wined3d_rendertarget_view_get_sub_resource_parent(rtv); for (i = 1; i < ARRAY_SIZE(device->render_targets); ++i) device->render_targets[i] = NULL; @@ -2060,7 +2060,7 @@ static HRESULT WINAPI d3d9_device_GetRenderTarget(IDirect3DDevice9Ex *iface, DWO } wined3d_mutex_lock(); - if ((wined3d_rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, idx))) + if ((wined3d_rtv = wined3d_device_context_get_rendertarget_view(device->immediate_context, idx))) { /* We want the sub resource parent here, since the view itself may be * internal to wined3d and may not have a parent. */ @@ -4852,7 +4852,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine * generation). */ wined3d_mutex_lock(); device->render_targets[0] = wined3d_rendertarget_view_get_sub_resource_parent( - wined3d_device_get_rendertarget_view(device->wined3d_device, 0)); + wined3d_device_context_get_rendertarget_view(device->immediate_context, 0)); wined3d_mutex_unlock(); IDirect3D9Ex_AddRef(&parent->IDirect3D9Ex_iface); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5582e9862a1..9063c64b41f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -931,7 +931,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, goto done; } - rtv = wined3d_device_get_rendertarget_view(ddraw->wined3d_device, 0); + rtv = wined3d_device_context_get_rendertarget_view(ddraw->immediate_context, 0); /* Rendering to ddraw->wined3d_frontbuffer. */ if (rtv && !wined3d_rendertarget_view_get_sub_resource_parent(rtv)) rtv = NULL; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 0a0d1edd848..c3681cc9440 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3434,7 +3434,7 @@ static void d3d_device_sync_rendertarget(struct d3d_device *device) if (device->hardware_device) return; - if ((rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0))) + if ((rtv = wined3d_device_context_get_rendertarget_view(device->immediate_context, 0))) ddraw_surface_get_draw_texture(wined3d_rendertarget_view_get_parent(rtv), DDRAW_SURFACE_RW); if ((rtv = wined3d_device_get_depth_stencil_view(device->wined3d_device))) @@ -5359,7 +5359,7 @@ static HRESULT d3d_device7_SetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *vi return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - if (!(rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0))) + if (!(rtv = wined3d_device_context_get_rendertarget_view(device->immediate_context, 0))) { wined3d_mutex_unlock(); return DDERR_INVALIDCAPS; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 86cda045d92..51179db05dd 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1343,7 +1343,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface * if (dst_impl->sub_resource_idx) ERR("Invalid sub-resource index %u on surface %p.\n", dst_impl->sub_resource_idx, dst_impl); texture = dst_impl->wined3d_texture; - rtv = wined3d_device_get_rendertarget_view(dst_impl->ddraw->wined3d_device, 0); + rtv = wined3d_device_context_get_rendertarget_view(dst_impl->ddraw->immediate_context, 0); dst_ddraw_texture = wined3d_texture_get_parent(dst_impl->wined3d_texture); texture_memory = dst_ddraw_texture->texture_memory; draw_texture = dst_impl->draw_texture; diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 4a415c4daf1..ada3f1757b7 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -406,7 +406,7 @@ static HRESULT WINAPI d3d_viewport_SetViewport(IDirect3DViewport3 *iface, D3DVIE if (device->version > 1) { - if (!(rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0))) + if (!(rtv = wined3d_device_context_get_rendertarget_view(device->immediate_context, 0))) { wined3d_mutex_unlock(); return DDERR_INVALIDCAPS; @@ -1035,7 +1035,7 @@ static HRESULT WINAPI d3d_viewport_SetViewport2(IDirect3DViewport3 *iface, D3DVI if (device->version > 1) { - if (!(rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0))) + if (!(rtv = wined3d_device_context_get_rendertarget_view(device->immediate_context, 0))) { wined3d_mutex_unlock(); return DDERR_INVALIDCAPS; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 33b06b44c29..40ee9739c5e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5391,21 +5391,21 @@ void CDECL wined3d_device_context_issue_query(struct wined3d_device_context *con query->state = QUERY_SIGNALLED; } -struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(const struct wined3d_device *device, - unsigned int view_idx) +struct wined3d_rendertarget_view * CDECL wined3d_device_context_get_rendertarget_view( + const struct wined3d_device_context *context, unsigned int view_idx) { unsigned int max_rt_count; - TRACE("device %p, view_idx %u.\n", device, view_idx); + TRACE("context %p, view_idx %u.\n", context, view_idx); - max_rt_count = device->adapter->d3d_info.limits.max_rt_count; + max_rt_count = context->device->adapter->d3d_info.limits.max_rt_count; if (view_idx >= max_rt_count) { WARN("Only %u render targets are supported.\n", max_rt_count); return NULL; } - return device->cs->c.state->fb.render_targets[view_idx]; + return context->state->fb.render_targets[view_idx]; } struct wined3d_rendertarget_view * CDECL wined3d_device_get_depth_stencil_view(const struct wined3d_device *device) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 442b06ed4ea..8a01bf1711f 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -85,7 +85,6 @@ @ cdecl wined3d_device_get_ps_sampler(ptr long) @ cdecl wined3d_device_get_raster_status(ptr long ptr) @ cdecl wined3d_device_get_render_state(ptr long) -@ cdecl wined3d_device_get_rendertarget_view(ptr long) @ cdecl wined3d_device_get_software_vertex_processing(ptr) @ cdecl wined3d_device_get_state(ptr) @ cdecl wined3d_device_get_stream_output(ptr long ptr) @@ -169,6 +168,7 @@ @ cdecl wined3d_device_context_get_constant_buffer(ptr long long) @ cdecl wined3d_device_context_get_depth_stencil_state(ptr ptr) @ cdecl wined3d_device_context_get_rasterizer_state(ptr) +@ cdecl wined3d_device_context_get_rendertarget_view(ptr long) @ cdecl wined3d_device_context_get_sampler(ptr long long) @ cdecl wined3d_device_context_get_scissor_rects(ptr ptr ptr) @ cdecl wined3d_device_context_get_shader(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e5e522e9fb2..fd9840379d3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2418,8 +2418,6 @@ struct wined3d_sampler * __cdecl wined3d_device_get_ps_sampler(const struct wine HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_raster_status *raster_status); DWORD __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, enum wined3d_render_state state); -struct wined3d_rendertarget_view * __cdecl wined3d_device_get_rendertarget_view(const struct wined3d_device *device, - unsigned int view_idx); BOOL __cdecl wined3d_device_get_software_vertex_processing(const struct wined3d_device *device); struct wined3d_state * __cdecl wined3d_device_get_state(struct wined3d_device *device); struct wined3d_buffer * __cdecl wined3d_device_get_stream_output(struct wined3d_device *device, @@ -2564,6 +2562,8 @@ struct wined3d_depth_stencil_state * __cdecl wined3d_device_context_get_depth_st const struct wined3d_device_context *context, unsigned int *stencil_ref); struct wined3d_rasterizer_state * __cdecl wined3d_device_context_get_rasterizer_state( struct wined3d_device_context *context); +struct wined3d_rendertarget_view * __cdecl wined3d_device_context_get_rendertarget_view( + const struct wined3d_device_context *context, unsigned int view_idx); struct wined3d_sampler * __cdecl wined3d_device_context_get_sampler(const struct wined3d_device_context *context, enum wined3d_shader_type shader_type, unsigned int idx); void __cdecl wined3d_device_context_get_scissor_rects(const struct wined3d_device_context *context, -- 2.30.2

4 12

[PATCH v2] wined3d: Prevent buildup of retired buffer objects' memory.
by Jan Sikorski April 20, 2021

April 20, 2021

Submit current command buffer in wined3d_context_vk_get_command_buffer() and return a new one if the total size of retired buffer objects on that command buffer crosses a predefined threshold. One way this issue may arise is when an application, by repeatedly doing resource updates, does not trigger a flush of the command buffer and accumulates transient staging buffers. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- v2: Changed accumulator type to VkDeviceSize, changed naming, added extra explanation to the commit message. --- dlls/wined3d/context_vk.c | 15 ++++++++++++--- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 45133eabb69..8719d54644b 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -921,6 +921,9 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const if (bo->map_ptr) VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); wined3d_context_vk_destroy_vk_memory(context_vk, bo->vk_memory, bo->command_buffer_id); + + if (bo->command_buffer_id == context_vk->current_command_buffer.id) + context_vk->retired_bo_size += bo->size; } void wined3d_context_vk_poll_command_buffers(struct wined3d_context_vk *context_vk) @@ -1509,9 +1512,14 @@ VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk buffer = &context_vk->current_command_buffer; if (buffer->vk_command_buffer) { - TRACE("Returning existing command buffer %p with id 0x%s.\n", - buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); - return buffer->vk_command_buffer; + if (context_vk->retired_bo_size > WINED3D_RETIRED_BO_SIZE_THRESHOLD) + wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL); + else + { + TRACE("Returning existing command buffer %p with id 0x%s.\n", + buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + return buffer->vk_command_buffer; + } } command_buffer_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; @@ -1628,6 +1636,7 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context context_vk->completed_command_buffer_id = 0; buffer->id = 1; } + context_vk->retired_bo_size = 0; wined3d_context_vk_cleanup_resources(context_vk); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c3e3752ed71..0ef6e89f1f1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2549,6 +2549,7 @@ struct wined3d_context_vk VkCommandPool vk_command_pool; struct wined3d_command_buffer_vk current_command_buffer; uint64_t completed_command_buffer_id; + VkDeviceSize retired_bo_size; struct { @@ -3921,6 +3922,7 @@ struct wined3d_null_views_vk #define WINED3D_ALLOCATOR_CHUNK_ORDER_COUNT 15 #define WINED3D_ALLOCATOR_MIN_BLOCK_SIZE (WINED3D_ALLOCATOR_CHUNK_SIZE >> (WINED3D_ALLOCATOR_CHUNK_ORDER_COUNT - 1)) #define WINED3D_SLAB_BO_MIN_OBJECT_ALIGN 16 +#define WINED3D_RETIRED_BO_SIZE_THRESHOLD (64 * 1024 * 1024) struct wined3d_allocator_chunk { -- 2.31.0

2 1

[PATCH] wined3d: Use wglSetPixelFormatWINE() in wined3d_context_gl_set_pixel_format() if we can.
by Henri Verbeet April 20, 2021

April 20, 2021

Based on a patch by Connor McAdams. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 63 ++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 123214afd5d..43c086ac758 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1186,6 +1186,7 @@ static BOOL wined3d_context_gl_set_pixel_format(struct wined3d_context_gl *conte int format = context_gl->pixel_format; HDC dc = context_gl->dc; int current; + HWND win; if (private && context_gl->dc_has_format) return TRUE; @@ -1196,55 +1197,43 @@ static BOOL wined3d_context_gl_set_pixel_format(struct wined3d_context_gl *conte current = gl_info->gl_ops.wgl.p_wglGetPixelFormat(dc); if (current == format) goto success; - if (!current) - { - if (!SetPixelFormat(dc, format, NULL)) - { - /* This may also happen if the dc belongs to a destroyed window. */ - WARN("Failed to set pixel format %d on device context %p, last error %#x.\n", - format, dc, GetLastError()); - return FALSE; - } - - context_gl->restore_pf = 0; - context_gl->restore_pf_win = private ? NULL : WindowFromDC(dc); - goto success; - } - /* By default WGL doesn't allow pixel format adjustments but we need it * here. For this reason there's a Wine specific wglSetPixelFormat() - * which allows us to set the pixel format multiple times. Only use it - * when really needed. */ + * which allows us to set the pixel format multiple times. Use it when we + * can, because even though no pixel format may currently be set, the + * application may try to set one later. */ if (gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH]) { - HWND win; - if (!GL_EXTCALL(wglSetPixelFormatWINE(dc, format))) { ERR("wglSetPixelFormatWINE failed to set pixel format %d on device context %p.\n", format, dc); return FALSE; } - - win = private ? NULL : WindowFromDC(dc); - if (win != context_gl->restore_pf_win) - { - wined3d_context_gl_restore_pixel_format(context_gl); - - context_gl->restore_pf = private ? 0 : current; - context_gl->restore_pf_win = win; - } - - goto success; + } + else if (current) + { + /* OpenGL doesn't allow pixel format adjustments. Print an error and + * continue using the old format. There's a big chance that the old + * format works although with a performance hit and perhaps rendering + * errors. */ + ERR("Unable to set pixel format %d on device context %p. Already using format %d.\n", + format, dc, current); + return TRUE; + } + else if (!SetPixelFormat(dc, format, NULL)) + { + /* This may also happen if the dc belongs to a destroyed window. */ + WARN("Failed to set pixel format %d on device context %p, last error %#x.\n", + format, dc, GetLastError()); + return FALSE; } - /* OpenGL doesn't allow pixel format adjustments. Print an error and - * continue using the old format. There's a big chance that the old - * format works although with a performance hit and perhaps rendering - * errors. */ - ERR("Unable to set pixel format %d on device context %p. Already using format %d.\n", - format, dc, current); - return TRUE; + win = private ? NULL : WindowFromDC(dc); + if (win != context_gl->restore_pf_win) + wined3d_context_gl_restore_pixel_format(context_gl); + context_gl->restore_pf = private ? 0 : current; + context_gl->restore_pf_win = win; success: if (private) -- 2.20.1

1 0

[PATCH] ntdll: Implement NtGetNextThread().
by Paul Gofman April 20, 2021

April 20, 2021

Largely based on a patch by Nikolay Sivov for NtGetNextProcess(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Used by Forza Horizon 4. dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/om.c | 86 ++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/thread.c | 26 ++++++++++++ server/protocol.def | 12 ++++++ server/thread.c | 52 ++++++++++++++++++++++++ 5 files changed, 177 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index a93fa08c406..cade83da4b1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -223,6 +223,7 @@ @ stdcall -norelay -syscall NtGetContextThread(long ptr) @ stdcall -syscall NtGetCurrentProcessorNumber() # @ stub NtGetDevicePowerState +@ stdcall -syscall NtGetNextThread(ptr ptr long long long ptr) @ stdcall -syscall NtGetNlsSectionPtr(long long long ptr ptr) @ stub NtGetPlugPlayEvent @ stdcall NtGetTickCount() diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index e0988769c9c..eb1ebe8dd80 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -78,6 +78,7 @@ static void (WINAPI *pRtlWakeAddressAll)( const void * ); static void (WINAPI *pRtlWakeAddressSingle)( const void * ); static NTSTATUS (WINAPI *pNtOpenProcess)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, const CLIENT_ID * ); static NTSTATUS (WINAPI *pNtCreateDebugObject)( HANDLE *, ACCESS_MASK, OBJECT_ATTRIBUTES *, ULONG ); +static NTSTATUS (WINAPI *pNtGetNextThread)(HANDLE process, HANDLE thread, ACCESS_MASK access, ULONG attributes, ULONG flags, HANDLE *handle); #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 @@ -2564,6 +2565,89 @@ static void test_object_types(void) } } +static DWORD WINAPI test_get_next_thread_proc( void *arg ) +{ + HANDLE event = (HANDLE)arg; + + WaitForSingleObject(event, INFINITE); + return 0; +} + +static void test_get_next_thread(void) +{ + HANDLE hprocess = GetCurrentProcess(); + HANDLE handle, thread, event, prev; + NTSTATUS status; + DWORD thread_id; + BOOL found; + + if (!pNtGetNextThread) + { + win_skip("NtGetNextThread is not available.\n"); + return; + } + + event = CreateEventA(NULL, FALSE, FALSE, NULL); + + thread = CreateThread( NULL, 0, test_get_next_thread_proc, event, 0, &thread_id ); + + status = pNtGetNextThread(hprocess, NULL, THREAD_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 0, NULL); + ok(status == STATUS_ACCESS_VIOLATION, "Got unexected status %#x.\n", status); + + found = FALSE; + prev = NULL; + while (!(status = pNtGetNextThread(hprocess, prev, THREAD_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 0, &handle))) + { + if (prev) + { + if (GetThreadId(handle) == thread_id) + found = TRUE; + pNtClose(prev); + } + else + { + ok(GetThreadId(handle) == GetCurrentThreadId(), "Got unexpected thread id %04x, current %04x.\n", + GetThreadId(handle), GetCurrentThreadId()); + } + prev = handle; + } + pNtClose(prev); + ok(status == STATUS_NO_MORE_ENTRIES, "Unexpected status %#x.\n", status); + ok(found, "Thread not found.\n"); + + status = pNtGetNextThread((void *)0xdeadbeef, 0, PROCESS_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 0, &handle); + ok(status == STATUS_INVALID_HANDLE, "Unexpected status %#x.\n", status); + status = pNtGetNextThread(hprocess, (void *)0xdeadbeef, PROCESS_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 0, &handle); + ok(status == STATUS_INVALID_HANDLE, "Unexpected status %#x.\n", status); + + /* Reversed search only supported in recent enough Win10. */ + status = pNtGetNextThread(hprocess, 0, PROCESS_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 1, &handle); + ok(!status || broken(status == STATUS_INVALID_PARAMETER), "Unexpected status %#x.\n", status); + if (!status) + pNtClose(handle); + + status = pNtGetNextThread(hprocess, 0, PROCESS_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 2, &handle); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %#x.\n", status); + + SetEvent(event); + WaitForSingleObject(thread, INFINITE); + + found = FALSE; + prev = NULL; + while (!(status = pNtGetNextThread(hprocess, prev, THREAD_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 0, &handle))) + { + if (prev) + pNtClose(prev); + if (GetThreadId(handle) == thread_id) + found = TRUE; + prev = handle; + } + pNtClose(prev); + ok(found, "Thread not found.\n"); + + CloseHandle(thread); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2615,6 +2699,7 @@ START_TEST(om) pRtlWakeAddressSingle = (void *)GetProcAddress(hntdll, "RtlWakeAddressSingle"); pNtOpenProcess = (void *)GetProcAddress(hntdll, "NtOpenProcess"); pNtCreateDebugObject = (void *)GetProcAddress(hntdll, "NtCreateDebugObject"); + pNtGetNextThread = (void *)GetProcAddress(hntdll, "NtGetNextThread"); test_case_sensitive(); test_namespace_pipe(); @@ -2632,4 +2717,5 @@ START_TEST(om) test_wait_on_address(); test_process(); test_object_types(); + test_get_next_thread(); } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index b1c64f6f7a8..62cee1d848b 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1382,3 +1382,29 @@ ULONG WINAPI NtGetCurrentProcessorNumber(void) /* fallback to the first processor */ return 0; } + + +/****************************************************************************** + * NtGetNextThread (NTDLL.@) + */ +NTSTATUS WINAPI NtGetNextThread(HANDLE hprocess, HANDLE hthread, ACCESS_MASK access, ULONG attributes, + ULONG flags, HANDLE *handle) +{ + NTSTATUS ret; + + TRACE( "hprocess %p, hthread %p, access %#x, attributes %#x, flags %#x, handle %p.\n", + hprocess, hthread, access, attributes, flags, handle ); + + SERVER_START_REQ( get_next_thread ) + { + req->process = wine_server_obj_handle( hprocess ); + req->last = wine_server_obj_handle( hthread ); + req->access = access; + req->attributes = attributes; + req->flags = flags; + ret = wine_server_call( req ); + if (!ret) *handle = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + return ret; +} diff --git a/server/protocol.def b/server/protocol.def index 9ea6967acdd..a5ba8a4ca35 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3699,3 +3699,15 @@ struct handle_info @REQ(resume_process) obj_handle_t handle; /* process handle */ @END + + +/* Iterate thread list for process */ +(a)REQ(get_next_thread) + obj_handle_t process; /* process handle */ + obj_handle_t last; /* thread handle to start with */ + unsigned int access; /* desired access for returned handle */ + unsigned int attributes; /* returned handle attributes */ + unsigned int flags; /* controls iteration direction */ +(a)REPLY + obj_handle_t handle; /* next thread handle */ +(a)END diff --git a/server/thread.c b/server/thread.c index fe9f9bdec37..bdfafeec25a 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1950,3 +1950,55 @@ DECL_HANDLER(get_selector_entry) release_object( thread ); } } + +/* Iterate thread list for process. Use global thread list to also + * return terminated but not yet destroyed threads. */ +DECL_HANDLER(get_next_thread) +{ + struct thread *thread, *next; + struct process *process; + struct list *ptr; + + reply->handle = 0; + + if ( req->flags > 1 ) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + + if (!(process = get_process_from_handle( req->process, PROCESS_QUERY_INFORMATION ))) + return; + + if (!req->last) + { + ptr = req->flags ? list_tail( &thread_list ) : list_head( &thread_list ); + } + else if ((thread = get_thread_from_handle( req->last, 0 ))) + { + ptr = req->flags ? list_prev( &thread_list, &thread->entry ) : + list_next( &thread_list, &thread->entry ); + release_object( thread ); + } + else + { + release_object( process ); + return; + } + + while (ptr) + { + next = LIST_ENTRY( ptr, struct thread, entry ); + if (next->process == process + && (reply->handle = alloc_handle( current->process, next, req->access, req->attributes ))) + { + release_object( process ); + return; + } + ptr = req->flags ? list_prev( &thread_list, &next->entry ) + : list_next( &thread_list, &next->entry ); + } + + set_error( STATUS_NO_MORE_ENTRIES ); + release_object( process ); +} -- 2.30.2

2 1

[PATCH v3 1/2] ntdll: Allow renaming a file/directory to a different casing of itself.
by Gabriel Ivăncescu April 20, 2021

April 20, 2021

Renaming a file or directory from e.g. foobar to FooBar (or any other casing change) should work, like on Windows, instead of being a no-op. Clobbering an existing file must also respect the new casing. Note that we only send the different casing (and thus casing_len != 0) if it's actually different. This is important to preserve atomicity of rename() in wineserver in all other cases that don't require this special casing handling. The only extra time rename() is not atomic is when an existing file is clobbered with a different casing, since we have to unlink the old file first, then rename the new file into the new casing, but there's no way around that... Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46203 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- We just prepend the unix casing filename (without path) to the wineserver data before the actual unix filename, and add an extra (optional) field `casing_len` which is the length of this data. If there's no casing, this is zero and the behavior is identical to before, which is the default. dlls/ntdll/unix/file.c | 46 ++++++++++++++++++--- server/fd.c | 94 +++++++++++++++++++++++++++++------------- server/protocol.def | 2 + 3 files changed, 107 insertions(+), 35 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 9ee5e84..fa604a1 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4508,8 +4508,9 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, { FILE_RENAME_INFORMATION *info = ptr; UNICODE_STRING name_str, nt_name = { 0 }; + char *unix_name, *casing = NULL; OBJECT_ATTRIBUTES attr; - char *unix_name; + int casing_len = 0; name_str.Buffer = info->FileName; name_str.Length = info->FileNameLength; @@ -4524,19 +4525,52 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, if (io->u.Status != STATUS_SUCCESS && io->u.Status != STATUS_NO_SUCH_FILE) break; + /* get the casing of the last component if target exists */ + if (io->u.Status != STATUS_NO_SUCH_FILE) + { + const WCHAR *nt_filename = name_str.Buffer + name_str.Length / sizeof(WCHAR); + size_t nt_filename_len; + + /* name_str is not NUL terminated; look for last \ character */ + for (; nt_filename != name_str.Buffer; nt_filename--) + if (nt_filename[-1] == '\\') + break; + nt_filename_len = name_str.Buffer + name_str.Length / sizeof(WCHAR) - nt_filename; + + /* see if only casing differs from nt_name and update it */ + if (nt_name.Length / sizeof(WCHAR) >= nt_filename_len) + { + WCHAR *p = nt_name.Buffer + nt_name.Length / sizeof(WCHAR) - nt_filename_len; + + if ((p == nt_name.Buffer || p[-1] == '\\') && + memcmp( p, nt_filename, nt_filename_len * sizeof(WCHAR) ) && + !wcsnicmp( p, nt_filename, nt_filename_len ) && + (casing = malloc( nt_filename_len * 3 ))) + { + casing_len = ntdll_wcstoumbs( nt_filename, nt_filename_len, casing, + nt_filename_len * 3, TRUE ); + if (casing_len < 0) casing_len = 0; + if (casing_len) memcpy( p, nt_filename, nt_filename_len * sizeof(WCHAR) ); + } + } + } + SERVER_START_REQ( set_fd_name_info ) { - req->handle = wine_server_obj_handle( handle ); - req->rootdir = wine_server_obj_handle( attr.RootDirectory ); - req->namelen = nt_name.Length; - req->link = FALSE; - req->replace = info->ReplaceIfExists; + req->handle = wine_server_obj_handle( handle ); + req->rootdir = wine_server_obj_handle( attr.RootDirectory ); + req->namelen = nt_name.Length; + req->casing_len = casing_len; + req->link = FALSE; + req->replace = info->ReplaceIfExists; wine_server_add_data( req, nt_name.Buffer, nt_name.Length ); + wine_server_add_data( req, casing, casing_len ); wine_server_add_data( req, unix_name, strlen(unix_name) ); io->u.Status = wine_server_call( req ); } SERVER_END_REQ; + free( casing ); free( unix_name ); free( nt_name.Buffer ); } diff --git a/server/fd.c b/server/fd.c index 481e9a8..502d958 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2488,7 +2488,8 @@ static void set_fd_disposition( struct fd *fd, int unlink ) /* set new name for the fd */ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, data_size_t len, - struct unicode_str nt_name, int create_link, int replace ) + const char *casing, data_size_t casing_len, struct unicode_str nt_name, + int create_link, int replace ) { struct inode *inode; struct stat st, st2; @@ -2538,45 +2539,77 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da if (!fstat( fd->unix_fd, &st2 ) && st.st_ino == st2.st_ino && st.st_dev == st2.st_dev) { if (create_link && !replace) set_error( STATUS_OBJECT_NAME_COLLISION ); - free( name ); - return; - } - - if (!replace) - { - set_error( STATUS_OBJECT_NAME_COLLISION ); - goto failed; + if (!casing_len) + { + free( name ); + return; + } } - - /* can't replace directories or special files */ - if (!S_ISREG( st.st_mode )) + else { - set_error( STATUS_ACCESS_DENIED ); - goto failed; - } + if (!replace) + { + set_error( STATUS_OBJECT_NAME_COLLISION ); + goto failed; + } - /* can't replace an opened file */ - if ((inode = get_inode( st.st_dev, st.st_ino, -1 ))) - { - int is_empty = list_empty( &inode->open ); - release_object( inode ); - if (!is_empty) + /* can't replace directories or special files */ + if (!S_ISREG( st.st_mode )) { set_error( STATUS_ACCESS_DENIED ); goto failed; } + + /* can't replace an opened file */ + if ((inode = get_inode( st.st_dev, st.st_ino, -1 ))) + { + int is_empty = list_empty( &inode->open ); + release_object( inode ); + if (!is_empty) + { + set_error( STATUS_ACCESS_DENIED ); + goto failed; + } + } + + /* link() expects that the target doesn't exist */ + /* rename() cannot replace files with directories */ + /* we also have to unlink it if target has different casing */ + if (create_link || S_ISDIR( st2.st_mode ) || casing_len) + { + if (unlink( name )) + { + file_set_error(); + goto failed; + } + } } + } + + /* replace the last component with its actual casing */ + if (casing_len) + { + char *p = strrchr( name, '/' ); + size_t orig_len, path_len; + + p = p ? p + 1 : name; + path_len = p - name; + orig_len = strlen(p); - /* link() expects that the target doesn't exist */ - /* rename() cannot replace files with directories */ - if (create_link || S_ISDIR( st2.st_mode )) + if (orig_len < casing_len) { - if (unlink( name )) + char *new_name = mem_alloc( path_len + casing_len + 1 ); + if (!new_name) { - file_set_error(); + set_error( STATUS_NO_MEMORY ); goto failed; } + memcpy( new_name, name, path_len ); + free( name ); + name = new_name; } + memcpy(name + path_len, casing, casing_len); + name[path_len + casing_len] = 0; } if (create_link) @@ -2879,16 +2912,19 @@ DECL_HANDLER(set_fd_disp_info) /* set fd name information */ DECL_HANDLER(set_fd_name_info) { + const char *filename, *casing; struct fd *fd, *root_fd = NULL; struct unicode_str nt_name; - if (req->namelen > get_req_data_size()) + if (req->namelen > get_req_data_size() || get_req_data_size() - req->namelen < req->casing_len) { set_error( STATUS_INVALID_PARAMETER ); return; } nt_name.str = get_req_data(); nt_name.len = (req->namelen / sizeof(WCHAR)) * sizeof(WCHAR); + casing = (const char *)get_req_data() + req->namelen; + filename = casing + req->casing_len; if (req->rootdir) { @@ -2902,8 +2938,8 @@ DECL_HANDLER(set_fd_name_info) if ((fd = get_handle_fd_obj( current->process, req->handle, 0 ))) { - set_fd_name( fd, root_fd, (const char *)get_req_data() + req->namelen, - get_req_data_size() - req->namelen, nt_name, req->link, req->replace ); + set_fd_name( fd, root_fd, filename, (const char *)get_req_data() + get_req_data_size() - filename, + casing, req->casing_len, nt_name, req->link, req->replace ); release_object( fd ); } if (root_fd) release_object( root_fd ); diff --git a/server/protocol.def b/server/protocol.def index 617818f..d97cd1a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3532,9 +3532,11 @@ struct handle_info obj_handle_t handle; /* handle to a file or directory */ obj_handle_t rootdir; /* root directory */ data_size_t namelen; /* length of NT name in bytes */ + data_size_t casing_len; /* length of the casing filename */ int link; /* link instead of renaming */ int replace; /* replace an existing file? */ VARARG(name,unicode_str,namelen); /* NT name */ + VARARG(casing,string,casing_len); /* new file name's actual casing (without path) */ VARARG(filename,string); /* new file name */ @END -- 2.30.0

3 7

[PATCH 1/2] bcrypt: Synchronize symmetric key access for encrypt and decrypt.
by Paul Gofman April 20, 2021

April 20, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Forza Horizon 4 crashes during entering multiplayer mode due to BCryptEncrypt and BCryptDecrypt being used from different threads with the same key using MODE_ID_GCM. Most of the time that is either glinc free() assertion or segfault inside gnutls function. While bcrypt functions are probably not thread safe in general on Windows, I suppose the native implementation does not modify any key data in encrypt and decrypt in this mode. dlls/bcrypt/bcrypt_internal.h | 1 + dlls/bcrypt/bcrypt_main.c | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index eb136111509..efa1a463489 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -164,6 +164,7 @@ struct key_symmetric ULONG vector_len; UCHAR *secret; ULONG secret_len; + CRITICAL_SECTION cs; }; #define KEY_FLAG_LEGACY_DSA_V2 0x00000001 diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index a1423dcd836..2ef26e81291 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1480,6 +1480,7 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ if (!(block_size = get_block_size( alg ))) return STATUS_INVALID_PARAMETER; if (!(key = heap_alloc_zero( sizeof(*key) ))) return STATUS_NO_MEMORY; + InitializeCriticalSection( &key->u.s.cs ); key->hdr.magic = MAGIC_KEY; key->alg_id = alg->id; key->u.s.mode = alg->mode; @@ -1588,6 +1589,8 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) key_copy->u.s.block_size = key_orig->u.s.block_size; key_copy->u.s.secret = buffer; key_copy->u.s.secret_len = key_orig->u.s.secret_len; + + InitializeCriticalSection( &key_copy->u.s.cs ); } else { @@ -1613,6 +1616,7 @@ static void key_destroy( struct key *key ) key_funcs->key_symmetric_destroy( key ); heap_free( key->u.s.vector ); heap_free( key->u.s.secret ); + DeleteCriticalSection( &key->u.s.cs ); } else { @@ -1714,6 +1718,7 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { struct key *key = handle; + NTSTATUS ret; TRACE( "%p, %p, %u, %p, %p, %u, %p, %u, %p, %08x\n", handle, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); @@ -1730,13 +1735,17 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp return STATUS_NOT_IMPLEMENTED; } - return key_encrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); + EnterCriticalSection( &key->u.s.cs ); + ret = key_encrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); + LeaveCriticalSection( &key->u.s.cs ); + return ret; } NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { struct key *key = handle; + NTSTATUS ret; TRACE( "%p, %p, %u, %p, %p, %u, %p, %u, %p, %08x\n", handle, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); @@ -1753,7 +1762,10 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp return STATUS_NOT_IMPLEMENTED; } - return key_decrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); + EnterCriticalSection( &key->u.s.cs ); + ret = key_decrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); + LeaveCriticalSection( &key->u.s.cs ); + return ret; } NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) -- 2.30.2

2 5

[PATCH 4/4] bcrypt/tests: Add test for key parallel usage.
by Hans Leidekker April 20, 2021

April 20, 2021

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/tests/bcrypt.c | 87 +++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 456727d04a9..fb5ac03b039 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -862,6 +862,64 @@ static void test_BCryptGenerateSymmetricKey(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } +#define RACE_TEST_COUNT 200 +static LONG encrypt_race_start_barrier; + +static DWORD WINAPI encrypt_race_thread(void *parameter) +{ + static UCHAR nonce[] = + {0x11,0x20,0x30,0x40,0x50,0x60,0x10,0x20,0x30,0x40,0x50,0x60}; + static UCHAR auth_data[] = + {0x61,0x50,0x40,0x30,0x20,0x10,0x60,0x50,0x40,0x30,0x20,0x10}; + static UCHAR data2[] = + {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f, + 0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10}; + static UCHAR expected4[] = + {0xb2,0x27,0x19,0x09,0xc7,0x89,0xdc,0x52,0x24,0x83,0x3a,0x55,0x34,0x76,0x2c,0xbf, + 0x15,0xa1,0xcb,0x40,0x78,0x11,0xba,0xbc,0xa4,0x76,0x69,0x7c,0x75,0x4f,0x11,0xba}; + static UCHAR expected_tag3[] = + {0xef,0xee,0x75,0x99,0xb8,0x12,0xe9,0xf0,0xb4,0xcc,0x65,0x11,0x67,0x60,0x2d,0xe6}; + + BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; + BCRYPT_KEY_HANDLE key = parameter; + UCHAR ciphertext[48], tag[16]; + unsigned int i, test; + NTSTATUS ret; + ULONG size; + + memset(&auth_info, 0, sizeof(auth_info)); + auth_info.cbSize = sizeof(auth_info); + auth_info.dwInfoVersion = 1; + auth_info.pbNonce = nonce; + auth_info.cbNonce = sizeof(nonce); + auth_info.pbTag = tag; + auth_info.cbTag = sizeof(tag); + auth_info.pbAuthData = auth_data; + auth_info.cbAuthData = sizeof(auth_data); + + InterlockedIncrement(&encrypt_race_start_barrier); + while (InterlockedCompareExchange(&encrypt_race_start_barrier, 3, 2) != 2) + ; + + for (test = 0; test < RACE_TEST_COUNT; ++test) + { + size = 0; + memset(ciphertext, 0xff, sizeof(ciphertext)); + memset(tag, 0xff, sizeof(tag)); + ret = pBCryptEncrypt(key, data2, 32, &auth_info, NULL, 0, ciphertext, 32, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); + ok(!memcmp(tag, expected_tag3, sizeof(expected_tag3)), "wrong tag\n"); + for (i = 0; i < 32; i++) + ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + for (i = 0; i < 16; i++) + ok(tag[i] == expected_tag3[i], "%u: %02x != %02x\n", i, tag[i], expected_tag3[i]); + } + + return 0; +} + static void test_BCryptEncrypt(void) { static UCHAR nonce[] = @@ -921,9 +979,10 @@ static void test_BCryptEncrypt(void) BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; UCHAR *buf, ciphertext[48], ivbuf[16], tag[16]; BCRYPT_AUTH_TAG_LENGTHS_STRUCT tag_length; + ULONG size, len, i, test; BCRYPT_ALG_HANDLE aes; BCRYPT_KEY_HANDLE key; - ULONG size, len, i; + HANDLE hthread; NTSTATUS ret; ret = pBCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0); @@ -1215,6 +1274,32 @@ static void test_BCryptEncrypt(void) ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 48, &size, BCRYPT_BLOCK_PADDING); ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + /* race test */ + + encrypt_race_start_barrier = 0; + hthread = CreateThread(NULL, 0, encrypt_race_thread, key, 0, NULL); + + while (InterlockedCompareExchange(&encrypt_race_start_barrier, 2, 1) != 1) + ; + + for (test = 0; test < RACE_TEST_COUNT; ++test) + { + size = 0; + memset(ciphertext, 0xff, sizeof(ciphertext)); + memset(tag, 0xff, sizeof(tag)); + ret = pBCryptEncrypt(key, data2, 32, &auth_info, NULL, 0, ciphertext, 32, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); + ok(!memcmp(tag, expected_tag3, sizeof(expected_tag2)), "wrong tag\n"); + for (i = 0; i < 32; i++) + ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + for (i = 0; i < 16; i++) + ok(tag[i] == expected_tag3[i], "%u: %02x != %02x\n", i, tag[i], expected_tag3[i]); + } + + WaitForSingleObject(hthread, INFINITE); + ret = pBCryptDestroyKey(key); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); HeapFree(GetProcessHeap(), 0, buf); -- 2.30.2

1 0

[PATCH 3/4] bcrypt: Synchronize symmetric key access for encrypt and decrypt.
by Hans Leidekker April 20, 2021

April 20, 2021

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_internal.h | 1 + dlls/bcrypt/bcrypt_main.c | 32 ++++++++++++++++++++------------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index fef1e4585ee..61c367cae9d 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -164,6 +164,7 @@ struct key_symmetric ULONG vector_len; UCHAR *secret; ULONG secret_len; + CRITICAL_SECTION cs; }; #define KEY_FLAG_LEGACY_DSA_V2 0x00000001 diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 59835014530..5eb50cd616b 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1090,8 +1090,8 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_encrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, - ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) +static NTSTATUS key_symmetric_encrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, + ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { ULONG bytes_left = input_len; UCHAR *buf, *src, *dst; @@ -1462,6 +1462,7 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ if (!(block_size = get_block_size( alg ))) return STATUS_INVALID_PARAMETER; if (!(key = heap_alloc_zero( sizeof(*key) ))) return STATUS_NO_MEMORY; + InitializeCriticalSection( &key->u.s.cs ); key->hdr.magic = MAGIC_KEY; key->alg_id = alg->id; key->u.s.mode = alg->mode; @@ -1570,6 +1571,7 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) key_copy->u.s.block_size = key_orig->u.s.block_size; key_copy->u.s.secret = buffer; key_copy->u.s.secret_len = key_orig->u.s.secret_len; + InitializeCriticalSection( &key_copy->u.s.cs ); } else { @@ -1595,6 +1597,7 @@ static void key_destroy( struct key *key ) key_funcs->key_symmetric_destroy( key ); heap_free( key->u.s.vector ); heap_free( key->u.s.secret ); + DeleteCriticalSection( &key->u.s.cs ); } else { @@ -1696,6 +1699,7 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { struct key *key = handle; + NTSTATUS ret; TRACE( "%p, %p, %u, %p, %p, %u, %p, %u, %p, %08x\n", handle, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); @@ -1712,15 +1716,10 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp return STATUS_NOT_IMPLEMENTED; } - return key_encrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); -} - -static NTSTATUS key_decrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, - ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) -{ - if (key_is_symmetric( key )) - return key_symmetric_decrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); - return key_funcs->key_asymmetric_decrypt( key, input, input_len, output, output_len, ret_len ); + EnterCriticalSection( &key->u.s.cs ); + ret = key_symmetric_encrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); + LeaveCriticalSection( &key->u.s.cs ); + return ret; } NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, @@ -1738,7 +1737,16 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp return STATUS_NOT_IMPLEMENTED; } - return key_decrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); + if (key_is_symmetric( key )) + { + NTSTATUS ret; + EnterCriticalSection( &key->u.s.cs ); + ret = key_symmetric_decrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); + LeaveCriticalSection( &key->u.s.cs ); + return ret; + } + + return key_funcs->key_asymmetric_decrypt( key, input, input_len, output, output_len, ret_len ); } NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) -- 2.30.2

1 0

[PATCH 2/4] bcrypt: Pass output length as a separate parameter to key_asymmetric_decrypt.
by Hans Leidekker April 20, 2021

April 20, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_internal.h | 2 +- dlls/bcrypt/bcrypt_main.c | 11 +---------- dlls/bcrypt/gnutls.c | 18 ++++++------------ 3 files changed, 8 insertions(+), 23 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index eb136111509..fef1e4585ee 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -206,7 +206,7 @@ struct key_funcs void (CDECL *key_symmetric_destroy)( struct key * ); NTSTATUS (CDECL *key_asymmetric_init)( struct key * ); NTSTATUS (CDECL *key_asymmetric_generate)( struct key * ); - NTSTATUS (CDECL *key_asymmetric_decrypt)( struct key *, UCHAR *, ULONG, UCHAR *, ULONG * ); + NTSTATUS (CDECL *key_asymmetric_decrypt)( struct key *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG * ); NTSTATUS (CDECL *key_asymmetric_duplicate)( struct key *, struct key * ); NTSTATUS (CDECL *key_asymmetric_sign)( struct key *, void *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG *, ULONG ); NTSTATUS (CDECL *key_asymmetric_verify)( struct key *, void *, UCHAR *, ULONG, UCHAR *, ULONG, DWORD ); diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 6729edf671f..59835014530 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1715,21 +1715,12 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp return key_encrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); } -static NTSTATUS key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len, UCHAR *output, - ULONG output_len, ULONG *ret_len ) -{ - NTSTATUS status; - if (!(status = key_funcs->key_asymmetric_decrypt( key, input, input_len, output, &output_len ))) - *ret_len = output_len; - return status; -} - static NTSTATUS key_decrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { if (key_is_symmetric( key )) return key_symmetric_decrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); - return key_asymmetric_decrypt( key, input, input_len, output, output_len, ret_len ); + return key_funcs->key_asymmetric_decrypt( key, input, input_len, output, output_len, ret_len ); } NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 2f0c62bc6da..9c1e7b5ab06 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1846,32 +1846,26 @@ static NTSTATUS CDECL key_asymmetric_duplicate( struct key *key_orig, struct key return STATUS_SUCCESS; } -static NTSTATUS CDECL key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len, - UCHAR *output, ULONG *output_len ) +static NTSTATUS CDECL key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len, UCHAR *output, + ULONG output_len, ULONG *ret_len ) { gnutls_datum_t e, d = { 0 }; NTSTATUS status = STATUS_SUCCESS; int ret; - e.data = (unsigned char *)input; + e.data = input; e.size = input_len; - if ((ret = pgnutls_privkey_decrypt_data( key_data(key)->privkey, 0, &e, &d ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - if (*output_len >= d.size) - { - *output_len = d.size; - memcpy( output, d.data, *output_len ); - } - else - status = STATUS_BUFFER_TOO_SMALL; + *ret_len = d.size; + if (output_len >= d.size) memcpy( output, d.data, *ret_len ); + else status = STATUS_BUFFER_TOO_SMALL; free( d.data ); - return status; } -- 2.30.2

1 0