October 2021 - Wine-Commits

Jan Sikorski : d3d11: Don't grab wined3d lock for wined3d_texture_incref().
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 8316618912db9fa43ac51de4baa4c17742414793 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8316618912db9fa43ac51de4… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:01 2021 +0200 d3d11: Don't grab wined3d lock for wined3d_texture_incref(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/texture.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 061bbb09795..2a43b24b226 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -76,9 +76,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture1d_AddRef(ID3D11Texture1D *iface) if (refcount == 1) { ID3D11Device2_AddRef(texture->device); - wined3d_mutex_lock(); wined3d_texture_incref(texture->wined3d_texture); - wined3d_mutex_unlock(); } return refcount; @@ -564,9 +562,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_AddRef(ID3D11Texture2D *iface) if (refcount == 1) { ID3D11Device2_AddRef(texture->device); - wined3d_mutex_lock(); wined3d_texture_incref(texture->wined3d_texture); - wined3d_mutex_unlock(); } return refcount; @@ -1119,9 +1115,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_AddRef(ID3D11Texture3D *iface) if (refcount == 1) { ID3D11Device2_AddRef(texture->device); - wined3d_mutex_lock(); wined3d_texture_incref(texture->wined3d_texture); - wined3d_mutex_unlock(); } return refcount;

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for reference incrementing functions.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 02195f3ccf41e561694026a3bb73a07c650c83c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02195f3ccf41e561694026a3… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:00 2021 +0200 d3d11: Don't grab wined3d lock for reference incrementing functions. Except wined3d_texture_incref(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 2 -- dlls/d3d11/buffer.c | 2 -- dlls/d3d11/inputlayout.c | 2 -- dlls/d3d11/shader.c | 12 ------------ dlls/d3d11/state.c | 8 -------- dlls/d3d11/view.c | 8 -------- 6 files changed, 34 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index fd83871220d..4476d56404f 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -72,9 +72,7 @@ static ULONG STDMETHODCALLTYPE d3d11_query_AddRef(ID3D11Query *iface) if (refcount == 1) { ID3D11Device2_AddRef(query->device); - wined3d_mutex_lock(); wined3d_query_incref(query->wined3d_query); - wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 09d495c3f61..180641caef5 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -69,9 +69,7 @@ static ULONG STDMETHODCALLTYPE d3d11_buffer_AddRef(ID3D11Buffer *iface) if (refcount == 1) { ID3D11Device2_AddRef(buffer->device); - wined3d_mutex_lock(); wined3d_buffer_incref(buffer->wined3d_buffer); - wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 6b59dd994b3..34d273b31c8 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -138,9 +138,7 @@ static ULONG STDMETHODCALLTYPE d3d11_input_layout_AddRef(ID3D11InputLayout *ifac if (refcount == 1) { ID3D11Device2_AddRef(layout->device); - wined3d_mutex_lock(); wined3d_vertex_declaration_incref(layout->wined3d_decl); - wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 0d19b74ff0b..e474ae692d5 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -69,9 +69,7 @@ static ULONG STDMETHODCALLTYPE d3d11_vertex_shader_AddRef(ID3D11VertexShader *if if (refcount == 1) { ID3D11Device2_AddRef(shader->device); - wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); - wined3d_mutex_unlock(); } return refcount; @@ -365,9 +363,7 @@ static ULONG STDMETHODCALLTYPE d3d11_hull_shader_AddRef(ID3D11HullShader *iface) if (refcount == 1) { ID3D11Device2_AddRef(shader->device); - wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); - wined3d_mutex_unlock(); } return refcount; @@ -558,9 +554,7 @@ static ULONG STDMETHODCALLTYPE d3d11_domain_shader_AddRef(ID3D11DomainShader *if if (refcount == 1) { ID3D11Device2_AddRef(shader->device); - wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); - wined3d_mutex_unlock(); } return refcount; @@ -761,9 +755,7 @@ static ULONG STDMETHODCALLTYPE d3d11_geometry_shader_AddRef(ID3D11GeometryShader if (refcount == 1) { ID3D11Device2_AddRef(shader->device); - wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); - wined3d_mutex_unlock(); } return refcount; @@ -1265,9 +1257,7 @@ static ULONG STDMETHODCALLTYPE d3d11_pixel_shader_AddRef(ID3D11PixelShader *ifac if (refcount == 1) { ID3D11Device2_AddRef(shader->device); - wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); - wined3d_mutex_unlock(); } return refcount; @@ -1560,9 +1550,7 @@ static ULONG STDMETHODCALLTYPE d3d11_compute_shader_AddRef(ID3D11ComputeShader * if (refcount == 1) { ID3D11Device2_AddRef(shader->device); - wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); - wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index d31ea16bbe8..8fa94a12a66 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -64,9 +64,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState *iface) if (refcount == 1) { ID3D11Device2_AddRef(state->device); - wined3d_mutex_lock(); wined3d_blend_state_incref(state->wined3d_state); - wined3d_mutex_unlock(); } return refcount; @@ -496,9 +494,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_AddRef(ID3D11DepthStenci if (refcount == 1) { ID3D11Device2_AddRef(state->device); - wined3d_mutex_lock(); wined3d_depth_stencil_state_incref(state->wined3d_state); - wined3d_mutex_unlock(); } return refcount; @@ -896,9 +892,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_AddRef(ID3D11RasterizerSta if (refcount == 1) { ID3D11Device2_AddRef(state->device); - wined3d_mutex_lock(); wined3d_rasterizer_state_incref(state->wined3d_state); - wined3d_mutex_unlock(); } return refcount; @@ -1284,9 +1278,7 @@ static ULONG STDMETHODCALLTYPE d3d11_sampler_state_AddRef(ID3D11SamplerState *if if (refcount == 1) { ID3D11Device2_AddRef(state->device); - wined3d_mutex_lock(); wined3d_sampler_incref(state->wined3d_sampler); - wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 734c9619e5b..1679729e15c 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -963,9 +963,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_AddRef(ID3D11DepthStencil if (refcount == 1) { ID3D11Device2_AddRef(view->device); - wined3d_mutex_lock(); wined3d_rendertarget_view_incref(view->wined3d_view); - wined3d_mutex_unlock(); } return refcount; @@ -1407,9 +1405,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_AddRef(ID3D11RenderTarget if (refcount == 1) { ID3D11Device2_AddRef(view->device); - wined3d_mutex_lock(); wined3d_rendertarget_view_incref(view->wined3d_view); - wined3d_mutex_unlock(); } return refcount; @@ -1855,9 +1851,7 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_AddRef(ID3D11ShaderRes if (refcount == 1) { ID3D11Device2_AddRef(view->device); - wined3d_mutex_lock(); wined3d_shader_resource_view_incref(view->wined3d_view); - wined3d_mutex_unlock(); } return refcount; @@ -2340,9 +2334,7 @@ static ULONG STDMETHODCALLTYPE d3d11_unordered_access_view_AddRef(ID3D11Unordere if (refcount == 1) { ID3D11Device2_AddRef(view->device); - wined3d_mutex_lock(); wined3d_unordered_access_view_incref(view->wined3d_view); - wined3d_mutex_unlock(); } return refcount;

1 0

Jan Sikorski : wined3d: Set render targets and UAVs atomically in wined3d.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 3f4e6673dcafcc30a6b6286203fe3a11043c32de URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f4e6673dcafcc30a6b62862… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:25:58 2021 +0200 wined3d: Set render targets and UAVs atomically in wined3d. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 42 ++++++++++++++++++++++++++++-------------- dlls/wined3d/device.c | 31 +++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 4 ++++ 4 files changed, 64 insertions(+), 14 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 68b0333604f..31c68f62e68 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1140,7 +1140,11 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMSetRenderTargetsAndUnordere ID3D11DepthStencilView *depth_stencil_view, UINT uav_start_idx, UINT uav_count, ID3D11UnorderedAccessView *const *uavs, const UINT *initial_counts) { + struct d3d_depthstencil_view *dsv = unsafe_impl_from_ID3D11DepthStencilView(depth_stencil_view); + struct wined3d_rendertarget_view *wined3d_rtvs[D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT] = {0}; + struct wined3d_unordered_access_view *wined3d_uavs[D3D11_PS_CS_UAV_REGISTER_COUNT] = {0}; struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); + unsigned int wined3d_initial_counts[D3D11_PS_CS_UAV_REGISTER_COUNT]; unsigned int i; TRACE("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p, " @@ -1148,18 +1152,29 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMSetRenderTargetsAndUnordere iface, render_target_view_count, render_target_views, depth_stencil_view, uav_start_idx, uav_count, uavs, initial_counts); - if (render_target_view_count != D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL) + if (render_target_view_count == D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL) + render_target_view_count = ~0u; + else { - d3d11_device_context_OMSetRenderTargets(iface, render_target_view_count, render_target_views, - depth_stencil_view); + if (render_target_view_count > ARRAY_SIZE(wined3d_rtvs)) + { + WARN("View count %u exceeds limit.\n", render_target_view_count); + render_target_view_count = ARRAY_SIZE(wined3d_rtvs); + } + + for (i = 0; i < render_target_view_count; ++i) + { + struct d3d_rendertarget_view *rtv = unsafe_impl_from_ID3D11RenderTargetView(render_target_views[i]); + + wined3d_rtvs[i] = rtv ? rtv->wined3d_view : NULL; + } } - if (uav_count != D3D11_KEEP_UNORDERED_ACCESS_VIEWS) + if (uav_count == D3D11_KEEP_UNORDERED_ACCESS_VIEWS) + uav_count = ~0u; + else { - struct wined3d_unordered_access_view *wined3d_views[D3D11_PS_CS_UAV_REGISTER_COUNT] = {0}; - unsigned int wined3d_initial_counts[D3D11_PS_CS_UAV_REGISTER_COUNT]; - - if (!wined3d_bound_range(uav_start_idx, uav_count, ARRAY_SIZE(wined3d_views))) + if (!wined3d_bound_range(uav_start_idx, uav_count, ARRAY_SIZE(wined3d_uavs))) { WARN("View count %u exceeds limit; ignoring call.\n", uav_count); return; @@ -1172,15 +1187,14 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMSetRenderTargetsAndUnordere struct d3d11_unordered_access_view *view = unsafe_impl_from_ID3D11UnorderedAccessView(uavs[i]); - wined3d_views[uav_start_idx + i] = view ? view->wined3d_view : NULL; + wined3d_uavs[uav_start_idx + i] = view ? view->wined3d_view : NULL; wined3d_initial_counts[uav_start_idx + i] = initial_counts ? initial_counts[i] : ~0u; } - - wined3d_mutex_lock(); - wined3d_device_context_set_unordered_access_views(context->wined3d_context, WINED3D_PIPELINE_GRAPHICS, - 0, ARRAY_SIZE(wined3d_views), wined3d_views, wined3d_initial_counts); - wined3d_mutex_unlock(); } + + wined3d_device_context_set_render_targets_and_unordered_access_views(context->wined3d_context, ARRAY_SIZE(wined3d_rtvs), + wined3d_rtvs, dsv ? dsv->wined3d_view : NULL, ARRAY_SIZE(wined3d_uavs), wined3d_uavs, + wined3d_initial_counts); } static void STDMETHODCALLTYPE d3d11_device_context_OMSetBlendState(ID3D11DeviceContext1 *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6b2f18c6996..86945485e20 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2110,6 +2110,37 @@ out: wined3d_mutex_unlock(); } +void CDECL wined3d_device_context_set_render_targets_and_unordered_access_views(struct wined3d_device_context *context, + unsigned int rtv_count, struct wined3d_rendertarget_view *const *render_target_views, + struct wined3d_rendertarget_view *depth_stencil_view, UINT uav_count, + struct wined3d_unordered_access_view *const *unordered_access_views, const unsigned int *initial_counts) +{ + wined3d_mutex_lock(); + if (rtv_count != ~0u) + { + if (depth_stencil_view && !(depth_stencil_view->resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL)) + { + WARN("View resource %p has incompatible %s bind flags.\n", + depth_stencil_view->resource, wined3d_debug_bind_flags(depth_stencil_view->resource->bind_flags)); + goto out; + } + + if (FAILED(wined3d_device_context_set_rendertarget_views(context, 0, rtv_count, + render_target_views, FALSE))) + goto out; + + wined3d_device_context_set_depth_stencil_view(context, depth_stencil_view); + } + + if (uav_count != ~0u) + { + wined3d_device_context_set_unordered_access_views(context, WINED3D_PIPELINE_GRAPHICS, 0, uav_count, + unordered_access_views, initial_counts); + } +out: + wined3d_mutex_unlock(); +} + static void wined3d_device_context_unbind_srv_for_rtv(struct wined3d_device_context *context, const struct wined3d_rendertarget_view *view, BOOL dsv) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1bce4def265..48bea5980ff 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -139,6 +139,7 @@ @ cdecl wined3d_device_context_set_stream_outputs(ptr ptr) @ cdecl wined3d_device_context_set_stream_sources(ptr long long ptr) @ cdecl wined3d_device_context_set_unordered_access_views(ptr long long long ptr ptr) +@ cdecl wined3d_device_context_set_render_targets_and_unordered_access_views(ptr long ptr ptr long ptr ptr) @ cdecl wined3d_device_context_set_vertex_declaration(ptr ptr) @ cdecl wined3d_device_context_set_viewports(ptr long ptr) @ cdecl wined3d_device_context_unmap(ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7be893b8f21..7a6588ea4f4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2544,6 +2544,10 @@ HRESULT __cdecl wined3d_device_context_set_stream_sources(struct wined3d_device_ void __cdecl wined3d_device_context_set_unordered_access_views(struct wined3d_device_context *context, enum wined3d_pipeline pipeline, unsigned int start_idx, unsigned int count, struct wined3d_unordered_access_view *const *uavs, const unsigned int *initial_counts); +void __cdecl wined3d_device_context_set_render_targets_and_unordered_access_views(struct wined3d_device_context *context, + unsigned int rtv_count, struct wined3d_rendertarget_view *const *render_target_views, + struct wined3d_rendertarget_view *depth_stencil_view, UINT uav_count, + struct wined3d_unordered_access_view *const *unordered_access_views, const unsigned int *initial_counts); void __cdecl wined3d_device_context_set_vertex_declaration(struct wined3d_device_context *context, struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_device_context_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count,

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for query issue functions.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: af43bbdccc7115a860a73a02ec5d720a1ebdc606 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af43bbdccc7115a860a73a02… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:04 2021 +0200 d3d11: Don't grab wined3d lock for query issue functions. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 4 ---- dlls/d3d11/device.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 74ba62b3d04..3054c0fca0a 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -289,10 +289,8 @@ static void STDMETHODCALLTYPE d3d10_query_Begin(ID3D10Query *iface) TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); if (FAILED(hr = wined3d_query_issue(query->wined3d_query, WINED3DISSUE_BEGIN))) ERR("Failed to issue query, hr %#x.\n", hr); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_query_End(ID3D10Query *iface) @@ -302,10 +300,8 @@ static void STDMETHODCALLTYPE d3d10_query_End(ID3D10Query *iface) TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); if (FAILED(hr = wined3d_query_issue(query->wined3d_query, WINED3DISSUE_END))) ERR("Failed to issue query, hr %#x.\n", hr); - wined3d_mutex_unlock(); } static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *data, UINT data_size, UINT flags) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f306f9ebc7a..53afb383bc1 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1015,9 +1015,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_Begin(ID3D11DeviceContext1 *i TRACE("iface %p, asynchronous %p.\n", iface, asynchronous); - wined3d_mutex_lock(); wined3d_device_context_issue_query(context->wined3d_context, query->wined3d_query, WINED3DISSUE_BEGIN); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_End(ID3D11DeviceContext1 *iface, @@ -1028,9 +1026,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_End(ID3D11DeviceContext1 *ifa TRACE("iface %p, asynchronous %p.\n", iface, asynchronous); - wined3d_mutex_lock(); wined3d_device_context_issue_query(context->wined3d_context, query->wined3d_query, WINED3DISSUE_END); - wined3d_mutex_unlock(); } static HRESULT STDMETHODCALLTYPE d3d11_device_context_GetData(ID3D11DeviceContext1 *iface,

1 0

Alexandre Julliard : msvcrt: Move _fdclass/_dclass to avoid forward references.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: da8176df6178e1dbf076fc2a88979e481cba13a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da8176df6178e1dbf076fc2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 15 11:05:13 2021 +0200 msvcrt: Move _fdclass/_dclass to avoid forward references. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 7f59a4d20d4..3af44f83a08 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -703,6 +703,36 @@ static const UINT64 exp2f_T[] = { }; #endif +/********************************************************************* + * _fdclass (MSVCR120.@) + * + * Copied from musl: src/math/__fpclassifyf.c + */ +short CDECL _fdclass(float x) +{ + union { float f; UINT32 i; } u = { x }; + int e = u.i >> 23 & 0xff; + + if (!e) return u.i << 1 ? FP_SUBNORMAL : FP_ZERO; + if (e == 0xff) return u.i << 9 ? FP_NAN : FP_INFINITE; + return FP_NORMAL; +} + +/********************************************************************* + * _dclass (MSVCR120.@) + * + * Copied from musl: src/math/__fpclassify.c + */ +short CDECL _dclass(double x) +{ + union { double f; UINT64 i; } u = { x }; + int e = u.i >> 52 & 0x7ff; + + if (!e) return u.i << 1 ? FP_SUBNORMAL : FP_ZERO; + if (e == 0x7ff) return (u.i << 12) ? FP_NAN : FP_INFINITE; + return FP_NORMAL; +} + #ifndef __i386__ /********************************************************************* @@ -7827,36 +7857,6 @@ void __cdecl __libm_sse2_sqrt_precise(void) } #endif /* __i386__ */ -/********************************************************************* - * _fdclass (MSVCR120.@) - * - * Copied from musl: src/math/__fpclassifyf.c - */ -short CDECL _fdclass(float x) -{ - union { float f; UINT32 i; } u = { x }; - int e = u.i >> 23 & 0xff; - - if (!e) return u.i << 1 ? FP_SUBNORMAL : FP_ZERO; - if (e == 0xff) return u.i << 9 ? FP_NAN : FP_INFINITE; - return FP_NORMAL; -} - -/********************************************************************* - * _dclass (MSVCR120.@) - * - * Copied from musl: src/math/__fpclassify.c - */ -short CDECL _dclass(double x) -{ - union { double f; UINT64 i; } u = { x }; - int e = u.i >> 52 & 0x7ff; - - if (!e) return u.i << 1 ? FP_SUBNORMAL : FP_ZERO; - if (e == 0x7ff) return (u.i << 12) ? FP_NAN : FP_INFINITE; - return FP_NORMAL; -} - #if _MSVCR_VER>=120 /*********************************************************************

1 0

Zebediah Figura : wined3d: Move the "coherent" field from struct wined3d_bo_gl to struct wined3d_bo.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 2d05178b28a74064f1600caf9642d6f8dda16fbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d05178b28a74064f1600caf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 14 23:44:17 2021 -0500 wined3d: Move the "coherent" field from struct wined3d_bo_gl to struct wined3d_bo. 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/adapter_vk.c | 4 ++-- dlls/wined3d/context_gl.c | 6 +++--- dlls/wined3d/context_vk.c | 1 + dlls/wined3d/resource.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 8c3e63aac49..ffeffb4d145 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -983,7 +983,7 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, wined3d_context_vk_reference_bo(context_vk, bo); } - if (!(bo->memory_type & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) + if (!bo->b.coherent) { range.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; range.pNext = NULL; @@ -1024,7 +1024,7 @@ static void adapter_vk_unmap_bo_address(struct wined3d_context *context, vk_info = context_vk->vk_info; device_vk = wined3d_device_vk(context->device); - if (!(bo->memory_type & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) + if (!bo->b.coherent) { range.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; range.pNext = NULL; diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 4510fe5b155..2bc63464f7b 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2684,7 +2684,7 @@ static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, if ((flags & WINED3D_MAP_DISCARD) && bo->command_fence_id > device_gl->completed_fence_id) { if (wined3d_context_gl_create_bo(context_gl, bo->size, - bo->binding, bo->usage, bo->coherent, bo->flags, &tmp)) + bo->binding, bo->usage, bo->b.coherent, bo->flags, &tmp)) { list_move_head(&tmp.b.users, &bo->b.users); wined3d_context_gl_destroy_bo(context_gl, bo); @@ -2754,7 +2754,7 @@ void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); - if (!bo->coherent) + if (!bo->b.coherent) { if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { @@ -2889,7 +2889,7 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei bo->binding = binding; bo->usage = usage; bo->flags = flags; - bo->coherent = coherent; + bo->b.coherent = coherent; list_init(&bo->b.users); bo->command_fence_id = 0; bo->b.memory_offset = 0; diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index ad2f7adfe0b..8e055202ec2 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -492,6 +492,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic bo->size = size; bo->usage = usage; bo->memory_type = adapter_vk->memory_properties.memoryTypes[memory_type_idx].propertyFlags; + bo->b.coherent = !!(bo->memory_type & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT); list_init(&bo->b.users); bo->command_buffer_id = 0; bo->slab = NULL; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index abf07682c76..c8fb4cf2e29 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -395,7 +395,7 @@ GLbitfield wined3d_resource_gl_map_flags(const struct wined3d_bo_gl *bo, DWORD d if (d3d_flags & WINED3D_MAP_WRITE) { ret |= GL_MAP_WRITE_BIT; - if (!bo->coherent) + if (!bo->b.coherent) ret |= GL_MAP_FLUSH_EXPLICIT_BIT; } if (d3d_flags & WINED3D_MAP_READ) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 41956f1f061..993d0b3c4e4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1592,6 +1592,7 @@ struct wined3d_bo { struct list users; size_t memory_offset; + bool coherent; }; struct wined3d_bo_gl @@ -1604,7 +1605,6 @@ struct wined3d_bo_gl GLenum usage; GLbitfield flags; - bool coherent; uint64_t command_fence_id; };

1 0

Zebediah Figura : wined3d: Move the "map_ptr" field from struct wined3d_bo_vk to struct wined3d_bo.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 6e7779ace9aa3ca709e01d94339b2e4bc12fd10b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e7779ace9aa3ca709e01d94… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 14 23:44:18 2021 -0500 wined3d: Move the "map_ptr" field from struct wined3d_bo_vk to struct wined3d_bo. 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/adapter_vk.c | 14 +++++++------- dlls/wined3d/context_gl.c | 1 + dlls/wined3d/context_vk.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index ffeffb4d145..c7005835d16 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -775,15 +775,15 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ struct wined3d_bo_slab_vk *slab; VkResult vr; - if (bo->map_ptr) - return bo->map_ptr; + if (bo->b.map_ptr) + return bo->b.map_ptr; vk_info = context_vk->vk_info; device_vk = wined3d_device_vk(context_vk->c.device); if ((slab = bo->slab)) { - if (!(bo->map_ptr = wined3d_bo_slab_vk_map(slab, context_vk))) + if (!(bo->b.map_ptr = wined3d_bo_slab_vk_map(slab, context_vk))) { ERR("Failed to map slab.\n"); return NULL; @@ -793,19 +793,19 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ { struct wined3d_allocator_chunk_vk *chunk_vk = wined3d_allocator_chunk_vk(bo->memory->chunk); - if (!(bo->map_ptr = wined3d_allocator_chunk_vk_map(chunk_vk, context_vk))) + if (!(bo->b.map_ptr = wined3d_allocator_chunk_vk_map(chunk_vk, context_vk))) { ERR("Failed to map chunk.\n"); return NULL; } } - else if ((vr = VK_CALL(vkMapMemory(device_vk->vk_device, bo->vk_memory, 0, VK_WHOLE_SIZE, 0, &bo->map_ptr))) < 0) + else if ((vr = VK_CALL(vkMapMemory(device_vk->vk_device, bo->vk_memory, 0, VK_WHOLE_SIZE, 0, &bo->b.map_ptr))) < 0) { ERR("Failed to map memory, vr %s.\n", wined3d_debug_vkresult(vr)); return NULL; } - return bo->map_ptr; + return bo->b.map_ptr; } static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context_vk *context_vk) @@ -817,7 +817,7 @@ static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context if (wined3d_map_persistent()) return; - bo->map_ptr = NULL; + bo->b.map_ptr = NULL; if ((slab = bo->slab)) { diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 2bc63464f7b..5cde971cd43 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2893,6 +2893,7 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei list_init(&bo->b.users); bo->command_fence_id = 0; bo->b.memory_offset = 0; + bo->b.map_ptr = NULL; return true; } diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 8e055202ec2..8bcd6d61eb3 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -487,7 +487,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic return FALSE; } - bo->map_ptr = NULL; + bo->b.map_ptr = NULL; bo->buffer_offset = 0; bo->size = size; bo->usage = usage; @@ -907,7 +907,7 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const if ((slab_vk = bo->slab)) { - if (bo->map_ptr) + if (bo->b.map_ptr) wined3d_bo_slab_vk_unmap(slab_vk, context_vk); object_size = slab_vk->bo.size / 32; idx = bo->buffer_offset / object_size; @@ -918,13 +918,13 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const wined3d_context_vk_destroy_vk_buffer(context_vk, bo->vk_buffer, bo->command_buffer_id); if (bo->memory) { - if (bo->map_ptr) + if (bo->b.map_ptr) wined3d_allocator_chunk_vk_unmap(wined3d_allocator_chunk_vk(bo->memory->chunk), context_vk); wined3d_context_vk_destroy_allocator_block(context_vk, bo->memory, bo->command_buffer_id); return; } - if (bo->map_ptr) + if (bo->b.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); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 993d0b3c4e4..1f167c9e7dd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1591,6 +1591,7 @@ do { \ struct wined3d_bo { struct list users; + void *map_ptr; size_t memory_offset; bool coherent; }; @@ -1628,7 +1629,6 @@ struct wined3d_bo_vk struct wined3d_bo_slab_vk *slab; VkDeviceMemory vk_memory; - void *map_ptr; VkDeviceSize buffer_offset; VkDeviceSize size;

1 0

Alexandre Julliard : include: Use the standard va_list instead of __ms_va_list when building with msvcrt.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 2a92c58e1152e1d80395cf31d7cd3f282d094540 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a92c58e1152e1d80395cf31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 15 18:07:41 2021 +0200 include: Use the standard va_list instead of __ms_va_list when building with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 2 +- dlls/msi/msipriv.h | 2 +- dlls/msvcrt/undname.c | 2 +- dlls/rsaenh/mpi.c | 4 +- dlls/rsaenh/tomcrypt.h | 4 +- dlls/ucrtbase/printf.c | 4 +- include/msvcrt/corecrt.h | 26 +++--- include/msvcrt/corecrt_wstdio.h | 174 ++++++++++++++++++++-------------------- include/msvcrt/stdio.h | 162 ++++++++++++++++++------------------- programs/winedbg/dbg.y | 2 +- programs/winedbg/debugger.h | 4 +- programs/winedbg/expr.c | 2 +- 12 files changed, 191 insertions(+), 197 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2a92c58e1152e1d80395…

1 0

Zebediah Figura : wined3d: Handle NOOVERWRITE maps on persistently mapped Vulkan buffers from the client thread.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 9acf66b795fc2007cf479668e0efae6a951c61df URL: https://source.winehq.org/git/wine.git/?a=commit;h=9acf66b795fc2007cf479668… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 14 23:44:19 2021 -0500 wined3d: Handle NOOVERWRITE maps on persistently mapped Vulkan buffers from the client thread. 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/adapter_gl.c | 7 ++++ dlls/wined3d/adapter_vk.c | 44 +++++++++++++-------- dlls/wined3d/buffer.c | 5 +++ dlls/wined3d/context_gl.c | 61 +++++++++++++++++++++--------- dlls/wined3d/cs.c | 86 ++++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/directx.c | 6 +++ dlls/wined3d/wined3d_private.h | 25 +++++++++++- 7 files changed, 198 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9acf66b795fc2007cf47…

1 0

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem.Status.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 4ae00bcc38bebdf95ca06f3169dfeff4b973c80d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ae00bcc38bebdf95ca06f31… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 15 10:41:28 2021 +0200 wbemprox: Implement Win32_OperatingSystem.Status. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d76602f4930..58b5ed76dfa 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -251,6 +251,7 @@ static const struct column col_operatingsystem[] = { L"SerialNumber", CIM_STRING|COL_FLAG_DYNAMIC }, { L"ServicePackMajorVersion", CIM_UINT16 }, { L"ServicePackMinorVersion", CIM_UINT16 }, + { L"Status", CIM_STRING }, { L"SuiteMask", CIM_UINT32 }, { L"SystemDirectory", CIM_STRING|COL_FLAG_DYNAMIC }, { L"SystemDrive", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -667,6 +668,7 @@ struct record_operatingsystem const WCHAR *serialnumber; UINT16 servicepackmajor; UINT16 servicepackminor; + const WCHAR *status; UINT32 suitemask; const WCHAR *systemdirectory; const WCHAR *systemdrive; @@ -3598,6 +3600,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->serialnumber = get_osserialnumber(); rec->servicepackmajor = ver.wServicePackMajor; rec->servicepackminor = ver.wServicePackMinor; + rec->status = L"OK"; rec->suitemask = 272; /* Single User + Terminal */ rec->systemdirectory = get_systemdirectory(); rec->systemdrive = get_systemdrive(); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 5ca61cff825..b3a0e3c4534 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1424,6 +1424,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) check_property( obj, L"Version", VT_BSTR, CIM_STRING ); check_property( obj, L"TotalVisibleMemorySize", VT_BSTR, CIM_UINT64 ); check_property( obj, L"TotalVirtualMemorySize", VT_BSTR, CIM_UINT64 ); + check_property( obj, L"Status", VT_BSTR, CIM_STRING ); check_property( obj, L"SystemDrive", VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj );

1 0