April 2021 - Wine-commits - list.winehq.org

Zebediah Figura : wined3d: Introduce wined3d_device_context_get_sampler().
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 0a2ea1cadc720452d0717ba9cc9249ef769c0442 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a2ea1cadc720452d0717ba9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 17 18:39:34 2021 -0500 wined3d: Introduce wined3d_device_context_get_sampler(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 14 ++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 17 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 11b99353059..d239d59a8f2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2514,6 +2514,20 @@ void CDECL wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx wined3d_device_context_set_sampler(&device->cs->c, WINED3D_SHADER_TYPE_VERTEX, idx, sampler); } +struct wined3d_sampler * CDECL wined3d_device_context_get_sampler(const struct wined3d_device_context *context, + enum wined3d_shader_type shader_type, unsigned int idx) +{ + TRACE("context %p, shader_type %#x, idx %u.\n", context, shader_type, idx); + + if (idx >= MAX_SAMPLER_OBJECTS) + { + WARN("Invalid sampler index %u.\n", idx); + return NULL; + } + + return context->state->sampler[shader_type][idx]; +} + static struct wined3d_sampler *wined3d_device_get_sampler(const struct wined3d_device *device, enum wined3d_shader_type shader_type, unsigned int idx) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index f820ebd76d8..6a7a8811051 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -169,6 +169,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_sampler(ptr long long) @ cdecl wined3d_device_context_get_scissor_rects(ptr ptr ptr) @ cdecl wined3d_device_context_get_shader(ptr long) @ cdecl wined3d_device_context_get_shader_resource_view(ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9729d2c1eac..26dc7844090 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2564,6 +2564,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_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, unsigned int *rect_count, RECT *rects); struct wined3d_shader * __cdecl wined3d_device_context_get_shader(const struct wined3d_device_context *context,

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_get_sampler().
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 4f61f6eed91939e554e3f97a1e088533f074b1d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f61f6eed91939e554e3f97a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 17 18:39:35 2021 -0500 d3d11: Use wined3d_device_context_get_sampler(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 469ca0d6c49..7e4212a4bc6 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1708,7 +1708,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetSamplers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState **samplers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", @@ -1720,7 +1720,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetSamplers(ID3D11Device struct wined3d_sampler *wined3d_sampler; struct d3d_sampler_state *sampler_impl; - if (!(wined3d_sampler = wined3d_device_get_ps_sampler(device->wined3d_device, start_slot + i))) + if (!(wined3d_sampler = wined3d_device_context_get_sampler( + context->wined3d_context, WINED3D_SHADER_TYPE_PIXEL, start_slot + i))) { samplers[i] = NULL; continue; @@ -1943,7 +1944,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetSamplers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState **samplers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", @@ -1955,7 +1956,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetSamplers(ID3D11Device struct wined3d_sampler *wined3d_sampler; struct d3d_sampler_state *sampler_impl; - if (!(wined3d_sampler = wined3d_device_get_vs_sampler(device->wined3d_device, start_slot + i))) + if (!(wined3d_sampler = wined3d_device_context_get_sampler( + context->wined3d_context, WINED3D_SHADER_TYPE_VERTEX, start_slot + i))) { samplers[i] = NULL; continue; @@ -2022,7 +2024,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetSamplers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState **samplers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", @@ -2034,7 +2036,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetSamplers(ID3D11Device struct d3d_sampler_state *sampler_impl; struct wined3d_sampler *wined3d_sampler; - if (!(wined3d_sampler = wined3d_device_get_gs_sampler(device->wined3d_device, start_slot + i))) + if (!(wined3d_sampler = wined3d_device_context_get_sampler( + context->wined3d_context, WINED3D_SHADER_TYPE_GEOMETRY, start_slot + i))) { samplers[i] = NULL; continue; @@ -2350,7 +2353,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetSamplers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState **samplers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", @@ -2362,7 +2365,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetSamplers(ID3D11Device struct wined3d_sampler *wined3d_sampler; struct d3d_sampler_state *sampler_impl; - if (!(wined3d_sampler = wined3d_device_get_hs_sampler(device->wined3d_device, start_slot + i))) + if (!(wined3d_sampler = wined3d_device_context_get_sampler( + context->wined3d_context, WINED3D_SHADER_TYPE_HULL, start_slot + i))) { samplers[i] = NULL; continue; @@ -2443,7 +2447,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetSamplers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState **samplers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", @@ -2455,7 +2459,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetSamplers(ID3D11Device struct wined3d_sampler *wined3d_sampler; struct d3d_sampler_state *sampler_impl; - if (!(wined3d_sampler = wined3d_device_get_ds_sampler(device->wined3d_device, start_slot + i))) + if (!(wined3d_sampler = wined3d_device_context_get_sampler( + context->wined3d_context, WINED3D_SHADER_TYPE_DOMAIN, start_slot + i))) { samplers[i] = NULL; continue; @@ -2561,7 +2566,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetSamplers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState **samplers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", @@ -2573,7 +2578,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetSamplers(ID3D11Device struct wined3d_sampler *wined3d_sampler; struct d3d_sampler_state *sampler_impl; - if (!(wined3d_sampler = wined3d_device_get_cs_sampler(device->wined3d_device, start_slot + i))) + if (!(wined3d_sampler = wined3d_device_context_get_sampler( + context->wined3d_context, WINED3D_SHADER_TYPE_COMPUTE, start_slot + i))) { samplers[i] = NULL; continue; @@ -5082,7 +5088,8 @@ static void STDMETHODCALLTYPE d3d10_device_PSGetSamplers(ID3D10Device1 *iface, struct d3d_sampler_state *sampler_impl; struct wined3d_sampler *wined3d_sampler; - if (!(wined3d_sampler = wined3d_device_get_ps_sampler(device->wined3d_device, start_slot + i))) + if (!(wined3d_sampler = wined3d_device_context_get_sampler( + device->immediate_context.wined3d_context, WINED3D_SHADER_TYPE_PIXEL, start_slot + i))) { samplers[i] = NULL; continue; @@ -5297,7 +5304,8 @@ static void STDMETHODCALLTYPE d3d10_device_VSGetSamplers(ID3D10Device1 *iface, struct d3d_sampler_state *sampler_impl; struct wined3d_sampler *wined3d_sampler; - if (!(wined3d_sampler = wined3d_device_get_vs_sampler(device->wined3d_device, start_slot + i))) + if (!(wined3d_sampler = wined3d_device_context_get_sampler( + device->immediate_context.wined3d_context, WINED3D_SHADER_TYPE_VERTEX, start_slot + i))) { samplers[i] = NULL; continue; @@ -5377,7 +5385,8 @@ static void STDMETHODCALLTYPE d3d10_device_GSGetSamplers(ID3D10Device1 *iface, struct d3d_sampler_state *sampler_impl; struct wined3d_sampler *wined3d_sampler; - if (!(wined3d_sampler = wined3d_device_get_gs_sampler(device->wined3d_device, start_slot + i))) + if (!(wined3d_sampler = wined3d_device_context_get_sampler( + device->immediate_context.wined3d_context, WINED3D_SHADER_TYPE_GEOMETRY, start_slot + i))) { samplers[i] = NULL; continue;

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_get_unordered_access_view().
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 099e2f7e81d3fbcf93f8c07042178a0899c69aba URL: https://source.winehq.org/git/wine.git/?a=commit;h=099e2f7e81d3fbcf93f8c070… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 17 18:39:36 2021 -0500 wined3d: Introduce wined3d_device_context_get_unordered_access_view(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 14 ++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 17 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d239d59a8f2..33b06b44c29 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2878,6 +2878,20 @@ struct wined3d_sampler * CDECL wined3d_device_get_cs_sampler(const struct wined3 return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_COMPUTE, idx); } +struct wined3d_unordered_access_view * CDECL wined3d_device_context_get_unordered_access_view( + const struct wined3d_device_context *context, enum wined3d_pipeline pipeline, unsigned int idx) +{ + TRACE("context %p, pipeline %#x, idx %u.\n", context, pipeline, idx); + + if (idx >= MAX_UNORDERED_ACCESS_VIEWS) + { + WARN("Invalid UAV index %u.\n", idx); + return NULL; + } + + return context->state->unordered_access_view[pipeline][idx]; +} + static struct wined3d_unordered_access_view *wined3d_device_get_pipeline_unordered_access_view( const struct wined3d_device *device, enum wined3d_pipeline pipeline, unsigned int idx) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 6a7a8811051..442b06ed4ea 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -173,6 +173,7 @@ @ cdecl wined3d_device_context_get_scissor_rects(ptr ptr ptr) @ cdecl wined3d_device_context_get_shader(ptr long) @ cdecl wined3d_device_context_get_shader_resource_view(ptr long long) +@ cdecl wined3d_device_context_get_unordered_access_view(ptr long long) @ cdecl wined3d_device_context_get_viewports(ptr ptr ptr) @ cdecl wined3d_device_context_issue_query(ptr ptr long) @ cdecl wined3d_device_context_map(ptr ptr long ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 26dc7844090..e5e522e9fb2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2572,6 +2572,8 @@ struct wined3d_shader * __cdecl wined3d_device_context_get_shader(const struct w enum wined3d_shader_type type); struct wined3d_shader_resource_view * __cdecl wined3d_device_context_get_shader_resource_view( const struct wined3d_device_context *context, enum wined3d_shader_type shader_type, unsigned int idx); +struct wined3d_unordered_access_view * __cdecl wined3d_device_context_get_unordered_access_view( + const struct wined3d_device_context *context, enum wined3d_pipeline pipeline, unsigned int idx); void __cdecl wined3d_device_context_get_viewports(const struct wined3d_device_context *context, unsigned int *viewport_count, struct wined3d_viewport *viewports); void __cdecl wined3d_device_context_issue_query(struct wined3d_device_context *context,

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_get_unordered_access_view().
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 9e04985a60411bbe13f44fd7c3b8b86bf91b090d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e04985a60411bbe13f44fd7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 17 18:39:37 2021 -0500 d3d11: Use wined3d_device_context_get_unordered_access_view(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7e4212a4bc6..460e9c2bf4a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2105,7 +2105,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargetsAndUnord UINT unordered_access_view_start_slot, UINT unordered_access_view_count, ID3D11UnorderedAccessView **unordered_access_views) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_unordered_access_view *wined3d_view; struct d3d11_unordered_access_view *view_impl; unsigned int i; @@ -2125,8 +2125,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargetsAndUnord wined3d_mutex_lock(); for (i = 0; i < unordered_access_view_count; ++i) { - if (!(wined3d_view = wined3d_device_get_unordered_access_view(device->wined3d_device, - unordered_access_view_start_slot + i))) + if (!(wined3d_view = wined3d_device_context_get_unordered_access_view(context->wined3d_context, + WINED3D_PIPELINE_GRAPHICS, unordered_access_view_start_slot + i))) { unordered_access_views[i] = NULL; continue; @@ -2512,7 +2512,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetUnorderedAccessViews(ID3D11DeviceContext1 *iface, UINT start_slot, UINT view_count, ID3D11UnorderedAccessView **views) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); @@ -2523,7 +2523,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetUnorderedAccessViews( struct wined3d_unordered_access_view *wined3d_view; struct d3d11_unordered_access_view *view_impl; - if (!(wined3d_view = wined3d_device_get_cs_uav(device->wined3d_device, start_slot + i))) + if (!(wined3d_view = wined3d_device_context_get_unordered_access_view( + context->wined3d_context, WINED3D_PIPELINE_COMPUTE, start_slot + i))) { views[i] = NULL; continue;

1 0

Jan Sikorski : wined3d: Handle typeless resolve in the Vulkan blitter.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 73c2466179c1a205c9a3966376c2ed31def0d4a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73c2466179c1a205c9a39663… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Apr 19 11:16:58 2021 +0200 wined3d: Handle typeless resolve in the Vulkan blitter. 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/wined3d/texture.c | 235 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 211 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=73c2466179c1a205c9a3…

1 0

Jan Sikorski : wined3d: Handle typeless resolve in the FBO blitter.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: d27c614cfcbc6fd7f5384f051dd3eb9cb7ccfb7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d27c614cfcbc6fd7f5384f05… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Apr 19 11:16:59 2021 +0200 wined3d: Handle typeless resolve in the FBO blitter. Avoid resolving source texture before the blit due to format conversion in that case. 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/d3d10core/tests/d3d10core.c | 12 ++-- dlls/d3d11/tests/d3d11.c | 12 ++-- dlls/wined3d/surface.c | 12 +++- dlls/wined3d/texture.c | 131 +++++++++++++++++++++++++++++++++++++-- 4 files changed, 148 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d27c614cfcbc6fd7f538…

1 0

Zebediah Figura : hidclass.sys: Pass a KEVENT to IoBuildSynchronousFsdRequest() in get_device_id().
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: aff72f225305b24b83c779271e8081632fd565d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aff72f225305b24b83c77927… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 17 19:43:25 2021 -0500 hidclass.sys: Pass a KEVENT to IoBuildSynchronousFsdRequest() in get_device_id(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 6e13596a32c..5134cb3569a 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -62,43 +62,28 @@ static minidriver *find_minidriver(DRIVER_OBJECT *driver) return NULL; } -static NTSTATUS WINAPI internalComplete(DEVICE_OBJECT *deviceObject, IRP *irp, - void *context) -{ - HANDLE event = context; - SetEvent(event); - return STATUS_MORE_PROCESSING_REQUIRED; -} - static NTSTATUS get_device_id(DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCHAR *id) { - NTSTATUS status; IO_STACK_LOCATION *irpsp; IO_STATUS_BLOCK irp_status; - HANDLE event; + KEVENT event; IRP *irp; - irp = IoBuildSynchronousFsdRequest(IRP_MJ_PNP, device, NULL, 0, NULL, NULL, &irp_status); + KeInitializeEvent(&event, NotificationEvent, FALSE); + irp = IoBuildSynchronousFsdRequest(IRP_MJ_PNP, device, NULL, 0, NULL, &event, &irp_status); if (irp == NULL) return STATUS_NO_MEMORY; - event = CreateEventA(NULL, FALSE, FALSE, NULL); irpsp = IoGetNextIrpStackLocation(irp); irpsp->MinorFunction = IRP_MN_QUERY_ID; irpsp->Parameters.QueryId.IdType = type; - IoSetCompletionRoutine(irp, internalComplete, event, TRUE, TRUE, TRUE); - status = IoCallDriver(device, irp); - if (status == STATUS_PENDING) - WaitForSingleObject(event, INFINITE); - - lstrcpyW(id, (WCHAR *)irp->IoStatus.Information); - ExFreePool( (WCHAR *)irp->IoStatus.Information ); - status = irp->IoStatus.u.Status; - IoCompleteRequest(irp, IO_NO_INCREMENT ); - CloseHandle(event); + if (IoCallDriver(device, irp) == STATUS_PENDING) + KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); - return status; + wcscpy(id, (WCHAR *)irp_status.Information); + ExFreePool((WCHAR *)irp_status.Information); + return irp_status.u.Status; } static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *bus_pdo)

1 0

Zebediah Figura : hidclass.sys: Stop creating a setupapi device.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: a17367291104e46c573b7213ee94a0f537563ace URL: https://source.winehq.org/git/wine.git/?a=commit;h=a17367291104e46c573b7213… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 17 19:43:26 2021 -0500 hidclass.sys: Stop creating a setupapi device. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/Makefile.in | 1 - dlls/hidclass.sys/device.c | 64 ------------------------------------------- dlls/hidclass.sys/hid.h | 1 - dlls/hidclass.sys/pnp.c | 21 +++++++++++++- 4 files changed, 20 insertions(+), 67 deletions(-) diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in index 58bb2b5088f..4b1e9338eb4 100644 --- a/dlls/hidclass.sys/Makefile.in +++ b/dlls/hidclass.sys/Makefile.in @@ -1,7 +1,6 @@ MODULE = hidclass.sys IMPORTLIB = hidclass IMPORTS = hal ntoskrnl -DELAYIMPORTS = setupapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index ec34b6b8068..35cc40c01ea 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -25,7 +25,6 @@ #include "hid.h" #include "winreg.h" #include "winuser.h" -#include "setupapi.h" #include "wine/debug.h" #include "ddk/hidsdi.h" @@ -37,69 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); WINE_DECLARE_DEBUG_CHANNEL(hid_report); -/* user32 reserves 1 & 2 for winemouse and winekeyboard, - * keep this in sync with user_private.h */ -#define WINE_MOUSE_HANDLE 1 -#define WINE_KEYBOARD_HANDLE 2 - -static UINT32 alloc_rawinput_handle(void) -{ - static LONG counter = WINE_KEYBOARD_HANDLE + 1; - return InterlockedIncrement(&counter); -} - -NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) -{ - WCHAR device_instance_id[MAX_DEVICE_ID_LEN]; - SP_DEVINFO_DATA Data; - HDEVINFO devinfo; - BASE_DEVICE_EXTENSION *ext; - USAGE usage, page; - - ext = device->DeviceExtension; - page = ext->u.pdo.preparsed_data->caps.UsagePage; - usage = ext->u.pdo.preparsed_data->caps.Usage; - - lstrcpyW(device_instance_id, ext->device_id); - lstrcatW(device_instance_id, L"\\"); - lstrcatW(device_instance_id, ext->instance_id); - - devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_HIDCLASS, NULL); - if (devinfo == INVALID_HANDLE_VALUE) - { - FIXME( "failed to get ClassDevs %x\n", GetLastError()); - return STATUS_UNSUCCESSFUL; - } - Data.cbSize = sizeof(Data); - if (SetupDiCreateDeviceInfoW(devinfo, device_instance_id, &GUID_DEVCLASS_HIDCLASS, NULL, NULL, DICD_INHERIT_CLASSDRVS, &Data)) - { - if (!SetupDiRegisterDeviceInfo(devinfo, &Data, 0, NULL, NULL, NULL)) - { - FIXME( "failed to register device info %x\n", GetLastError()); - goto error; - } - } - else if (GetLastError() != ERROR_DEVINST_ALREADY_EXISTS) - { - FIXME( "failed to create device info %x\n", GetLastError()); - goto error; - } - SetupDiDestroyDeviceInfoList(devinfo); - - if (page == HID_USAGE_PAGE_GENERIC && usage == HID_USAGE_GENERIC_MOUSE) - ext->u.pdo.rawinput_handle = WINE_MOUSE_HANDLE; - else if (page == HID_USAGE_PAGE_GENERIC && usage == HID_USAGE_GENERIC_KEYBOARD) - ext->u.pdo.rawinput_handle = WINE_KEYBOARD_HANDLE; - else - ext->u.pdo.rawinput_handle = alloc_rawinput_handle(); - - return STATUS_SUCCESS; - -error: - SetupDiDestroyDeviceInfoList(devinfo); - return STATUS_UNSUCCESSFUL; -} - IRP *pop_irp_from_queue(BASE_DEVICE_EXTENSION *ext) { LIST_ENTRY *entry; diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 2a5636121be..9e829332bdc 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -106,7 +106,6 @@ typedef struct _minidriver NTSTATUS call_minidriver(ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG in_size, void *out_buff, ULONG out_size) DECLSPEC_HIDDEN; /* Internal device functions */ -NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; void HID_StartDeviceThread(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; IRP *pop_irp_from_queue(BASE_DEVICE_EXTENSION *ext) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 5134cb3569a..b9208d146e6 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -86,6 +86,17 @@ static NTSTATUS get_device_id(DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCH return irp_status.u.Status; } +/* user32 reserves 1 & 2 for winemouse and winekeyboard, + * keep this in sync with user_private.h */ +#define WINE_MOUSE_HANDLE 1 +#define WINE_KEYBOARD_HANDLE 2 + +static UINT32 alloc_rawinput_handle(void) +{ + static LONG counter = WINE_KEYBOARD_HANDLE + 1; + return InterlockedIncrement(&counter); +} + static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *bus_pdo) { WCHAR device_id[MAX_DEVICE_ID_LEN], instance_id[MAX_DEVICE_ID_LEN], pdo_name[255]; @@ -93,6 +104,7 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b HID_DEVICE_ATTRIBUTES attr = {0}; DEVICE_OBJECT *fdo, *child_pdo; UNICODE_STRING string; + USAGE page, usage; NTSTATUS status; minidriver *minidriver; HID_DESCRIPTOR descriptor; @@ -214,7 +226,14 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b IoInvalidateDeviceRelations(bus_pdo, BusRelations); - HID_LinkDevice(child_pdo); + page = pdo_ext->u.pdo.preparsed_data->caps.UsagePage; + usage = pdo_ext->u.pdo.preparsed_data->caps.Usage; + if (page == HID_USAGE_PAGE_GENERIC && usage == HID_USAGE_GENERIC_MOUSE) + pdo_ext->u.pdo.rawinput_handle = WINE_MOUSE_HANDLE; + else if (page == HID_USAGE_PAGE_GENERIC && usage == HID_USAGE_GENERIC_KEYBOARD) + pdo_ext->u.pdo.rawinput_handle = WINE_KEYBOARD_HANDLE; + else + pdo_ext->u.pdo.rawinput_handle = alloc_rawinput_handle(); pdo_ext->u.pdo.poll_interval = DEFAULT_POLL_INTERVAL;

1 0

Zebediah Figura : hidclass.sys: Set PhysicalDeviceObject to the bus PDO.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 06ab0677587fbbb83ef73efa7ed22bf85dcb6836 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06ab0677587fbbb83ef73efa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 17 19:43:27 2021 -0500 hidclass.sys: Set PhysicalDeviceObject to the bus PDO. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 2 +- dlls/ntoskrnl.exe/tests/driver_hid.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index b9208d146e6..7b365d267ed 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -135,7 +135,7 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b ext = fdo->DeviceExtension; ext->is_fdo = TRUE; ext->u.fdo.hid_ext.MiniDeviceExtension = ext + 1; - ext->u.fdo.hid_ext.PhysicalDeviceObject = fdo; + ext->u.fdo.hid_ext.PhysicalDeviceObject = bus_pdo; ext->u.fdo.hid_ext.NextDeviceObject = bus_pdo; swprintf(ext->device_id, ARRAY_SIZE(ext->device_id), L"HID\\%s", wcsrchr(device_id, '\\') + 1); wcscpy(ext->instance_id, instance_id); diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 7ddf49f4dcc..92637f9d0bc 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -215,7 +215,7 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *f /* We should be given the FDO, not the PDO. */ ok(!!ext->PhysicalDeviceObject, "expected non-NULL pdo\n"); - todo_wine ok(ext->NextDeviceObject == ext->PhysicalDeviceObject, "got pdo %p, next %p\n", + ok(ext->NextDeviceObject == ext->PhysicalDeviceObject, "got pdo %p, next %p\n", ext->PhysicalDeviceObject, ext->NextDeviceObject); todo_wine ok(ext->NextDeviceObject->AttachedDevice == fdo, "wrong attached device\n");

1 0

Hans Leidekker : wldap32: Build with msvcrt.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: e5f1c0f7fc0fb5fa550756fc71398c9a71906d62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5f1c0f7fc0fb5fa550756fc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 10:04:51 2021 +0200 wldap32: Build with msvcrt. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/Makefile.in | 2 ++ dlls/wldap32/libldap.h | 10 +++++----- dlls/wldap32/page.c | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wldap32/Makefile.in b/dlls/wldap32/Makefile.in index 18a37151f99..831c00d65e1 100644 --- a/dlls/wldap32/Makefile.in +++ b/dlls/wldap32/Makefile.in @@ -4,6 +4,8 @@ IMPORTS = user32 EXTRAINCL = $(LDAP_CFLAGS) EXTRALIBS = $(LDAP_LIBS) +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ add.c \ ber.c \ diff --git a/dlls/wldap32/libldap.h b/dlls/wldap32/libldap.h index 1dfadf7e3bc..cc247e8fd82 100644 --- a/dlls/wldap32/libldap.h +++ b/dlls/wldap32/libldap.h @@ -19,8 +19,8 @@ /* compatible with structures defined in ldap.h */ typedef struct bervalU { - unsigned long bv_len; - char *bv_val; + ULONG_PTR bv_len; + char *bv_val; } BerValueU; typedef struct @@ -79,8 +79,8 @@ typedef struct typedef struct timevalU { - unsigned long tv_sec; - unsigned long tv_usec; + LONG_PTR tv_sec; + LONG_PTR tv_usec; } LDAP_TIMEVALU; #ifndef SASL_CB_LIST_END @@ -92,7 +92,7 @@ typedef struct timevalU typedef struct sasl_interactU { - unsigned long id; + ULONG_PTR id; const char *challenge; const char *prompt; const char *defresult; diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 5364280f271..49be2203b3f 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -245,7 +245,7 @@ ULONG CDECL ldap_parse_page_controlW( WLDAP32_LDAP *ld, LDAPControlW **ctrls, UL for (i = 0; ctrls[i]; i++) { - if (!lstrcmpW( LDAP_PAGED_RESULT_OID_STRING_W, ctrls[i]->ldctl_oid )) + if (!wcscmp( LDAP_PAGED_RESULT_OID_STRING_W, ctrls[i]->ldctl_oid )) control = ctrls[i]; } if (!control) return WLDAP32_LDAP_CONTROL_NOT_FOUND;

1 0