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

Nikolay Sivov : dwrite/tests: Add glyph origin tests for sideways mode.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: defb7d9c76c3c2a4d5f9945d20be4aa2353fb0ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=defb7d9c76c3c2a4d5f9945d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 15 14:38:39 2021 +0300 dwrite/tests: Add glyph origin tests for sideways mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 58 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 54e279ea11e..9f814504a44 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -8445,31 +8445,46 @@ static void test_HasKerningPairs(void) ok(ref == 0, "factory not released, %u\n", ref); } +static float get_scaled_metric(const DWRITE_GLYPH_RUN *run, float metric, const DWRITE_FONT_METRICS *m) +{ + return run->fontEmSize * metric / m->designUnitsPerEm; +} + static void get_expected_glyph_origins(D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *run, D2D1_POINT_2F *origins) { + DWRITE_GLYPH_METRICS glyph_metrics[2]; + DWRITE_FONT_METRICS metrics; unsigned int i; + HRESULT hr; + + IDWriteFontFace_GetMetrics(run->fontFace, &metrics); + + hr = IDWriteFontFace_GetDesignGlyphMetrics(run->fontFace, run->glyphIndices, run->glyphCount, glyph_metrics, + run->isSideways); + ok(hr == S_OK, "Failed to get glyph metrics, hr %#x.\n", hr); if (run->bidiLevel & 1) { - DWRITE_GLYPH_METRICS glyph_metrics[2]; - DWRITE_FONT_METRICS metrics; float advance; - HRESULT hr; - - hr = IDWriteFontFace_GetDesignGlyphMetrics(run->fontFace, run->glyphIndices, run->glyphCount, glyph_metrics, FALSE); - ok(hr == S_OK, "Failed to get glyph metrics, hr %#x.\n", hr); - - IDWriteFontFace_GetMetrics(run->fontFace, &metrics); - advance = run->fontEmSize * glyph_metrics[0].advanceWidth / metrics.designUnitsPerEm; + advance = get_scaled_metric(run, run->isSideways ? glyph_metrics[0].advanceHeight : + glyph_metrics[0].advanceWidth, &metrics); baseline_origin.x -= advance; for (i = 0; i < run->glyphCount; ++i) { - origins[i].x = baseline_origin.x - run->glyphOffsets[i].advanceOffset; - origins[i].y = baseline_origin.y - run->glyphOffsets[i].ascenderOffset; + origins[i] = baseline_origin; + + if (run->isSideways) + { + origins[i].x += get_scaled_metric(run, glyph_metrics[i].verticalOriginY, &metrics); + origins[i].y += metrics.designUnitsPerEm / (4.0f * run->fontEmSize); + } + + origins[i].x -= run->glyphOffsets[i].advanceOffset; + origins[i].y -= run->glyphOffsets[i].ascenderOffset; baseline_origin.x -= run->glyphAdvances[i]; } @@ -8478,8 +8493,16 @@ static void get_expected_glyph_origins(D2D1_POINT_2F baseline_origin, const DWRI { for (i = 0; i < run->glyphCount; ++i) { - origins[i].x = baseline_origin.x + run->glyphOffsets[i].advanceOffset; - origins[i].y = baseline_origin.y - run->glyphOffsets[i].ascenderOffset; + origins[i] = baseline_origin; + + if (run->isSideways) + { + origins[i].x += get_scaled_metric(run, glyph_metrics[i].verticalOriginY, &metrics); + origins[i].y += metrics.designUnitsPerEm / (4.0f * run->fontEmSize); + } + + origins[i].x += run->glyphOffsets[i].advanceOffset; + origins[i].y -= run->glyphOffsets[i].ascenderOffset; baseline_origin.x += run->glyphAdvances[i]; } @@ -8494,12 +8517,18 @@ static void test_ComputeGlyphOrigins(void) float advances[2]; DWRITE_GLYPH_OFFSET offsets[2]; unsigned int bidi_level; + unsigned int sideways; } origins_tests[] = { { { 123.0f, 321.0f }, { 10.0f, 20.0f }, { { 0 } } }, { { 123.0f, 321.0f }, { 10.0f, 20.0f }, { { 0.3f, 0.5f }, { -0.1f, 0.9f } } }, { { 123.0f, 321.0f }, { 10.0f, 20.0f }, { { 0 } }, 1 }, + + { { 123.0f, 321.0f }, { 10.0f, 20.0f }, { { 0 } }, 0, 1 }, + { { 123.0f, 321.0f }, { 10.0f, 20.0f }, { { 0.3f, 0.5f }, { -0.1f, 0.9f } }, 0, 1 }, + { { 123.0f, 321.0f }, { 10.0f, 20.0f }, { { 0 } }, 1, 1 }, + { { 123.0f, 321.0f }, { 10.0f, 20.0f }, { { 0.3f, 0.5f }, { -0.1f, 0.9f } }, 1, 1 }, }; IDWriteFactory4 *factory; DWRITE_GLYPH_RUN run; @@ -8529,7 +8558,7 @@ static void test_ComputeGlyphOrigins(void) run.glyphIndices = glyphs; run.glyphAdvances = origins_tests[i].advances; run.glyphOffsets = origins_tests[i].offsets; - run.isSideways = FALSE; + run.isSideways = !!origins_tests[i].sideways; run.bidiLevel = origins_tests[i].bidi_level; get_expected_glyph_origins(origins_tests[i].baseline_origin, &run, expected_origins); @@ -8539,6 +8568,7 @@ static void test_ComputeGlyphOrigins(void) ok(hr == S_OK, "%u: failed to compute glyph origins, hr %#x.\n", i, hr); for (j = 0; j < run.glyphCount; ++j) { + todo_wine_if(run.isSideways) ok(!memcmp(&origins[j], &expected_origins[j], sizeof(origins[j])), "%u: unexpected origin[%u] (%f, %f) - (%f, %f).\n", i, j, origins[j].x, origins[j].y, expected_origins[j].x, expected_origins[j].y);

1 0

Gijs Vermeulen : cmd: Use terminated strings.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 0bf71745f0df0181844be37afb6c0975a6ccb2f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bf71745f0df0181844be37a… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Apr 15 17:11:53 2021 +0200 cmd: Use terminated strings. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48486 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 48 ++++++++++++++++++++++-------------------------- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 45 +++++++++++++++++---------------------------- 3 files changed, 40 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0bf71745f0df0181844b…

1 0

Zebediah Figura : combase/tests: Link directly to combase.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 141c182e4b34c95161c628a18c75153ab371e901 URL: https://source.winehq.org/git/wine.git/?a=commit;h=141c182e4b34c95161c628a1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 14 22:19:09 2021 -0500 combase/tests: Link directly to combase. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/tests/Makefile.in | 1 + dlls/combase/tests/roapi.c | 59 +----- dlls/combase/tests/string.c | 443 ++++++++++++++++++----------------------- include/roapi.h | 2 + 4 files changed, 208 insertions(+), 297 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=141c182e4b34c95161c6…

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_get_shader().
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: fd7231493dc8e14a872e1bb7f3c866e759eaadfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd7231493dc8e14a872e1bb7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 14 23:58:55 2021 -0500 wined3d: Introduce wined3d_device_context_get_shader(). 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 | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e6406c7a04f..731a304a779 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1901,6 +1901,14 @@ void CDECL wined3d_device_context_set_shader(struct wined3d_device_context *cont wined3d_shader_decref(prev); } +struct wined3d_shader * CDECL wined3d_device_context_get_shader(const struct wined3d_device_context *context, + enum wined3d_shader_type type) +{ + TRACE("context %p, type %#x.\n", context, type); + + return context->state->shader[type]; +} + void CDECL wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int idx, struct wined3d_buffer *buffer) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 34eba025b8a..ada2c79fb77 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -171,6 +171,7 @@ @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_flush(ptr) @ cdecl wined3d_device_context_generate_mipmaps(ptr ptr) +@ cdecl wined3d_device_context_get_shader(ptr long) @ cdecl wined3d_device_context_issue_query(ptr ptr long) @ cdecl wined3d_device_context_map(ptr ptr long ptr ptr long) @ cdecl wined3d_device_context_resolve_sub_resource(ptr ptr long ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index db5f75d7aca..33844349968 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2567,6 +2567,8 @@ void __cdecl wined3d_device_context_draw_indirect(struct wined3d_device_context void __cdecl wined3d_device_context_flush(struct wined3d_device_context *context); void __cdecl wined3d_device_context_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view); +struct wined3d_shader * __cdecl wined3d_device_context_get_shader(const struct wined3d_device_context *context, + enum wined3d_shader_type type); void __cdecl wined3d_device_context_issue_query(struct wined3d_device_context *context, struct wined3d_query *query, unsigned int flags); HRESULT __cdecl wined3d_device_context_map(struct wined3d_device_context *context,

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_get_shader().
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 8cd9754b072db91ca41cfd68ca4fe076f08d0acf URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cd9754b072db91ca41cfd68… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 14 23:58:56 2021 -0500 d3d11: Use wined3d_device_context_get_shader(). 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 | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 43fc18126ff..36fc6a084fa 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1678,7 +1678,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShader(ID3D11DeviceContext1 *iface, ID3D11PixelShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_shader *wined3d_shader; struct d3d_pixel_shader *shader_impl; @@ -1691,7 +1691,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShader(ID3D11DeviceCo *class_instance_count = 0; wined3d_mutex_lock(); - if (!(wined3d_shader = wined3d_device_get_pixel_shader(device->wined3d_device))) + if (!(wined3d_shader = wined3d_device_context_get_shader(context->wined3d_context, WINED3D_SHADER_TYPE_PIXEL))) { wined3d_mutex_unlock(); *shader = NULL; @@ -1735,7 +1735,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShader(ID3D11DeviceContext1 *iface, ID3D11VertexShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_vertex_shader *shader_impl; struct wined3d_shader *wined3d_shader; @@ -1748,7 +1748,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShader(ID3D11DeviceCo *class_instance_count = 0; wined3d_mutex_lock(); - if (!(wined3d_shader = wined3d_device_get_vertex_shader(device->wined3d_device))) + if (!(wined3d_shader = wined3d_device_context_get_shader(context->wined3d_context, WINED3D_SHADER_TYPE_VERTEX))) { wined3d_mutex_unlock(); *shader = NULL; @@ -1869,7 +1869,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShader(ID3D11DeviceContext1 *iface, ID3D11GeometryShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_geometry_shader *shader_impl; struct wined3d_shader *wined3d_shader; @@ -1882,7 +1882,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShader(ID3D11DeviceCo *class_instance_count = 0; wined3d_mutex_lock(); - if (!(wined3d_shader = wined3d_device_get_geometry_shader(device->wined3d_device))) + if (!(wined3d_shader = wined3d_device_context_get_shader(context->wined3d_context, WINED3D_SHADER_TYPE_GEOMETRY))) { wined3d_mutex_unlock(); *shader = NULL; @@ -2318,7 +2318,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShader(ID3D11DeviceContext1 *iface, ID3D11HullShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d11_hull_shader *shader_impl; struct wined3d_shader *wined3d_shader; @@ -2331,7 +2331,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShader(ID3D11DeviceCo *class_instance_count = 0; wined3d_mutex_lock(); - if (!(wined3d_shader = wined3d_device_get_hull_shader(device->wined3d_device))) + if (!(wined3d_shader = wined3d_device_context_get_shader(context->wined3d_context, WINED3D_SHADER_TYPE_HULL))) { wined3d_mutex_unlock(); *shader = NULL; @@ -2410,7 +2410,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShader(ID3D11DeviceContext1 *iface, ID3D11DomainShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d11_domain_shader *shader_impl; struct wined3d_shader *wined3d_shader; @@ -2423,7 +2423,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShader(ID3D11DeviceCo *class_instance_count = 0; wined3d_mutex_lock(); - if (!(wined3d_shader = wined3d_device_get_domain_shader(device->wined3d_device))) + if (!(wined3d_shader = wined3d_device_context_get_shader(context->wined3d_context, WINED3D_SHADER_TYPE_DOMAIN))) { wined3d_mutex_unlock(); *shader = NULL; @@ -2527,7 +2527,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetUnorderedAccessViews( static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShader(ID3D11DeviceContext1 *iface, ID3D11ComputeShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d11_compute_shader *shader_impl; struct wined3d_shader *wined3d_shader; @@ -2540,7 +2540,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShader(ID3D11DeviceCo *class_instance_count = 0; wined3d_mutex_lock(); - if (!(wined3d_shader = wined3d_device_get_compute_shader(device->wined3d_device))) + if (!(wined3d_shader = wined3d_device_context_get_shader(context->wined3d_context, WINED3D_SHADER_TYPE_COMPUTE))) { wined3d_mutex_unlock(); *shader = NULL; @@ -5046,7 +5046,8 @@ static void STDMETHODCALLTYPE d3d10_device_PSGetShader(ID3D10Device1 *iface, ID3 TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - if (!(wined3d_shader = wined3d_device_get_pixel_shader(device->wined3d_device))) + if (!(wined3d_shader = wined3d_device_context_get_shader(device->immediate_context.wined3d_context, + WINED3D_SHADER_TYPE_PIXEL))) { wined3d_mutex_unlock(); *shader = NULL; @@ -5096,7 +5097,8 @@ static void STDMETHODCALLTYPE d3d10_device_VSGetShader(ID3D10Device1 *iface, ID3 TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - if (!(wined3d_shader = wined3d_device_get_vertex_shader(device->wined3d_device))) + if (!(wined3d_shader = wined3d_device_context_get_shader(device->immediate_context.wined3d_context, + WINED3D_SHADER_TYPE_VERTEX))) { wined3d_mutex_unlock(); *shader = NULL; @@ -5218,7 +5220,8 @@ static void STDMETHODCALLTYPE d3d10_device_GSGetShader(ID3D10Device1 *iface, ID3 TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - if (!(wined3d_shader = wined3d_device_get_geometry_shader(device->wined3d_device))) + if (!(wined3d_shader = wined3d_device_context_get_shader(device->immediate_context.wined3d_context, + WINED3D_SHADER_TYPE_GEOMETRY))) { wined3d_mutex_unlock(); *shader = NULL;

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_get_constant_buffer().
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 14920064cd769190f031d6835f5c45bb191eff82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14920064cd769190f031d683… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 14 23:58:57 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_get_constant_buffer(). 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 | 6 +++--- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 36fc6a084fa..d93256e77ad 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -407,7 +407,7 @@ static ULONG STDMETHODCALLTYPE d3d11_immediate_context_Release(ID3D11DeviceConte static void d3d11_immediate_context_get_constant_buffers(ID3D11DeviceContext1 *iface, enum wined3d_shader_type type, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int i; wined3d_mutex_lock(); @@ -416,7 +416,7 @@ static void d3d11_immediate_context_get_constant_buffers(ID3D11DeviceContext1 *i struct wined3d_buffer *wined3d_buffer; struct d3d_buffer *buffer_impl; - if (!(wined3d_buffer = wined3d_device_get_constant_buffer(device->wined3d_device, + if (!(wined3d_buffer = wined3d_device_context_get_constant_buffer(context->wined3d_context, type, start_slot + i))) { buffers[i] = NULL; @@ -4358,7 +4358,7 @@ static void d3d10_device_get_constant_buffers(ID3D10Device1 *iface, struct wined3d_buffer *wined3d_buffer; struct d3d_buffer *buffer_impl; - if (!(wined3d_buffer = wined3d_device_get_constant_buffer(device->wined3d_device, + if (!(wined3d_buffer = wined3d_device_context_get_constant_buffer(device->immediate_context.wined3d_context, type, start_slot + i))) { buffers[i] = NULL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 731a304a779..974db90037d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2451,10 +2451,10 @@ void CDECL wined3d_device_set_constant_buffer(struct wined3d_device *device, return wined3d_device_context_set_constant_buffer(&device->cs->c, type, idx, buffer); } -struct wined3d_buffer * CDECL wined3d_device_get_constant_buffer(const struct wined3d_device *device, +struct wined3d_buffer * CDECL wined3d_device_context_get_constant_buffer(const struct wined3d_device_context *context, enum wined3d_shader_type shader_type, unsigned int idx) { - TRACE("device %p, shader_type %#x, idx %u.\n", device, shader_type, idx); + TRACE("context %p, shader_type %#x, idx %u.\n", context, shader_type, idx); if (idx >= MAX_CONSTANT_BUFFERS) { @@ -2462,7 +2462,7 @@ struct wined3d_buffer * CDECL wined3d_device_get_constant_buffer(const struct wi return NULL; } - return device->cs->c.state->cb[shader_type][idx]; + return context->state->cb[shader_type][idx]; } void CDECL wined3d_device_set_vs_resource_view(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index ada2c79fb77..406e511c0f6 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -58,7 +58,6 @@ @ cdecl wined3d_device_get_blend_state(ptr ptr) @ cdecl wined3d_device_get_clip_status(ptr ptr) @ cdecl wined3d_device_get_compute_shader(ptr) -@ cdecl wined3d_device_get_constant_buffer(ptr long long) @ cdecl wined3d_device_get_creation_parameters(ptr ptr) @ cdecl wined3d_device_get_cs_resource_view(ptr long) @ cdecl wined3d_device_get_cs_sampler(ptr long) @@ -171,6 +170,7 @@ @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_flush(ptr) @ cdecl wined3d_device_context_generate_mipmaps(ptr ptr) +@ cdecl wined3d_device_context_get_constant_buffer(ptr long long) @ cdecl wined3d_device_context_get_shader(ptr long) @ 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 33844349968..1a58c671934 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2380,8 +2380,6 @@ struct wined3d_blend_state * __cdecl wined3d_device_get_blend_state(const struct HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, struct wined3d_clip_status *clip_status); struct wined3d_shader * __cdecl wined3d_device_get_compute_shader(const struct wined3d_device *device); -struct wined3d_buffer * __cdecl wined3d_device_get_constant_buffer(const struct wined3d_device *device, - enum wined3d_shader_type shader_type, unsigned int idx); void __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, struct wined3d_device_creation_parameters *creation_parameters); struct wined3d_shader_resource_view * __cdecl wined3d_device_get_cs_resource_view(const struct wined3d_device *device, @@ -2567,6 +2565,8 @@ void __cdecl wined3d_device_context_draw_indirect(struct wined3d_device_context void __cdecl wined3d_device_context_flush(struct wined3d_device_context *context); void __cdecl wined3d_device_context_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view); +struct wined3d_buffer * __cdecl wined3d_device_context_get_constant_buffer(const struct wined3d_device_context *context, + enum wined3d_shader_type shader_type, unsigned int idx); struct wined3d_shader * __cdecl wined3d_device_context_get_shader(const struct wined3d_device_context *context, enum wined3d_shader_type type); void __cdecl wined3d_device_context_issue_query(struct wined3d_device_context *context,

1 0

Zebediah Figura : winebus.sys: Rename "report_cs" to "cs".
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: b6409950d95e59201c914dd801388c1938b3dca5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6409950d95e59201c914dd8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 14 23:22:03 2021 -0500 winebus.sys: Rename "report_cs" to "cs". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 8d3dec4779a..7d3f5064f84 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -112,6 +112,8 @@ struct pnp_device struct device_extension { + CRITICAL_SECTION cs; + struct pnp_device *pnp_device; WORD vid, pid, input; @@ -127,7 +129,6 @@ struct device_extension BOOL last_report_read; DWORD buffer_size; LIST_ENTRY irp_queue; - CRITICAL_SECTION report_cs; BYTE platform_private[1]; }; @@ -285,8 +286,8 @@ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, memset(ext->platform_private, 0, platform_data_size); InitializeListHead(&ext->irp_queue); - InitializeCriticalSection(&ext->report_cs); - ext->report_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": report_cs"); + InitializeCriticalSection(&ext->cs); + ext->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); /* add to list of pnp devices */ pnp_dev->device = device; @@ -366,7 +367,7 @@ void bus_remove_hid_device(DEVICE_OBJECT *device) TRACE("(%p)\n", device); /* Cancel pending IRPs */ - EnterCriticalSection(&ext->report_cs); + EnterCriticalSection(&ext->cs); while ((entry = RemoveHeadList(&ext->irp_queue)) != &ext->irp_queue) { irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); @@ -374,10 +375,10 @@ void bus_remove_hid_device(DEVICE_OBJECT *device) irp->IoStatus.Information = 0; IoCompleteRequest(irp, IO_NO_INCREMENT); } - LeaveCriticalSection(&ext->report_cs); + LeaveCriticalSection(&ext->cs); - ext->report_cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&ext->report_cs); + ext->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&ext->cs); HeapFree(GetProcessHeap(), 0, ext->serial); HeapFree(GetProcessHeap(), 0, ext->last_report); @@ -783,12 +784,12 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) { HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); TRACE_(hid_report)("IOCTL_HID_GET_INPUT_REPORT\n"); - EnterCriticalSection(&ext->report_cs); + EnterCriticalSection(&ext->cs); status = ext->vtbl->begin_report_processing(device); if (status != STATUS_SUCCESS) { irp->IoStatus.u.Status = status; - LeaveCriticalSection(&ext->report_cs); + LeaveCriticalSection(&ext->cs); break; } @@ -798,18 +799,18 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) if (status == STATUS_SUCCESS) packet->reportBufferLen = irp->IoStatus.Information; - LeaveCriticalSection(&ext->report_cs); + LeaveCriticalSection(&ext->cs); break; } case IOCTL_HID_READ_REPORT: { TRACE_(hid_report)("IOCTL_HID_READ_REPORT\n"); - EnterCriticalSection(&ext->report_cs); + EnterCriticalSection(&ext->cs); status = ext->vtbl->begin_report_processing(device); if (status != STATUS_SUCCESS) { irp->IoStatus.u.Status = status; - LeaveCriticalSection(&ext->report_cs); + LeaveCriticalSection(&ext->cs); break; } if (!ext->last_report_read) @@ -824,7 +825,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.s.ListEntry); status = STATUS_PENDING; } - LeaveCriticalSection(&ext->report_cs); + LeaveCriticalSection(&ext->cs); break; } case IOCTL_HID_SET_OUTPUT_REPORT: @@ -880,7 +881,7 @@ void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) if (!length || !report) return; - EnterCriticalSection(&ext->report_cs); + EnterCriticalSection(&ext->cs); if (length > ext->buffer_size) { HeapFree(GetProcessHeap(), 0, ext->last_report); @@ -891,7 +892,7 @@ void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) ext->buffer_size = 0; ext->last_report_size = 0; ext->last_report_read = TRUE; - LeaveCriticalSection(&ext->report_cs); + LeaveCriticalSection(&ext->cs); return; } else @@ -914,7 +915,7 @@ void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) ext->last_report_read = TRUE; IoCompleteRequest(irp, IO_NO_INCREMENT); } - LeaveCriticalSection(&ext->report_cs); + LeaveCriticalSection(&ext->cs); } DWORD check_bus_option(const UNICODE_STRING *option, DWORD default_value)

1 0

Zebediah Figura : winebus.sys: Move platform-specific device cleanup to a callback function.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: f8ec3fdcdbdc6a0d3a062cbbb61b47229fd177cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8ec3fdcdbdc6a0d3a062cbb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 14 23:22:04 2021 -0500 winebus.sys: Move platform-specific device cleanup to a callback function. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_iohid.c | 5 +++ dlls/winebus.sys/bus_sdl.c | 27 ++++++-------- dlls/winebus.sys/bus_udev.c | 88 ++++++++++++++++++++------------------------ dlls/winebus.sys/main.c | 7 ++++ 5 files changed, 65 insertions(+), 63 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 22a4b46a516..a157f576ef9 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -29,6 +29,7 @@ void sdl_driver_unload( void ) DECLSPEC_HIDDEN; /* Native device function table */ typedef struct { + void (*free_device)(DEVICE_OBJECT *device); int (*compare_platform_device)(DEVICE_OBJECT *device, void *platform_dev); NTSTATUS (*get_reportdescriptor)(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length); NTSTATUS (*get_string)(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length); diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index ee6225bf398..c275011b491 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -136,6 +136,10 @@ static void handle_IOHIDDeviceIOHIDReportCallback(void *context, process_hid_report(device, report, report_length); } +static void free_device(DEVICE_OBJECT *device) +{ +} + static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev) { struct platform_private *private = impl_from_DEVICE_OBJECT(device); @@ -270,6 +274,7 @@ static NTSTATUS set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report static const platform_vtbl iohid_vtbl = { + free_device, compare_platform_device, get_reportdescriptor, get_string, diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index bf62f448976..154c0fb19a3 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -605,6 +605,17 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) return TRUE; } +static void free_device(DEVICE_OBJECT *device) +{ + struct platform_private *ext = impl_from_DEVICE_OBJECT(device); + + pSDL_JoystickClose(ext->sdl_joystick); + if (ext->sdl_controller) + pSDL_GameControllerClose(ext->sdl_controller); + if (ext->sdl_haptic) + pSDL_HapticClose(ext->sdl_haptic); +} + static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev) { SDL_JoystickID id1 = impl_from_DEVICE_OBJECT(device)->id; @@ -722,6 +733,7 @@ static NTSTATUS set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report static const platform_vtbl sdl_vtbl = { + free_device, compare_platform_device, get_reportdescriptor, get_string, @@ -872,29 +884,14 @@ static BOOL set_mapped_report_from_event(SDL_Event *event) static void try_remove_device(SDL_JoystickID id) { DEVICE_OBJECT *device = NULL; - struct platform_private *private; - SDL_Joystick *sdl_joystick; - SDL_GameController *sdl_controller; - SDL_Haptic *sdl_haptic; device = bus_enumerate_hid_devices(&sdl_vtbl, compare_joystick_id, ULongToPtr(id)); if (!device) return; - private = impl_from_DEVICE_OBJECT(device); - sdl_joystick = private->sdl_joystick; - sdl_controller = private->sdl_controller; - sdl_haptic = private->sdl_haptic; - bus_unlink_hid_device(device); IoInvalidateDeviceRelations(bus_pdo, BusRelations); bus_remove_hid_device(device); - - pSDL_JoystickClose(sdl_joystick); - if (sdl_controller) - pSDL_GameControllerClose(sdl_controller); - if (sdl_haptic) - pSDL_HapticClose(sdl_haptic); } static void try_add_device(unsigned int index) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 74cf6a28a1a..c717c13a7db 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -653,6 +653,23 @@ static WCHAR *get_sysattr_string(struct udev_device *dev, const char *sysattr) return strdupAtoW(attr); } +static void hidraw_free_device(DEVICE_OBJECT *device) +{ + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + + if (private->report_thread) + { + write(private->control_pipe[1], "q", 1); + WaitForSingleObject(private->report_thread, INFINITE); + close(private->control_pipe[0]); + close(private->control_pipe[1]); + CloseHandle(private->report_thread); + } + + close(private->device_fd); + udev_device_unref(private->udev_device); +} + static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev) { struct udev_device *dev1 = impl_from_DEVICE_OBJECT(device)->udev_device; @@ -921,6 +938,7 @@ static NTSTATUS hidraw_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE static const platform_vtbl hidraw_vtbl = { + hidraw_free_device, compare_platform_device, hidraw_get_reportdescriptor, hidraw_get_string, @@ -937,6 +955,27 @@ static inline struct wine_input_private *input_impl_from_DEVICE_OBJECT(DEVICE_OB return (struct wine_input_private*)get_platform_private(device); } +static void lnxev_free_device(DEVICE_OBJECT *device) +{ + struct wine_input_private *ext = input_impl_from_DEVICE_OBJECT(device); + + if (ext->base.report_thread) + { + write(ext->base.control_pipe[1], "q", 1); + WaitForSingleObject(ext->base.report_thread, INFINITE); + close(ext->base.control_pipe[0]); + close(ext->base.control_pipe[1]); + CloseHandle(ext->base.report_thread); + } + + HeapFree(GetProcessHeap(), 0, ext->current_report_buffer); + HeapFree(GetProcessHeap(), 0, ext->last_report_buffer); + HeapFree(GetProcessHeap(), 0, ext->report_descriptor); + + close(ext->base.device_fd); + udev_device_unref(ext->base.udev_device); +} + static NTSTATUS lnxev_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length) { struct wine_input_private *ext = input_impl_from_DEVICE_OBJECT(device); @@ -1051,6 +1090,7 @@ static NTSTATUS lnxev_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE * } static const platform_vtbl lnxev_vtbl = { + lnxev_free_device, compare_platform_device, lnxev_get_reportdescriptor, lnxev_get_string, @@ -1285,54 +1325,17 @@ static void try_add_device(struct udev_device *dev) static void try_remove_device(struct udev_device *dev) { DEVICE_OBJECT *device = NULL; - struct platform_private* private; -#ifdef HAS_PROPER_INPUT_HEADER - BOOL is_input = FALSE; -#endif device = bus_find_hid_device(&hidraw_vtbl, dev); #ifdef HAS_PROPER_INPUT_HEADER if (device == NULL) - { device = bus_find_hid_device(&lnxev_vtbl, dev); - is_input = TRUE; - } #endif if (!device) return; bus_unlink_hid_device(device); IoInvalidateDeviceRelations(bus_pdo, BusRelations); - - private = impl_from_DEVICE_OBJECT(device); - - if (private->report_thread) - { - write(private->control_pipe[1], "q", 1); - WaitForSingleObject(private->report_thread, INFINITE); - close(private->control_pipe[0]); - close(private->control_pipe[1]); - CloseHandle(private->report_thread); -#ifdef HAS_PROPER_INPUT_HEADER - if (strcmp(udev_device_get_subsystem(dev), "input") == 0) - { - HeapFree(GetProcessHeap(), 0, ((struct wine_input_private*)private)->current_report_buffer); - HeapFree(GetProcessHeap(), 0, ((struct wine_input_private*)private)->last_report_buffer); - } -#endif - } - -#ifdef HAS_PROPER_INPUT_HEADER - if (is_input) - { - struct wine_input_private *ext = (struct wine_input_private*)private; - HeapFree(GetProcessHeap(), 0, ext->report_descriptor); - } -#endif - - dev = private->udev_device; - close(private->device_fd); bus_remove_hid_device(device); - udev_device_unref(dev); } static void build_initial_deviceset(void) @@ -1482,12 +1485,6 @@ static DWORD CALLBACK deviceloop_thread(void *args) return 0; } -static int device_unload(DEVICE_OBJECT *device, void *context) -{ - try_remove_device(impl_from_DEVICE_OBJECT(device)->udev_device); - return 1; -} - void udev_driver_unload( void ) { TRACE("Unload Driver\n"); @@ -1500,11 +1497,6 @@ void udev_driver_unload( void ) close(deviceloop_control[0]); close(deviceloop_control[1]); CloseHandle(deviceloop_handle); - - bus_enumerate_hid_devices(&hidraw_vtbl, device_unload, NULL); -#ifdef HAS_PROPER_INPUT_HEADER - bus_enumerate_hid_devices(&lnxev_vtbl, device_unload, NULL); -#endif } NTSTATUS udev_driver_init(void) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 7d3f5064f84..f184945779d 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -377,6 +377,8 @@ void bus_remove_hid_device(DEVICE_OBJECT *device) } LeaveCriticalSection(&ext->cs); + ext->vtbl->free_device(device); + ext->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&ext->cs); @@ -474,6 +476,10 @@ static NTSTATUS handle_IRP_MN_QUERY_ID(DEVICE_OBJECT *device, IRP *irp) return status; } +static void mouse_free_device(DEVICE_OBJECT *device) +{ +} + static NTSTATUS mouse_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *ret_length) { TRACE("buffer %p, length %u.\n", buffer, length); @@ -526,6 +532,7 @@ static NTSTATUS mouse_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE * static const platform_vtbl mouse_vtbl = { + .free_device = mouse_free_device, .get_reportdescriptor = mouse_get_reportdescriptor, .get_string = mouse_get_string, .begin_report_processing = mouse_begin_report_processing,

1 0

Zebediah Figura : winebus.sys: Reject ioctls on a removed device.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: b0f25d7e1bd3654f7e028ef4a557ce9528173297 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0f25d7e1bd3654f7e028ef4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 14 23:22:05 2021 -0500 winebus.sys: Reject ioctls on a removed device. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index f184945779d..598cd2483fa 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -114,6 +114,8 @@ struct device_extension { CRITICAL_SECTION cs; + BOOL removed; + struct pnp_device *pnp_device; WORD vid, pid, input; @@ -355,6 +357,10 @@ void bus_unlink_hid_device(DEVICE_OBJECT *device) EnterCriticalSection(&device_list_cs); list_remove(&pnp_device->entry); LeaveCriticalSection(&device_list_cs); + + EnterCriticalSection(&ext->cs); + ext->removed = TRUE; + LeaveCriticalSection(&ext->cs); } void bus_remove_hid_device(DEVICE_OBJECT *device) @@ -709,6 +715,16 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) return IoCallDriver(bus_pdo, irp); } + EnterCriticalSection(&ext->cs); + + if (ext->removed) + { + LeaveCriticalSection(&ext->cs); + irp->IoStatus.u.Status = STATUS_DELETE_PENDING; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_DELETE_PENDING; + } + switch (irpsp->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_HID_GET_DEVICE_ATTRIBUTES: @@ -791,7 +807,6 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) { HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); TRACE_(hid_report)("IOCTL_HID_GET_INPUT_REPORT\n"); - EnterCriticalSection(&ext->cs); status = ext->vtbl->begin_report_processing(device); if (status != STATUS_SUCCESS) { @@ -806,13 +821,11 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) if (status == STATUS_SUCCESS) packet->reportBufferLen = irp->IoStatus.Information; - LeaveCriticalSection(&ext->cs); break; } case IOCTL_HID_READ_REPORT: { TRACE_(hid_report)("IOCTL_HID_READ_REPORT\n"); - EnterCriticalSection(&ext->cs); status = ext->vtbl->begin_report_processing(device); if (status != STATUS_SUCCESS) { @@ -832,7 +845,6 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.s.ListEntry); status = STATUS_PENDING; } - LeaveCriticalSection(&ext->cs); break; } case IOCTL_HID_SET_OUTPUT_REPORT: @@ -873,6 +885,8 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) } } + LeaveCriticalSection(&ext->cs); + if (status != STATUS_PENDING) IoCompleteRequest(irp, IO_NO_INCREMENT);

1 0

Zebediah Figura : winebus.sys: Move device destruction to IRP_MN_REMOVE_DEVICE.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 27f40156baa7f1e09c6e420f6c278606557a505a URL: https://source.winehq.org/git/wine.git/?a=commit;h=27f40156baa7f1e09c6e420f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 14 23:22:06 2021 -0500 winebus.sys: Move device destruction to IRP_MN_REMOVE_DEVICE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 1 - dlls/winebus.sys/bus_sdl.c | 4 ++-- dlls/winebus.sys/bus_udev.c | 2 +- dlls/winebus.sys/main.c | 56 ++++++++++++++++++++++++++++++-------------- 4 files changed, 42 insertions(+), 21 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index c275011b491..0123e73f7ba 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -384,7 +384,6 @@ static void handle_RemovalCallback(void *context, IOReturn result, void *sender, { bus_unlink_hid_device(device); IoInvalidateDeviceRelations(bus_pdo, BusRelations); - bus_remove_hid_device(device); } } diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 154c0fb19a3..779a1af2736 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -890,8 +890,6 @@ static void try_remove_device(SDL_JoystickID id) bus_unlink_hid_device(device); IoInvalidateDeviceRelations(bus_pdo, BusRelations); - - bus_remove_hid_device(device); } static void try_add_device(unsigned int index) @@ -965,6 +963,8 @@ static void try_add_device(unsigned int index) private->sdl_joystick = joystick; private->sdl_controller = controller; private->id = id; + + /* FIXME: We should probably move this to IRP_MN_START_DEVICE. */ if (controller) rc = build_mapped_report_descriptor(private); else diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index c717c13a7db..0c150322006 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1300,6 +1300,7 @@ static void try_add_device(struct udev_device *dev) private->device_fd = fd; #ifdef HAS_PROPER_INPUT_HEADER if (strcmp(subsystem, "input") == 0) + /* FIXME: We should probably move this to IRP_MN_START_DEVICE. */ if (!build_report_descriptor((struct wine_input_private*)private, dev)) { ERR("Building report descriptor failed, removing device\n"); @@ -1335,7 +1336,6 @@ static void try_remove_device(struct udev_device *dev) bus_unlink_hid_device(device); IoInvalidateDeviceRelations(bus_pdo, BusRelations); - bus_remove_hid_device(device); } static void build_initial_deviceset(void) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 598cd2483fa..01e839f02d8 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -367,24 +367,9 @@ void bus_remove_hid_device(DEVICE_OBJECT *device) { struct device_extension *ext = (struct device_extension *)device->DeviceExtension; struct pnp_device *pnp_device = ext->pnp_device; - LIST_ENTRY *entry; - IRP *irp; TRACE("(%p)\n", device); - /* Cancel pending IRPs */ - EnterCriticalSection(&ext->cs); - while ((entry = RemoveHeadList(&ext->irp_queue)) != &ext->irp_queue) - { - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); - irp->IoStatus.u.Status = STATUS_DELETE_PENDING; - irp->IoStatus.Information = 0; - IoCompleteRequest(irp, IO_NO_INCREMENT); - } - LeaveCriticalSection(&ext->cs); - - ext->vtbl->free_device(device); - ext->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&ext->cs); @@ -606,19 +591,56 @@ static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) { + struct device_extension *ext = device->DeviceExtension; NTSTATUS status = irp->IoStatus.u.Status; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); + TRACE("device %p, irp %p, minor function %#x.\n", device, irp, irpsp->MinorFunction); + switch (irpsp->MinorFunction) { case IRP_MN_QUERY_ID: - TRACE("IRP_MN_QUERY_ID\n"); status = handle_IRP_MN_QUERY_ID(device, irp); break; + case IRP_MN_QUERY_CAPABILITIES: - TRACE("IRP_MN_QUERY_CAPABILITIES\n"); status = STATUS_SUCCESS; break; + + case IRP_MN_REMOVE_DEVICE: + { + struct pnp_device *pnp_device = ext->pnp_device; + LIST_ENTRY *entry; + + EnterCriticalSection(&ext->cs); + while ((entry = RemoveHeadList(&ext->irp_queue)) != &ext->irp_queue) + { + IRP *queued_irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); + queued_irp->IoStatus.u.Status = STATUS_DELETE_PENDING; + queued_irp->IoStatus.Information = 0; + IoCompleteRequest(queued_irp, IO_NO_INCREMENT); + } + LeaveCriticalSection(&ext->cs); + + ext->vtbl->free_device(device); + + ext->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&ext->cs); + + HeapFree(GetProcessHeap(), 0, ext->serial); + HeapFree(GetProcessHeap(), 0, ext->last_report); + + irp->IoStatus.u.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + + IoDeleteDevice(device); + + /* pnp_device must be released after the device is gone */ + HeapFree(GetProcessHeap(), 0, pnp_device); + + return STATUS_SUCCESS; + } + default: FIXME("Unhandled function %08x\n", irpsp->MinorFunction); break;

1 0