- wine-devel - winehq.org

[PATCH 5/5] gdi32: Directly call dib driver functions in dibdrv_wglCreateContext.
by Jacek Caban 17 Sep '21

17 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dibdrv/dc.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)

2 1

[PATCH 4/5] gdi32: Directly use ntdll in dib.c.
by Jacek Caban 17 Sep '21

17 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dib.c | 49 +++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 19 deletions(-)

2 1

[PATCH 3/5] gdi32: Use NtQuerySystemInformation instead of GetSystemInfo.
by Jacek Caban 17 Sep '21

17 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dib.c | 8 ++------ dlls/gdi32/gdiobj.c | 2 ++ dlls/gdi32/ntgdi_private.h | 1 + 3 files changed, 5 insertions(+), 6 deletions(-)

2 1

[PATCH 2/5] gdi32: Avoid calling gdi32 functions from ntgdi functions.
by Jacek Caban 17 Sep '21

17 Sep '21

2 1

[PATCH 1/5] gdi32: Access stretch mode directly from DC in NtGdiTransparentBlt.
by Jacek Caban 17 Sep '21

17 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)

2 1

[PATCH vkd3d] vkd3d-shader: Factor out a vkd3d_shader_trace_text() helper and use it in vkd3d_spirv_dump() (Valgrind).
by Zebediah Figura 17 Sep '21

17 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 8 +------- libs/vkd3d-shader/vkd3d_shader_main.c | 9 +++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 3 +++ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6f948c31c..f604b8efd 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -127,13 +127,7 @@ static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, if (!vkd3d_spirv_binary_to_text(spirv, environment, options, &text)) { - const char *str, *current = text.code; - while ((str = strchr(current, '\n'))) - { - TRACE("%.*s\n", (int)(str - current), current); - current = str + 1; - } - + vkd3d_shader_trace_text(text.code, text.size); vkd3d_shader_free_shader_code(&text); } } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 5d7cdf019..e38261b45 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -98,12 +98,17 @@ int vkd3d_string_buffer_printf(struct vkd3d_string_buffer *buffer, const char *f void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const char *function) { - const char *p, *q, *end = buffer->buffer + buffer->content_size; + vkd3d_shader_trace_text_(buffer->buffer, buffer->content_size, function); +} + +void vkd3d_shader_trace_text_(const char *text, size_t size, const char *function) +{ + const char *p, *q, *end = text + size; if (!TRACE_ON()) return; - for (p = buffer->buffer; p < end; p = q) + for (p = text; p < end; p = q) { if (!(q = memchr(p, '\n', end - p))) q = end; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 5ced3d532..78354a95b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -988,6 +988,9 @@ void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, const s void vkd3d_shader_dump_shader(enum vkd3d_shader_source_type source_type, enum vkd3d_shader_type shader_type, const struct vkd3d_shader_code *shader); +void vkd3d_shader_trace_text_(const char *text, size_t size, const char *function); +#define vkd3d_shader_trace_text(text, size) \ + vkd3d_shader_trace_text_(text, size, __FUNCTION__) int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_message_context *message_context, const char *source_name, struct vkd3d_shader_desc *desc); -- 2.33.0

2 1

[PATCH vkd3d 1/6] vkd3d-shader/hlsl: Write SM1 max instructions.
by Zebediah Figura 17 Sep '21

17 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm1.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index b9a681a45..d56b6894a 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -632,6 +632,10 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b write_sm1_binary_op(ctx, buffer, D3DSIO_ADD, &instr->reg, &arg1->reg, &arg2->reg); break; + case HLSL_OP2_MAX: + write_sm1_binary_op(ctx, buffer, D3DSIO_MAX, &instr->reg, &arg1->reg, &arg2->reg); + break; + case HLSL_OP2_MUL: write_sm1_binary_op(ctx, buffer, D3DSIO_MUL, &instr->reg, &arg1->reg, &arg2->reg); break; -- 2.33.0

5 24

[PATCH vkd3d v2] vkd3d: Do not attempt to enable primitive restart for non-strip topology.
by Conor McCarthy 17 Sep '21

17 Sep '21

Prevents a validation failure if a d3d12 strip cut value is supplied. Based on a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v2: Also handle topologies with adjacency (currently not used in vkd3d). --- libs/vkd3d/state.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 4eccf1e3..9e554b44 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2762,6 +2762,23 @@ static enum VkPrimitiveTopology vk_topology_from_d3d12_topology(D3D12_PRIMITIVE_ } } +static bool vk_topology_can_restart(VkPrimitiveTopology topology) +{ + switch (topology) + { + case VK_PRIMITIVE_TOPOLOGY_LINE_LIST: + case VK_PRIMITIVE_TOPOLOGY_LINE_LIST_WITH_ADJACENCY: + case VK_PRIMITIVE_TOPOLOGY_PATCH_LIST: + case VK_PRIMITIVE_TOPOLOGY_POINT_LIST: + case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST: + case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST_WITH_ADJACENCY: + return false; + + default: + return true; + } +} + static VkPipeline d3d12_pipeline_state_find_compiled_pipeline(const struct d3d12_pipeline_state *state, const struct vkd3d_pipeline_key *key, VkRenderPass *vk_render_pass) { @@ -2938,7 +2955,8 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta ia_desc.pNext = NULL; ia_desc.flags = 0; ia_desc.topology = vk_topology_from_d3d12_topology(topology); - ia_desc.primitiveRestartEnable = !!graphics->index_buffer_strip_cut_value; + ia_desc.primitiveRestartEnable = graphics->index_buffer_strip_cut_value + && vk_topology_can_restart(ia_desc.topology); if (ia_desc.topology == VK_PRIMITIVE_TOPOLOGY_MAX_ENUM) { -- 2.32.0

2 1

[PATCH 1/6] oleaut32/tests: Remove unused variable.
by Nikolay Sivov 17 Sep '21

17 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/tests/tmarshal.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 4e9a8baeca0..1e75a93ebce 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -30,9 +30,6 @@ #include "tmarshal.h" -static HRESULT (WINAPI *pVarAdd)(LPVARIANT,LPVARIANT,LPVARIANT); - - #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) static inline void release_iface_(unsigned int line, void *iface) { @@ -3747,8 +3744,6 @@ static void test_marshal_dispinterface(void) START_TEST(tmarshal) { HRESULT hr; - HANDLE hOleaut32 = GetModuleHandleA("oleaut32.dll"); - pVarAdd = (void*)GetProcAddress(hOleaut32, "VarAdd"); CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); -- 2.33.0

2 7

[PATCH 1/3] wined3d: Test if a nudge is needed to get the correct filling convention.
by Stefan Dösinger 17 Sep '21

17 Sep '21

This fixes stray lines in GameFace GUIs, e.g. in World of Tanks. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- The ddraw tests started succeeding in the todo block for a few of the tested pixels. I looked at the output results and I don't think it happened because the Z values are more precise now. I think a few bits flipped (in the random readback we get) and now a few of those tests were inside the expected diff. --- dlls/d3d11/tests/d3d11.c | 1 - dlls/ddraw/tests/ddraw4.c | 6 +- dlls/ddraw/tests/ddraw7.c | 6 +- dlls/wined3d/adapter_gl.c | 40 +++++++++++ dlls/wined3d/state.c | 3 +- dlls/wined3d/utils.c | 127 +++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 13 +++- 7 files changed, 176 insertions(+), 20 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ae3020e130d..e08408b4884 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28155,7 +28155,6 @@ static void test_fractional_viewports(void) ok(compare_float(v->x, expected.x, 0) && compare_float(v->y, expected.y, 0), "Got fragcoord {%.8e, %.8e}, expected {%.8e, %.8e} at (%u, %u), offset %.8e.\n", v->x, v->y, expected.x, expected.y, x, y, viewport_offsets[i]); - todo_wine ok(compare_float(v->z, expected.z, 2) && compare_float(v->w, expected.w, 2), "Got texcoord {%.8e, %.8e}, expected {%.8e, %.8e} at (%u, %u), offset %.8e.\n", v->z, v->w, expected.z, expected.w, x, y, viewport_offsets[i]); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 6b514b15e25..4f052256882 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16118,8 +16118,10 @@ static void test_depth_readback(void) /* The ddraw4 version of this test behaves similarly to the ddraw7 version on Nvidia GPUs, * except that Geforce 7 also returns garbage data in D24S8, whereas the ddraw7 version * returns 0 for that format. Give up on pre-filtering formats, accept Nvidia as generally - * broken here, but still expect at least one format (D16 or D24X8 in practise) to pass. */ - todo_wine_if(tests[i].todo) + * broken here, but still expect at least one format (D16 or D24X8 in practise) to pass. + * + * Some of the tested places pass on some GPUs on Wine by accident. */ + todo_wine_if(tests[i].todo && !compare_uint(expected_depth, depth, max_diff)) ok(compare_uint(expected_depth, depth, max_diff) || ddraw_is_nvidia(ddraw), "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", i, depth, expected_depth - depth, expected_depth, max_diff, x, y); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 4c42d6f4b64..4402f2d93b5 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15597,8 +15597,10 @@ static void test_depth_readback(void) * Geforce GTX 650 has working D16 and D24, but D24S8 returns 0. * * Arx Fatalis is broken on the Geforce 9 in the same way it was broken in Wine (bug 43654). - * The !tests[i].s_depth is supposed to rule out D16 on GF9 and D24X8 on GF7. */ - todo_wine_if(tests[i].todo) + * The !tests[i].s_depth is supposed to rule out D16 on GF9 and D24X8 on GF7. + * + * Some of the tested places pass on some GPUs on Wine by accident. */ + todo_wine_if(tests[i].todo && !compare_uint(expected_depth, depth, max_diff)) ok(compare_uint(expected_depth, depth, max_diff) || (ddraw_is_nvidia(ddraw) && (all_zero || all_one || !tests[i].s_depth)), "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 902b9620f30..72f46693274 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5130,6 +5130,7 @@ static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_ d3d_info->full_ffp_varyings = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_FULL_FFP_VARYINGS); d3d_info->scaled_resolve = !!gl_info->supported[EXT_FRAMEBUFFER_MULTISAMPLE_BLIT_SCALED]; d3d_info->feature_level = feature_level_from_caps(gl_info, &shader_caps, &fragment_caps); + d3d_info->filling_convention_nudge = gl_info->filling_convention_nudge; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; @@ -5137,6 +5138,43 @@ static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_ d3d_info->multisample_draw_location = WINED3D_LOCATION_RB_MULTISAMPLE; } +static float wined3d_adapter_find_fill_nudge(struct wined3d_caps_gl_ctx *ctx) +{ + static const float test_array[] = + { + 0.0f, + -1.0f / 1024.0f, + -1.0f / 512.0f, + -1.0f / 256.0f, + -1.0f / 128.0f, + -1.0f / 64.0f /* Accept this without a warning if it gets the right result. */ + }; + /* This value was used unconditionally before the dynamic test function was + * introduced. */ + static const float no_clue = -1.0f / 64.0f; + unsigned int i; + float value; + + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) + return no_clue; + + for (i = 0; i < ARRAY_SIZE(test_array); ++i) + { + value = test_array[i]; + if (wined3d_caps_gl_ctx_test_filling_convention(ctx, value)) + { + if (value) + WARN("Using a filling convention fixup nudge of -1/%f\n", -1.0f / value); + else + TRACE("No need for a filling convetion nudge.\n"); + return value; + } + } + + FIXME("Did not find a way to get the filling convention we want.\n"); + return no_clue; +} + static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, unsigned int ordinal, unsigned int wined3d_creation_flags) { @@ -5222,6 +5260,8 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, return FALSE; } + gl_info->filling_convention_nudge = wined3d_adapter_find_fill_nudge(&caps_gl_ctx); + wined3d_adapter_gl_init_d3d_info(adapter_gl, wined3d_creation_flags); if (!adapter_gl->a.d3d_info.shader_color_key) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8316269afcf..5c1c69fb650 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4233,13 +4233,14 @@ static void viewport_miscpart_cc(struct wined3d_context *context, const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; /* See get_projection_matrix() in utils.c for a discussion about those values. */ float pixel_center_offset = context->d3d_info->wined3d_creation_flags - & WINED3D_PIXEL_CENTER_INTEGER ? 63.0f / 128.0f : -1.0f / 128.0f; + & WINED3D_PIXEL_CENTER_INTEGER ? 0.5f : 0.0f; struct wined3d_viewport vp[WINED3D_MAX_VIEWPORTS]; GLdouble depth_ranges[2 * WINED3D_MAX_VIEWPORTS]; GLfloat viewports[4 * WINED3D_MAX_VIEWPORTS]; unsigned int i, reset_count = 0; float min_z, max_z; + pixel_center_offset += context->d3d_info->filling_convention_nudge / 2.0f; get_viewports(context, state, state->viewport_count, vp); GL_EXTCALL(glClipControl(context->render_offscreen ? GL_UPPER_LEFT : GL_LOWER_LEFT, GL_ZERO_TO_ONE)); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4019dd4d812..38704db2f35 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3928,6 +3928,105 @@ BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx return TRUE; } +BOOL wined3d_caps_gl_ctx_test_filling_convention(struct wined3d_caps_gl_ctx *ctx, float nudge) +{ + static const struct wined3d_color red = {1.0f, 0.0f, 0.0f, 1.0f}; + const struct wined3d_gl_info *gl_info = ctx->gl_info; + GLuint texture, fbo; + DWORD readback[8][8]; + unsigned int x, y; + + /* This is a very simple test to find out how GL handles pixel edges: + * Draw a quad exactly between 4 pixels in an 8x8 viewport and see + * which pixel it ends up in. So far we've seen top left and bottom + * left conventions. This test may produce unexpected results if the + * driver forces multisampling on us. + * + * If we find a bottom-left filling behavior we also nudge the x axis + * by the same amount. This is necessary to keep diagonals that go + * through the pixel center intact. + * + * Note that we are ignoring some settings that might influence the + * driver: How we switch GL to a upper-left coordinate system, if we + * are drawing into the on-screen framebuffer (we don't have one here + * because our window is hidden), shaders vs fixed function GL. + * Testing these isn't possible with the current draw_test_quad() + * infrastructure. + * + * The minimum nudge also depends on the viewport size, although + * the relation between those two is GPU dependent and not exactly + * sensible. E.g. a 8192x8192 viewport on a GeForce 9 needs at + * least a nudge of 1/240.9, whereas a 8x8 one needs 1/255.982; + * 32x32 needs 1/255.935. 4x4 and lower are happy with something + * below 1/256. The 8x8 size below has been arbitrarily chosen to + * get a useful result out of that card and avoid allocating a + * gigantic texture during library init. + * + * Newer cards usually do the right thing anyway. In cases where + * they do not (e.g. Radeon GPUs in a macbookpro14,3 running MacOS) + * a nudge of 1/2^20 is enough. */ + const struct wined3d_vec3 edge_geometry[] = + { + {(-1.0f + nudge) / 8.0f, (-1.0f + nudge) / 8.0f, 0.0f}, + {( 1.0f + nudge) / 8.0f, (-1.0f + nudge) / 8.0f, 0.0f}, + {(-1.0f + nudge) / 8.0f, ( 1.0f + nudge) / 8.0f, 0.0f}, + {( 1.0f + nudge) / 8.0f, ( 1.0f + nudge) / 8.0f, 0.0f}, + }; + + gl_info->gl_ops.gl.p_glGenTextures(1, &texture); + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, texture); + gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); + gl_info->gl_ops.gl.p_glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 8, 8, 0, + GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL); + gl_info->fbo_ops.glGenFramebuffers(1, &fbo); + gl_info->fbo_ops.glBindFramebuffer(GL_FRAMEBUFFER, fbo); + gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, + GL_TEXTURE_2D, texture, 0); + checkGLcall("create resources"); + + gl_info->gl_ops.gl.p_glViewport(0, 0, 8, 8); + gl_info->gl_ops.gl.p_glClearColor(0.0f, 0.0f, 1.0f, 1.0f); + gl_info->gl_ops.gl.p_glClear(GL_COLOR_BUFFER_BIT); + + draw_test_quad(ctx, edge_geometry, &red); + checkGLcall("draw"); + + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, texture); + gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_2D, 0, + GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, readback); + checkGLcall("readback"); + + gl_info->gl_ops.gl.p_glDeleteTextures(1, &texture); + gl_info->fbo_ops.glDeleteFramebuffers(1, &fbo); + gl_info->fbo_ops.glBindFramebuffer(GL_FRAMEBUFFER, 0); + checkGLcall("delete resources"); + + if (readback[3][3] == 0xffff0000 && readback[3][4] == 0xff0000ff + && readback[4][3] == 0xff0000ff && readback[4][4] == 0xff0000ff) + { + TRACE("Got the expected filling result.\n"); + return TRUE; + } + else if (readback[3][3] == 0xff0000ff && readback[3][4] == 0xff0000ff + && readback[4][3] == 0xffff0000 && readback[4][4] == 0xff0000ff) + { + WARN("GPU uses a bottom-left filling convention in FBOs.\n"); + return FALSE; + } + + FIXME("Unexpected filling convention test result\n"); + + for (y = 0; y < ARRAY_SIZE(readback); ++y) + { + for (x = 0; x < ARRAY_SIZE(readback[0]); ++x) + { + FIXME("0x%08x ", readback[y][x]); + } + FIXME("\n"); + } + + return FALSE; +} static float wined3d_adapter_find_polyoffset_scale(struct wined3d_caps_gl_ctx *ctx, GLenum format) { const struct wined3d_gl_info *gl_info = ctx->gl_info; @@ -5540,22 +5639,26 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w * - We need to flip along the y-axis in case of offscreen rendering. * - OpenGL Z range is {-Wc,...,Wc} while D3D Z range is {0,...,Wc}. * - <= D3D9 coordinates refer to pixel centers while GL coordinates - * refer to pixel corners. - * - D3D has a top-left filling convention. We need to maintain this - * even after the y-flip mentioned above. - * In order to handle the last two points, we translate by - * (63.0 / 128.0) / VPw and (63.0 / 128.0) / VPh. This is equivalent to - * translating slightly less than half a pixel. We want the difference to - * be large enough that it doesn't get lost due to rounding inside the - * driver, but small enough to prevent it from interfering with any - * anti-aliasing. */ + * refer to pixel corners. D3D10 fixed this particular oddity. + * - D3D has a top-left filling convention while GL does not specify + * a particular behavior, other than that that the GL implementation + * needs to be consistent. + * + * In order to handle the pixel center, we translate by 0.5 / VPw and + * 0.5 / VPh. We test the filling convention during adapter init and + * add a small offset to correct it if necessary. See + * wined3d_caps_gl_ctx_test_filling_convention for more details on how + * we test GL and considerations regarding the added nudge value. + * + * If we have GL_ARB_clip_control we take care of all this through + * viewport properties and don't have to translate geometry. */ clip_control = d3d_info->clip_control; flip = !clip_control && context->render_offscreen; - if (!clip_control && d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) - center_offset = 63.0f / 64.0f; + if (!clip_control) + center_offset = 1.0f + d3d_info->filling_convention_nudge; else - center_offset = -1.0f / 64.0f; + center_offset = 0.0f; if (context->last_was_rhw) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86c053df0db..f305829475e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -242,6 +242,8 @@ struct wined3d_d3d_info enum wined3d_feature_level feature_level; DWORD multisample_draw_location; + + float filling_convention_nudge; }; static const struct color_fixup_desc COLOR_FIXUP_IDENTITY = @@ -3239,6 +3241,7 @@ struct wined3d_gl_info DWORD quirks; BOOL supported[WINED3D_GL_EXT_COUNT]; GLint wrap_lookup[WINED3D_TADDRESS_MIRROR_ONCE - WINED3D_TADDRESS_WRAP + 1]; + float filling_convention_nudge; HGLRC (WINAPI *p_wglCreateContextAttribsARB)(HDC dc, HGLRC share, const GLint *attribs); struct opengl_funcs gl_ops; @@ -3487,6 +3490,7 @@ BOOL wined3d_adapter_vk_init_format_info(struct wined3d_adapter_vk *adapter_vk, UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) DECLSPEC_HIDDEN; BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; +BOOL wined3d_caps_gl_ctx_test_filling_convention(struct wined3d_caps_gl_ctx *ctx, float nudge) DECLSPEC_HIDDEN; void install_gl_compat_wrapper(struct wined3d_gl_info *gl_info, enum wined3d_gl_extension ext) DECLSPEC_HIDDEN; @@ -5660,10 +5664,15 @@ static inline void shader_get_position_fixup(const struct wined3d_context *conte float center_offset; unsigned int i; + /* See get_projection_matrix() in utils.c for a discussion of the position fixup. + * This function here also applies to d3d10+ which does not need adjustment for + * integer pixel centers, but it may need the filling convention nudge. */ if (context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) - center_offset = 63.0f / 64.0f; + center_offset = 1.0f; else - center_offset = -1.0f / 64.0f; + center_offset = 0.0f; + + center_offset += context->d3d_info->filling_convention_nudge; for (i = 0; i < fixup_count; ++i) { -- 2.32.0

4 6

[PATCH] mfplat/allocator: Reduce duplication by returning ready-to-queue structure from allocation helper.
by Nikolay Sivov 17 Sep '21

17 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/sample.c | 53 ++++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index d99e2b046a6..04c68c87199 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -1305,20 +1305,18 @@ static void sample_allocator_release_surface_service(struct sample_allocator *al } static HRESULT sample_allocator_allocate_sample(struct sample_allocator *allocator, const struct surface_service *service, - IMFSample **sample) + struct queued_sample **queued_sample) { - struct queued_sample *queued_sample = malloc(sizeof(*queued_sample)); IMFTrackedSample *tracked_sample; IMFMediaBuffer *buffer; + IMFSample *sample; unsigned int i; HRESULT hr; if (FAILED(hr = MFCreateTrackedSample(&tracked_sample))) - { return hr; - } - IMFTrackedSample_QueryInterface(tracked_sample, &IID_IMFSample, (void **)sample); + IMFTrackedSample_QueryInterface(tracked_sample, &IID_IMFSample, (void **)&sample); IMFTrackedSample_Release(tracked_sample); for (i = 0; i < allocator->frame_desc.buffer_count; ++i) @@ -1369,11 +1367,24 @@ static HRESULT sample_allocator_allocate_sample(struct sample_allocator *allocat if (SUCCEEDED(hr)) { - hr = IMFSample_AddBuffer(*sample, buffer); + hr = IMFSample_AddBuffer(sample, buffer); IMFMediaBuffer_Release(buffer); } } + if (FAILED(hr)) + { + IMFSample_Release(sample); + return hr; + } + + if (!(*queued_sample = malloc(sizeof(**queued_sample)))) + { + IMFSample_Release(sample); + return E_OUTOFMEMORY; + } + (*queued_sample)->sample = sample; + return hr; } @@ -1381,11 +1392,11 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u unsigned int max_sample_count, IMFAttributes *attributes, IMFMediaType *media_type) { struct surface_service service; + struct queued_sample *sample; DXGI_FORMAT dxgi_format; unsigned int i, value; GUID major, subtype; UINT64 frame_size; - IMFSample *sample; D3D11_USAGE usage; HRESULT hr; @@ -1458,13 +1469,9 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u for (i = 0; i < sample_count; ++i) { - struct queued_sample *queued_sample; - if (SUCCEEDED(hr = sample_allocator_allocate_sample(allocator, &service, &sample))) { - queued_sample = malloc(sizeof(*queued_sample)); - queued_sample->sample = sample; - list_add_tail(&allocator->free_samples, &queued_sample->entry); + list_add_tail(&allocator->free_samples, &sample->entry); allocator->free_sample_count++; } } @@ -1512,7 +1519,7 @@ static HRESULT sample_allocator_track_sample(struct sample_allocator *allocator, static HRESULT WINAPI sample_allocator_AllocateSample(IMFVideoSampleAllocatorEx *iface, IMFSample **out) { struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocatorEx(iface); - IMFSample *sample; + struct queued_sample *sample; HRESULT hr; TRACE("%p, %p.\n", iface, out); @@ -1527,9 +1534,9 @@ static HRESULT WINAPI sample_allocator_AllocateSample(IMFVideoSampleAllocatorEx { struct list *head = list_head(&allocator->free_samples); - sample = LIST_ENTRY(head, struct queued_sample, entry)->sample; + sample = LIST_ENTRY(head, struct queued_sample, entry); - if (SUCCEEDED(hr = sample_allocator_track_sample(allocator, sample))) + if (SUCCEEDED(hr = sample_allocator_track_sample(allocator, sample->sample))) { list_remove(head); list_add_tail(&allocator->used_samples, head); @@ -1538,7 +1545,7 @@ static HRESULT WINAPI sample_allocator_AllocateSample(IMFVideoSampleAllocatorEx /* Reference counter is not increased when sample is returned, so next release could trigger tracking condition. This is balanced by incremented reference counter when sample is returned back to the free list. */ - *out = sample; + *out = sample->sample; } } else /* allocator->cold_sample_count != 0 */ @@ -1549,15 +1556,17 @@ static HRESULT WINAPI sample_allocator_AllocateSample(IMFVideoSampleAllocatorEx { if (SUCCEEDED(hr = sample_allocator_allocate_sample(allocator, &service, &sample))) { - if (SUCCEEDED(hr = sample_allocator_track_sample(allocator, sample))) + if (SUCCEEDED(hr = sample_allocator_track_sample(allocator, sample->sample))) { - struct queued_sample *queued_sample = malloc(sizeof(*queued_sample)); - - queued_sample->sample = sample; - list_add_tail(&allocator->used_samples, &queued_sample->entry); + list_add_tail(&allocator->used_samples, &sample->entry); allocator->cold_sample_count--; - *out = queued_sample->sample; + *out = sample->sample; + } + else + { + IMFSample_Release(sample->sample); + free(sample); } } -- 2.33.0

1 0

[PATCH] adsldp: Fix error returned from openobj_OpenDSObject().
by Hans Leidekker 17 Sep '21

17 Sep '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/adsldp/adsldp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 701f27cd969..3d5ea29882c 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -990,7 +990,7 @@ static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, B err = DsGetDcNameW(NULL, NULL, NULL, NULL, DS_RETURN_DNS_NAME, &dcinfo); if (err != ERROR_SUCCESS) { - hr = HRESULT_FROM_WIN32(LdapGetLastError()); + hr = HRESULT_FROM_WIN32(err); goto fail; } -- 2.30.2

1 0

[PATCH 2/2] include: Allow compiling with C++
by Alistair Leslie-Hughes 17 Sep '21

17 Sep '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/sapi.idl | 127 ++++++++++++++++++++++++----------------------- 1 file changed, 64 insertions(+), 63 deletions(-) diff --git a/include/sapi.idl b/include/sapi.idl index 5120e379450..c90d5ec145b 100644 --- a/include/sapi.idl +++ b/include/sapi.idl @@ -517,6 +517,7 @@ interface ISpEventSource; interface ISpRecoContext; interface ISpRecognizer; interface ISpStreamFormat; +interface ISpVoice; [ object, @@ -837,69 +838,6 @@ interface ISpNotifySink : IUnknown HRESULT Notify(void); } -[ - object, - uuid(6c44df74-72b9-4992-a1ec-ef996e0422d4), - pointer_default(unique), - restricted -] -interface ISpVoice : ISpEventSource -{ - HRESULT SetOutput([in] IUnknown *unk, [in] BOOL changes); - HRESULT GetOutputObjectToken([out] ISpObjectToken **token); - HRESULT GetOutputStream([out] ISpStreamFormat **stream); - - HRESULT Pause(void); - HRESULT Resume(void); - - HRESULT SetVoice([in] ISpObjectToken *token); - HRESULT GetVoice([out] ISpObjectToken **token); - - HRESULT Speak([in, string] const WCHAR *pwcs, - [in] DWORD flags, - [out] ULONG *number); - HRESULT SpeakStream([in] IStream *stream, - [in] DWORD flags, - [out] ULONG *number); - - HRESULT GetStatus( - [out] SPVOICESTATUS *status, - [out, string] WCHAR **bookmark); - - HRESULT Skip([in,string] const WCHAR *type, [in] long items, [out] ULONG *skipped); - - HRESULT SetPriority([in] SPVPRIORITY priority); - HRESULT GetPriority([out] SPVPRIORITY* priority); - - HRESULT SetAlertBoundary([in] SPEVENTENUM boundary); - HRESULT GetAlertBoundary([out] SPEVENTENUM* boundary); - - HRESULT SetRate([in] long adjust); - HRESULT GetRate([out] long *adjust); - - HRESULT SetVolume([in] USHORT volume); - HRESULT GetVolume([out] USHORT *volume); - - HRESULT WaitUntilDone([in] ULONG timeout); - - HRESULT SetSyncSpeakTimeout([in] ULONG timeout); - HRESULT GetSyncSpeakTimeout([out] ULONG *timeout); - - [local] HANDLE SpeakCompleteEvent(); - - [local] HRESULT IsUISupported( - [in] const WCHAR *type, - [in] void * extra, - [in] ULONG count, - [out] BOOL *supported); - [local] HRESULT DisplayUI( - [in] HWND parent, - [in] const WCHAR *title, - [in] const WCHAR *type, - [in] void *extra, - [in] ULONG count); -}; - [ object, uuid(5eff4aef-8487-11d2-961c-00c04f8ee628), @@ -982,6 +920,69 @@ interface ISpRecoContext : ISpEventSource HRESULT GetContextState([in] SPCONTEXTSTATE *state); }; +[ + object, + uuid(6c44df74-72b9-4992-a1ec-ef996e0422d4), + pointer_default(unique), + restricted +] +interface ISpVoice : ISpEventSource +{ + HRESULT SetOutput([in] IUnknown *unk, [in] BOOL changes); + HRESULT GetOutputObjectToken([out] ISpObjectToken **token); + HRESULT GetOutputStream([out] ISpStreamFormat **stream); + + HRESULT Pause(void); + HRESULT Resume(void); + + HRESULT SetVoice([in] ISpObjectToken *token); + HRESULT GetVoice([out] ISpObjectToken **token); + + HRESULT Speak([in, string] const WCHAR *pwcs, + [in] DWORD flags, + [out] ULONG *number); + HRESULT SpeakStream([in] IStream *stream, + [in] DWORD flags, + [out] ULONG *number); + + HRESULT GetStatus( + [out] SPVOICESTATUS *status, + [out, string] WCHAR **bookmark); + + HRESULT Skip([in,string] const WCHAR *type, [in] long items, [out] ULONG *skipped); + + HRESULT SetPriority([in] SPVPRIORITY priority); + HRESULT GetPriority([out] SPVPRIORITY* priority); + + HRESULT SetAlertBoundary([in] SPEVENTENUM boundary); + HRESULT GetAlertBoundary([out] SPEVENTENUM* boundary); + + HRESULT SetRate([in] long adjust); + HRESULT GetRate([out] long *adjust); + + HRESULT SetVolume([in] USHORT volume); + HRESULT GetVolume([out] USHORT *volume); + + HRESULT WaitUntilDone([in] ULONG timeout); + + HRESULT SetSyncSpeakTimeout([in] ULONG timeout); + HRESULT GetSyncSpeakTimeout([out] ULONG *timeout); + + [local] HANDLE SpeakCompleteEvent(); + + [local] HRESULT IsUISupported( + [in] const WCHAR *type, + [in] void * extra, + [in] ULONG count, + [out] BOOL *supported); + [local] HRESULT DisplayUI( + [in] HWND parent, + [in] const WCHAR *title, + [in] const WCHAR *type, + [in] void *extra, + [in] ULONG count); +}; + [ object, uuid(bed530be-2606-4f4d-a1c0-54c5cda5566f), -- 2.33.0

1 0

[PATCH 1/2] include: avoid C++ keyword
by Alistair Leslie-Hughes 17 Sep '21

17 Sep '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/sapiaut.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sapiaut.idl b/include/sapiaut.idl index 94ac72a2099..775a778f85f 100644 --- a/include/sapiaut.idl +++ b/include/sapiaut.idl @@ -463,7 +463,7 @@ interface ISpeechObjectToken : IDispatch [out,retval] BSTR* path); [hidden, id(DISPID_SOTRemoveStorageFileName)] - HRESULT RemoveStorageFileName([in] BSTR clsid, [in]BSTR key, [in] VARIANT_BOOL delete); + HRESULT RemoveStorageFileName([in] BSTR clsid, [in]BSTR key, [in] VARIANT_BOOL remove); [hidden, id(DISPID_SOTIsUISupported)] HRESULT IsUISupported( [in]const BSTR type, [in, defaultvalue(NULL)] const VARIANT *data, -- 2.33.0

1 0

[PATCH 0/9] Sixth step for Dwarf3/4 support in dbghelp
by Eric Pouech 17 Sep '21

17 Sep '21

The following series implements: - fixes and dwarf4 evolutions for function range computation - support for a few more dwarf types (restrict, rvalue ref, subrange) A+ --- Eric Pouech (9): dbghelp/dwarf: in DW_AT_ranges, the values are relative to the start of the CU dbghelp/dwarf: properly detect base address selection in AT_ranges dbghelp: removed unneeded #include <limits.h> dbghelp/dwarf: dwarf4 integrates some tweaks in high / low pc attritbutes dbghelp/dwarf: Added support for parsing dwarf's 3 restrict type TAG dbghelp/dwarf: Support enumeration as index type for arrays dbghelp/dwarf: Added support for DW_TAG_subrange_type in various places dbghelp/dwarf: Support more dwarf's TAG related to types in udt parsing dbghelp/dwarf: Handle C++ rvalue reference type as a reference dlls/dbghelp/dwarf.c | 107 ++++++++++++++++++++++++++++++++++++++++-- dlls/dbghelp/stabs.c | 1 - dlls/dbghelp/symbol.c | 1 - 3 files changed, 102 insertions(+), 7 deletions(-)

1 9

[PATCH 1/6] dinput: Fire the notification only after all events have been queued.
by Rémi Bernon 17 Sep '21

17 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/device.c | 3 --- dlls/dinput/joystick_hid.c | 2 ++ dlls/dinput/joystick_linux.c | 3 +++ dlls/dinput/joystick_linuxinput.c | 3 +++ dlls/dinput/joystick_osx.c | 6 ++++++ dlls/dinput/keyboard.c | 1 + dlls/dinput/mouse.c | 16 ++++++++++++++++ 7 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index e04d40e5a7c..17eaff69d50 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -986,9 +986,6 @@ void queue_event( IDirectInputDevice8W *iface, int inst_id, DWORD data, DWORD ti int next_pos, ofs = id_to_offset(&This->data_format, inst_id); ULONGLONG time_ms = GetTickCount64(); - /* Event is being set regardless of the queue state */ - if (This->hEvent) SetEvent(This->hEvent); - if (time_ms - notify_ms > 1000) { PostMessageW(GetDesktopWindow(), WM_WINE_NOTIFY_ACTIVITY, 0, 0); diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 3ef6f0db9cc..709953be8f0 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -908,6 +908,8 @@ static HRESULT hid_joystick_read_state( IDirectInputDevice8W *iface ) enum_value_objects( impl, &filter, DIDFT_ALL, read_device_state_value, &params ); enum_button_objects( impl, &filter, DIDFT_ALL, check_device_state_button, &params ); + if (memcmp( &params.old_state, &impl->state, sizeof(impl->state) ) && impl->base.hEvent) + SetEvent( impl->base.hEvent ); } memset( &impl->read_ovl, 0, sizeof(impl->read_ovl) ); diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 3a8b0f07704..c439cca81c3 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -777,7 +777,10 @@ static void joy_polldev( IDirectInputDevice8W *iface ) } } if (inst_id >= 0) + { queue_event(iface, inst_id, value, GetCurrentTime(), This->generic.base.dinput->evsequence++); + if (This->generic.base.hEvent) SetEvent( This->generic.base.hEvent ); + } } } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 27dd75a8b55..8279ffbf74a 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -806,8 +806,11 @@ static void joy_polldev( IDirectInputDevice8W *iface ) break; } if (inst_id >= 0) + { queue_event(iface, inst_id, value, GetCurrentTime(), This->generic.base.dinput->evsequence++); + if (This->generic.base.hEvent) SetEvent( This->generic.base.hEvent ); + } } } diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 62a063b6da1..e8732bd696c 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -840,6 +840,8 @@ static void poll_osx_device_state( IDirectInputDevice8W *iface ) { inst_id = DIDFT_MAKEINSTANCE(button_idx) | DIDFT_PSHBUTTON; queue_event(iface,inst_id,newVal,GetCurrentTime(),device->generic.base.dinput->evsequence++); + if (device->generic.base.hEvent) + SetEvent( device->generic.base.hEvent ); } button_idx ++; } @@ -870,6 +872,8 @@ static void poll_osx_device_state( IDirectInputDevice8W *iface ) { inst_id = DIDFT_MAKEINSTANCE(pov_idx) | DIDFT_POV; queue_event(iface,inst_id,newVal,GetCurrentTime(),device->generic.base.dinput->evsequence++); + if (device->generic.base.hEvent) + SetEvent( device->generic.base.hEvent ); } pov_idx ++; break; @@ -947,6 +951,8 @@ static void poll_osx_device_state( IDirectInputDevice8W *iface ) { inst_id = DIDFT_MAKEINSTANCE(wine_obj) | DIDFT_ABSAXIS; queue_event(iface,inst_id,newVal,GetCurrentTime(),device->generic.base.dinput->evsequence++); + if (device->generic.base.hEvent) + SetEvent( device->generic.base.hEvent ); } break; diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 5d532ab8059..3e1cac1733f 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -127,6 +127,7 @@ int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lpa EnterCriticalSection(&This->base.crit); queue_event(iface, DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON, new_diks, GetCurrentTime(), This->base.dinput->evsequence++); + if (This->base.hEvent) SetEvent( This->base.hEvent ); LeaveCriticalSection(&This->base.crit); return ret; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 9f696cb414a..0ab791c69a5 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -234,6 +234,7 @@ void dinput_mouse_rawinput_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPA POINT rel, pt; DWORD seq; int i, wdata = 0; + BOOL notify = FALSE; static const USHORT mouse_button_flags[] = { @@ -277,12 +278,18 @@ void dinput_mouse_rawinput_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPA } if (rel.x) + { queue_event( iface, DIDFT_MAKEINSTANCE(WINE_MOUSE_X_AXIS_INSTANCE) | DIDFT_RELAXIS, pt.x, GetCurrentTime(), seq ); + notify = TRUE; + } if (rel.y) + { queue_event( iface, DIDFT_MAKEINSTANCE(WINE_MOUSE_Y_AXIS_INSTANCE) | DIDFT_RELAXIS, pt.y, GetCurrentTime(), seq ); + notify = TRUE; + } if (rel.x || rel.y) { @@ -296,6 +303,7 @@ void dinput_mouse_rawinput_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPA This->m_state.lZ += (wdata = (SHORT)ri->data.mouse.usButtonData); queue_event( iface, DIDFT_MAKEINSTANCE(WINE_MOUSE_Z_AXIS_INSTANCE) | DIDFT_RELAXIS, wdata, GetCurrentTime(), seq ); + notify = TRUE; } for (i = 0; i < ARRAY_SIZE(mouse_button_flags); ++i) @@ -305,9 +313,11 @@ void dinput_mouse_rawinput_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPA This->m_state.rgbButtons[i / 2] = 0x80 - (i % 2) * 0x80; queue_event( iface, DIDFT_MAKEINSTANCE(WINE_MOUSE_BUTTONS_INSTANCE +(i / 2) ) | DIDFT_PSHBUTTON, This->m_state.rgbButtons[i / 2], GetCurrentTime(), seq ); + notify = TRUE; } } + if (notify && This->base.hEvent) SetEvent( This->base.hEvent ); LeaveCriticalSection( &This->base.crit ); } @@ -317,6 +327,7 @@ int dinput_mouse_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lparam MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam; SysMouseImpl *This = impl_from_IDirectInputDevice8W( iface ); int wdata = 0, inst_id = -1, ret = 0; + BOOL notify = FALSE; TRACE("msg %lx @ (%d %d)\n", wparam, hook->pt.x, hook->pt.y); @@ -347,8 +358,11 @@ int dinput_mouse_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lparam { /* Already have X, need to queue it */ if (inst_id != -1) + { queue_event(iface, inst_id, wdata, GetCurrentTime(), This->base.dinput->evsequence); + notify = TRUE; + } inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_Y_AXIS_INSTANCE) | DIDFT_RELAXIS; wdata = pt1.y; } @@ -408,8 +422,10 @@ int dinput_mouse_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lparam _dump_mouse_state(&This->m_state); queue_event(iface, inst_id, wdata, GetCurrentTime(), This->base.dinput->evsequence++); + notify = TRUE; } + if (notify && This->base.hEvent) SetEvent( This->base.hEvent ); LeaveCriticalSection(&This->base.crit); return ret; } -- 2.33.0

2 7

[PATCH 1/5] hidparse.sys: Split struct hid_value_caps start_bit into start_byte / start_bit.
by Rémi Bernon 17 Sep '21

17 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This is the first part of a series to make Wine internal HID structures compatible (enough) with native. dlls/hid/hidp.c | 63 +++++++++++++++++++++++++++++----------- dlls/hidparse.sys/main.c | 16 +++++----- include/wine/hid.h | 3 +- 3 files changed, 57 insertions(+), 25 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index cd9de2148c2..a94e7b637ae 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -192,10 +192,13 @@ static NTSTATUS get_scaled_usage_value( const struct hid_value_caps *caps, void struct usage_value_params *params = user; ULONG unsigned_value = 0, bit_count = caps->bit_size * caps->report_count; LONG signed_value, *value = params->value_buf; + unsigned char *report_buf; if ((bit_count + 7) / 8 > sizeof(unsigned_value)) return HIDP_STATUS_BUFFER_TOO_SMALL; if (sizeof(LONG) > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; - copy_bits( (unsigned char *)&unsigned_value, params->report_buf, bit_count, -caps->start_bit ); + + report_buf = (unsigned char *)params->report_buf + caps->start_byte; + copy_bits( (unsigned char *)&unsigned_value, report_buf, bit_count, -caps->start_bit ); signed_value = sign_extend( unsigned_value, caps ); if (caps->logical_min > caps->logical_max || caps->physical_min > caps->physical_max) @@ -232,9 +235,14 @@ static NTSTATUS get_usage_value( const struct hid_value_caps *caps, void *user ) { struct usage_value_params *params = user; ULONG bit_count = caps->bit_size * caps->report_count; + unsigned char *report_buf; + if ((bit_count + 7) / 8 > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; memset( params->value_buf, 0, params->value_len ); - copy_bits( params->value_buf, params->report_buf, bit_count, -caps->start_bit ); + + report_buf = (unsigned char *)params->report_buf + caps->start_byte; + copy_bits( params->value_buf, report_buf, bit_count, -caps->start_bit ); + return HIDP_STATUS_NULL; } @@ -285,14 +293,17 @@ struct get_usage_params static NTSTATUS get_usage( const struct hid_value_caps *caps, void *user ) { struct get_usage_params *params = user; + unsigned char *report_buf; ULONG bit, last; BYTE index; + report_buf = (unsigned char *)params->report_buf + caps->start_byte; + if (HID_VALUE_CAPS_IS_ARRAY( caps )) { for (bit = caps->start_bit, last = bit + caps->report_count * caps->bit_size - 1; bit <= last; bit += 8) { - if (!(index = params->report_buf[bit / 8])) continue; + if (!(index = report_buf[bit / 8])) continue; if (params->usages < params->usages_end) *params->usages = caps->usage_min + index - caps->start_index; params->usages++; } @@ -301,7 +312,7 @@ static NTSTATUS get_usage( const struct hid_value_caps *caps, void *user ) for (bit = caps->start_bit, last = bit + caps->usage_max - caps->usage_min; bit <= last; ++bit) { - if (!(params->report_buf[bit / 8] & (1 << (bit % 8)))) continue; + if (!(report_buf[bit / 8] & (1 << (bit % 8)))) continue; if (params->usages < params->usages_end) *params->usages = caps->usage_min + bit - caps->start_bit; params->usages++; } @@ -384,6 +395,7 @@ static NTSTATUS set_scaled_usage_value( const struct hid_value_caps *caps, void { ULONG bit_count = caps->bit_size * caps->report_count; struct usage_value_params *params = user; + unsigned char *report_buf; LONG value, log_range, phy_range; if (caps->logical_min > caps->logical_max) return HIDP_STATUS_BAD_LOG_PHY_VALUES; @@ -404,7 +416,8 @@ static NTSTATUS set_scaled_usage_value( const struct hid_value_caps *caps, void value = caps->logical_min + value; } - copy_bits( params->report_buf, (unsigned char *)&value, bit_count, caps->start_bit ); + report_buf = (unsigned char *)params->report_buf + caps->start_byte; + copy_bits( report_buf, (unsigned char *)&value, bit_count, caps->start_bit ); return HIDP_STATUS_NULL; } @@ -431,8 +444,13 @@ static NTSTATUS set_usage_value( const struct hid_value_caps *caps, void *user ) { struct usage_value_params *params = user; ULONG bit_count = caps->bit_size * caps->report_count; + unsigned char *report_buf; + if ((bit_count + 7) / 8 > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; - copy_bits( params->report_buf, params->value_buf, bit_count, caps->start_bit ); + + report_buf = (unsigned char *)params->report_buf + caps->start_byte; + copy_bits( report_buf, params->value_buf, bit_count, caps->start_bit ); + return HIDP_STATUS_NULL; } @@ -481,14 +499,17 @@ struct set_usage_params static NTSTATUS set_usage( const struct hid_value_caps *caps, void *user ) { struct set_usage_params *params = user; + unsigned char *report_buf; ULONG bit, last; + report_buf = (unsigned char *)params->report_buf + caps->start_byte; + if (HID_VALUE_CAPS_IS_ARRAY( caps )) { for (bit = caps->start_bit, last = bit + caps->report_count * caps->bit_size - 1; bit <= last; bit += 8) { - if (params->report_buf[bit / 8]) continue; - params->report_buf[bit / 8] = caps->start_index + params->usage - caps->usage_min; + if (report_buf[bit / 8]) continue; + report_buf[bit / 8] = caps->start_index + params->usage - caps->usage_min; break; } @@ -497,7 +518,7 @@ static NTSTATUS set_usage( const struct hid_value_caps *caps, void *user ) } bit = caps->start_bit + params->usage - caps->usage_min; - params->report_buf[bit / 8] |= (1 << (bit % 8)); + report_buf[bit / 8] |= (1 << (bit % 8)); return HIDP_STATUS_NULL; } @@ -538,15 +559,18 @@ struct unset_usage_params static NTSTATUS unset_usage( const struct hid_value_caps *caps, void *user ) { struct unset_usage_params *params = user; + unsigned char *report_buf; ULONG bit, index, last; + report_buf = (unsigned char *)params->report_buf + caps->start_byte; + if (HID_VALUE_CAPS_IS_ARRAY( caps )) { for (bit = caps->start_bit, last = bit + caps->report_count * caps->bit_size - 1; bit <= last; bit += 8) { index = caps->start_index + params->usage - caps->usage_min; - if (params->report_buf[bit / 8] != index) continue; - params->report_buf[bit / 8] = 0; + if (report_buf[bit / 8] != index) continue; + report_buf[bit / 8] = 0; params->found = TRUE; break; } @@ -555,8 +579,8 @@ static NTSTATUS unset_usage( const struct hid_value_caps *caps, void *user ) } bit = caps->start_bit + params->usage - caps->usage_min; - if (params->report_buf[bit / 8] & (1 << (bit % 8))) params->found = TRUE; - params->report_buf[bit / 8] &= ~(1 << (bit % 8)); + if (report_buf[bit / 8] & (1 << (bit % 8))) params->found = TRUE; + report_buf[bit / 8] &= ~(1 << (bit % 8)); return HIDP_STATUS_NULL; } @@ -726,14 +750,17 @@ struct get_usage_and_page_params static NTSTATUS get_usage_and_page( const struct hid_value_caps *caps, void *user ) { struct get_usage_and_page_params *params = user; + unsigned char *report_buf; ULONG bit, last; BYTE index; + report_buf = (unsigned char *)params->report_buf + caps->start_byte; + if (HID_VALUE_CAPS_IS_ARRAY( caps )) { for (bit = caps->start_bit, last = bit + caps->report_count * caps->bit_size - 1; bit <= last; bit += 8) { - if (!(index = params->report_buf[bit / 8])) continue; + if (!(index = report_buf[bit / 8])) continue; if (params->usages < params->usages_end) { params->usages->UsagePage = caps->usage_page; @@ -746,7 +773,7 @@ static NTSTATUS get_usage_and_page( const struct hid_value_caps *caps, void *use for (bit = caps->start_bit, last = bit + caps->usage_max - caps->usage_min; bit <= last; bit++) { - if (!(params->report_buf[bit / 8] & (1 << (bit % 8)))) continue; + if (!(report_buf[bit / 8] & (1 << (bit % 8)))) continue; if (params->usages < params->usages_end) { params->usages->UsagePage = caps->usage_page; @@ -813,11 +840,13 @@ static NTSTATUS find_all_data( const struct hid_value_caps *caps, void *user ) struct find_all_data_params *params = user; HIDP_DATA *data = params->data, *data_end = params->data_end; ULONG bit, last, bit_count = caps->bit_size * caps->report_count; - char *report_buf = params->report_buf; + unsigned char *report_buf; BYTE index; if (!caps->bit_size) return HIDP_STATUS_SUCCESS; + report_buf = (unsigned char *)params->report_buf + caps->start_byte; + if (HID_VALUE_CAPS_IS_ARRAY( caps )) { for (bit = caps->start_bit, last = bit + caps->report_count * caps->bit_size - 1; bit <= last; bit += 8) @@ -851,7 +880,7 @@ static NTSTATUS find_all_data( const struct hid_value_caps *caps, void *user ) data->DataIndex = caps->data_index_min; data->RawValue = 0; if ((bit_count + 7) / 8 > sizeof(data->RawValue)) return HIDP_STATUS_BUFFER_TOO_SMALL; - copy_bits( (void *)&data->RawValue, (void *)report_buf, bit_count, -caps->start_bit ); + copy_bits( (void *)&data->RawValue, report_buf, bit_count, -caps->start_bit ); } data++; } diff --git a/dlls/hidparse.sys/main.c b/dlls/hidparse.sys/main.c index 3a57c338165..b7326f9fe4a 100644 --- a/dlls/hidparse.sys/main.c +++ b/dlls/hidparse.sys/main.c @@ -333,13 +333,13 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY USHORT *byte_size = state->byte_size[type]; USHORT *value_idx = state->value_idx[type]; USHORT *data_idx = state->data_idx[type]; - ULONG *bit_size = &state->bit_size[type][state->items.report_id]; + ULONG start_bit, *bit_size = &state->bit_size[type][state->items.report_id]; BOOL is_array; if (!*bit_size) *bit_size = 8; *bit_size += state->items.bit_size * state->items.report_count; *byte_size = max( *byte_size, (*bit_size + 7) / 8 ); - state->items.start_bit = *bit_size; + start_bit = *bit_size; if (!state->items.report_count) { @@ -356,11 +356,13 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY state->items.start_index = usages_size; if (!(is_array = HID_VALUE_CAPS_IS_ARRAY( &state->items ))) state->items.report_count -= usages_size - 1; - else state->items.start_bit -= state->items.report_count * state->items.bit_size; + else start_bit -= state->items.report_count * state->items.bit_size; while (usages_size--) { - if (!is_array) state->items.start_bit -= state->items.report_count * state->items.bit_size; + if (!is_array) start_bit -= state->items.report_count * state->items.bit_size; + state->items.start_byte = start_bit / 8; + state->items.start_bit = start_bit % 8; state->items.usage_page = state->usages_page[usages_size]; state->items.usage_min = state->usages_min[usages_size]; state->items.usage_max = state->usages_max[usages_size]; @@ -652,7 +654,7 @@ NTSTATUS WINAPI HidP_GetCollectionDescription( PHIDP_REPORT_DESCRIPTOR report_de caps_end = caps + preparsed->value_caps_count[HidP_Input]; for (; caps != caps_end; ++caps) { - len = caps->start_bit + caps->bit_size * caps->report_count; + len = caps->start_byte * 8 + caps->start_bit + caps->bit_size * caps->report_count; if (!input_len[caps->report_id]) report_count++; input_len[caps->report_id] = max(input_len[caps->report_id], len); } @@ -661,7 +663,7 @@ NTSTATUS WINAPI HidP_GetCollectionDescription( PHIDP_REPORT_DESCRIPTOR report_de caps_end = caps + preparsed->value_caps_count[HidP_Output]; for (; caps != caps_end; ++caps) { - len = caps->start_bit + caps->bit_size * caps->report_count; + len = caps->start_byte * 8 + caps->start_bit + caps->bit_size * caps->report_count; if (!input_len[caps->report_id] && !output_len[caps->report_id]) report_count++; output_len[caps->report_id] = max(output_len[caps->report_id], len); } @@ -670,7 +672,7 @@ NTSTATUS WINAPI HidP_GetCollectionDescription( PHIDP_REPORT_DESCRIPTOR report_de caps_end = caps + preparsed->value_caps_count[HidP_Feature]; for (; caps != caps_end; ++caps) { - len = caps->start_bit + caps->bit_size * caps->report_count; + len = caps->start_byte * 8 + caps->start_bit + caps->bit_size * caps->report_count; if (!input_len[caps->report_id] && !output_len[caps->report_id] && !feature_len[caps->report_id]) report_count++; feature_len[caps->report_id] = max(feature_len[caps->report_id], len); } diff --git a/include/wine/hid.h b/include/wine/hid.h index e76676ac8c2..8e33745ddc4 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -52,7 +52,8 @@ struct hid_value_caps USHORT bit_field; USHORT bit_size; USHORT report_count; - ULONG start_bit; + UCHAR start_bit; + USHORT start_byte; ULONG start_index; LONG logical_min; LONG logical_max; -- 2.33.0

1 4

[PATCH 1/5] winebus.sys: Build with msvcrt.
by Rémi Bernon 17 Sep '21

17 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/Makefile.in | 2 +- dlls/winebus.sys/bus_iohid.c | 16 +++++++----- dlls/winebus.sys/bus_sdl.c | 16 +++++++----- dlls/winebus.sys/bus_udev.c | 16 +++++++----- dlls/winebus.sys/hid.c | 4 +++ dlls/winebus.sys/main.c | 43 ++++++++++++++++++++------------- dlls/winebus.sys/unix_private.h | 18 +++++++------- dlls/winebus.sys/unixlib.c | 29 +++++++++++++++------- dlls/winebus.sys/unixlib.h | 3 +-- 9 files changed, 91 insertions(+), 56 deletions(-) diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in index 658d27b70fd..1675bf1951c 100644 --- a/dlls/winebus.sys/Makefile.in +++ b/dlls/winebus.sys/Makefile.in @@ -2,7 +2,7 @@ MODULE = winebus.sys IMPORTS = ntoskrnl advapi32 EXTRALIBS = $(IOKIT_LIBS) $(UDEV_LIBS) EXTRAINCL = $(UDEV_CFLAGS) $(SDL2_CFLAGS) -EXTRADLLFLAGS = -Wl,--subsystem,native +EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native C_SRCS = \ bus_iohid.c \ diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 8e6cb0a5ee9..0e36eac880c 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -17,6 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include "wine/port.h" @@ -371,7 +375,7 @@ static void handle_RemovalCallback(void *context, IOReturn result, void *sender, else WARN("failed to find device for iohid device %p\n", IOHIDDevice); } -NTSTATUS iohid_bus_init(void *args) +NTSTATUS WINAPI iohid_bus_init(void *args) { TRACE("args %p\n", args); @@ -392,7 +396,7 @@ NTSTATUS iohid_bus_init(void *args) return STATUS_SUCCESS; } -NTSTATUS iohid_bus_wait(void *args) +NTSTATUS WINAPI iohid_bus_wait(void *args) { struct bus_event *result = args; CFRunLoopRunResult ret; @@ -416,7 +420,7 @@ NTSTATUS iohid_bus_wait(void *args) return STATUS_SUCCESS; } -NTSTATUS iohid_bus_stop(void *args) +NTSTATUS WINAPI iohid_bus_stop(void *args) { if (!run_loop) return STATUS_SUCCESS; @@ -427,19 +431,19 @@ NTSTATUS iohid_bus_stop(void *args) #else -NTSTATUS iohid_bus_init(void *args) +NTSTATUS WINAPI iohid_bus_init(void *args) { WARN("IOHID support not compiled in!\n"); return STATUS_NOT_IMPLEMENTED; } -NTSTATUS iohid_bus_wait(void *args) +NTSTATUS WINAPI iohid_bus_wait(void *args) { WARN("IOHID support not compiled in!\n"); return STATUS_NOT_IMPLEMENTED; } -NTSTATUS iohid_bus_stop(void *args) +NTSTATUS WINAPI iohid_bus_stop(void *args) { WARN("IOHID support not compiled in!\n"); return STATUS_NOT_IMPLEMENTED; diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 785d1045622..79dff5007c0 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include "wine/port.h" #include <errno.h> @@ -814,7 +818,7 @@ static void process_device_event(SDL_Event *event) RtlLeaveCriticalSection(&sdl_cs); } -NTSTATUS sdl_bus_init(void *args) +NTSTATUS WINAPI sdl_bus_init(void *args) { const char *mapping; int i; @@ -917,7 +921,7 @@ failed: return STATUS_UNSUCCESSFUL; } -NTSTATUS sdl_bus_wait(void *args) +NTSTATUS WINAPI sdl_bus_wait(void *args) { struct bus_event *result = args; SDL_Event event; @@ -939,7 +943,7 @@ NTSTATUS sdl_bus_wait(void *args) return STATUS_SUCCESS; } -NTSTATUS sdl_bus_stop(void *args) +NTSTATUS WINAPI sdl_bus_stop(void *args) { SDL_Event event; @@ -957,19 +961,19 @@ NTSTATUS sdl_bus_stop(void *args) #else -NTSTATUS sdl_bus_init(void *args) +NTSTATUS WINAPI sdl_bus_init(void *args) { WARN("SDL support not compiled in!\n"); return STATUS_NOT_IMPLEMENTED; } -NTSTATUS sdl_bus_wait(void *args) +NTSTATUS WINAPI sdl_bus_wait(void *args) { WARN("SDL support not compiled in!\n"); return STATUS_NOT_IMPLEMENTED; } -NTSTATUS sdl_bus_stop(void *args) +NTSTATUS WINAPI sdl_bus_stop(void *args) { WARN("SDL support not compiled in!\n"); return STATUS_NOT_IMPLEMENTED; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 2cb727d8216..c859d5df546 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include <errno.h> #include <fcntl.h> @@ -1184,7 +1188,7 @@ static void process_monitor_event(struct udev_monitor *monitor) udev_device_unref(dev); } -NTSTATUS udev_bus_init(void *args) +NTSTATUS WINAPI udev_bus_init(void *args) { int monitor_fd; @@ -1229,7 +1233,7 @@ error: return STATUS_UNSUCCESSFUL; } -NTSTATUS udev_bus_wait(void *args) +NTSTATUS WINAPI udev_bus_wait(void *args) { struct platform_private *device; struct bus_event *result = args; @@ -1275,7 +1279,7 @@ NTSTATUS udev_bus_wait(void *args) return STATUS_SUCCESS; } -NTSTATUS udev_bus_stop(void *args) +NTSTATUS WINAPI udev_bus_stop(void *args) { if (!udev_context) return STATUS_SUCCESS; write(deviceloop_control[1], "q", 1); @@ -1284,19 +1288,19 @@ NTSTATUS udev_bus_stop(void *args) #else -NTSTATUS udev_bus_init(void *args) +NTSTATUS WINAPI udev_bus_init(void *args) { WARN("UDEV support not compiled in!\n"); return STATUS_NOT_IMPLEMENTED; } -NTSTATUS udev_bus_wait(void *args) +NTSTATUS WINAPI udev_bus_wait(void *args) { WARN("UDEV support not compiled in!\n"); return STATUS_NOT_IMPLEMENTED; } -NTSTATUS udev_bus_stop(void *args) +NTSTATUS WINAPI udev_bus_stop(void *args) { WARN("UDEV support not compiled in!\n"); return STATUS_NOT_IMPLEMENTED; diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 27c85d4f5a6..959cbf7c428 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include <stdarg.h> #include "ntstatus.h" diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index d19a2b7cb6c..5fd7744c259 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -17,11 +17,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" + #include <stdarg.h> #include "ntstatus.h" #define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winnls.h" #include "winternl.h" #include "winioctl.h" #include "hidusage.h" @@ -30,7 +33,6 @@ #include "ddk/hidtypes.h" #include "wine/asm.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/list.h" #include "wine/unixlib.h" @@ -109,9 +111,12 @@ static CRITICAL_SECTION device_list_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static struct list device_list = LIST_INIT(device_list); +static HMODULE instance; +static const unix_entry_point *unix_funcs; + static NTSTATUS winebus_call(unsigned int code, void *args) { - return __wine_unix_call_funcs[code]( args ); + return unix_funcs[code]( args ); } static void unix_device_remove(DEVICE_OBJECT *device) @@ -193,11 +198,11 @@ static WCHAR *get_instance_id(DEVICE_OBJECT *device) { static const WCHAR formatW[] = {'%','i','&','%','s','&','%','x','&','%','i',0}; struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - DWORD len = strlenW(ext->serialnumber) + 33; + DWORD len = wcslen(ext->serialnumber) + 33; WCHAR *dst; if ((dst = ExAllocatePool(PagedPool, len * sizeof(WCHAR)))) - sprintfW(dst, formatW, ext->desc.version, ext->serialnumber, ext->desc.uid, ext->index); + swprintf(dst, len, formatW, ext->desc.version, ext->serialnumber, ext->desc.uid, ext->index); return dst; } @@ -208,13 +213,13 @@ static WCHAR *get_device_id(DEVICE_OBJECT *device) static const WCHAR formatW[] = {'%','s','\\','v','i','d','_','%','0','4','x', '&','p','i','d','_','%','0','4','x',0}; struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - DWORD len = strlenW(ext->desc.busid) + 34; - WCHAR *dst, *tmp; + DWORD pos = 0, len = wcslen(ext->desc.busid) + 34; + WCHAR *dst; if ((dst = ExAllocatePool(PagedPool, len * sizeof(WCHAR)))) { - tmp = dst + sprintfW(dst, formatW, ext->desc.busid, ext->desc.vid, ext->desc.pid); - if (ext->desc.input != -1) sprintfW(tmp, input_formatW, ext->desc.input); + pos += swprintf(dst + pos, len - pos, formatW, ext->desc.busid, ext->desc.vid, ext->desc.pid); + if (ext->desc.input != -1) pos += swprintf(dst + pos, len - pos, input_formatW, ext->desc.input); } return dst; @@ -225,10 +230,10 @@ static WCHAR *get_hardware_ids(DEVICE_OBJECT *device) struct device_extension *ext = (struct device_extension *)device->DeviceExtension; WCHAR *dst; - if ((dst = ExAllocatePool(PagedPool, (strlenW(ext->desc.busid) + 2) * sizeof(WCHAR)))) + if ((dst = ExAllocatePool(PagedPool, (wcslen(ext->desc.busid) + 2) * sizeof(WCHAR)))) { - strcpyW(dst, ext->desc.busid); - dst[strlenW(dst) + 1] = 0; + wcscpy(dst, ext->desc.busid); + dst[wcslen(dst) + 1] = 0; } return dst; @@ -285,7 +290,7 @@ static DEVICE_OBJECT *bus_create_hid_device(struct device_desc *desc, struct uni TRACE("desc %s, unix_device %p\n", debugstr_device_desc(desc), unix_device); - sprintfW(dev_name, device_name_fmtW, desc->busid, unix_device); + swprintf(dev_name, ARRAY_SIZE(dev_name), device_name_fmtW, desc->busid, unix_device); RtlInitUnicodeString(&nameW, dev_name); status = IoCreateDevice(driver_obj, sizeof(struct device_extension), &nameW, 0, 0, FALSE, &device); if (status) @@ -900,17 +905,17 @@ static NTSTATUS hid_get_device_string(DEVICE_OBJECT *device, DWORD index, WCHAR switch (index) { case HID_STRING_ID_IMANUFACTURER: - len = (strlenW(ext->manufacturer) + 1) * sizeof(WCHAR); + len = (wcslen(ext->manufacturer) + 1) * sizeof(WCHAR); if (len > buffer_len) return STATUS_BUFFER_TOO_SMALL; else memcpy(buffer, ext->manufacturer, len); return STATUS_SUCCESS; case HID_STRING_ID_IPRODUCT: - len = (strlenW(ext->product) + 1) * sizeof(WCHAR); + len = (wcslen(ext->product) + 1) * sizeof(WCHAR); if (len > buffer_len) return STATUS_BUFFER_TOO_SMALL; else memcpy(buffer, ext->product, len); return STATUS_SUCCESS; case HID_STRING_ID_ISERIALNUMBER: - len = (strlenW(ext->serialnumber) + 1) * sizeof(WCHAR); + len = (wcslen(ext->serialnumber) + 1) * sizeof(WCHAR); if (len > buffer_len) return STATUS_BUFFER_TOO_SMALL; else memcpy(buffer, ext->serialnumber, len); return STATUS_SUCCESS; @@ -1012,7 +1017,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Status = hid_get_device_string(device, index, (WCHAR *)irp->UserBuffer, buffer_len); if (irp->IoStatus.Status == STATUS_SUCCESS) - irp->IoStatus.Information = (strlenW((WCHAR *)irp->UserBuffer) + 1) * sizeof(WCHAR); + irp->IoStatus.Information = (wcslen((WCHAR *)irp->UserBuffer) + 1) * sizeof(WCHAR); break; } case IOCTL_HID_GET_INPUT_REPORT: @@ -1110,6 +1115,10 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) ); + RtlPcToFileHeader(&DriverEntry, (void *)&instance); + if ((ret = __wine_init_unix_lib(instance, DLL_PROCESS_ATTACH, NULL, &unix_funcs))) + return ret; + attr.Length = sizeof(attr); attr.ObjectName = path; attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE; diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index cdc2be9b318..5e30b21955a 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -49,17 +49,17 @@ struct unix_device extern void *unix_device_create(const struct unix_device_vtbl *vtbl, SIZE_T size) DECLSPEC_HIDDEN; -extern NTSTATUS sdl_bus_init(void *) DECLSPEC_HIDDEN; -extern NTSTATUS sdl_bus_wait(void *) DECLSPEC_HIDDEN; -extern NTSTATUS sdl_bus_stop(void *) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI sdl_bus_init(void *) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI sdl_bus_wait(void *) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI sdl_bus_stop(void *) DECLSPEC_HIDDEN; -extern NTSTATUS udev_bus_init(void *) DECLSPEC_HIDDEN; -extern NTSTATUS udev_bus_wait(void *) DECLSPEC_HIDDEN; -extern NTSTATUS udev_bus_stop(void *) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI udev_bus_init(void *) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI udev_bus_wait(void *) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI udev_bus_stop(void *) DECLSPEC_HIDDEN; -extern NTSTATUS iohid_bus_init(void *) DECLSPEC_HIDDEN; -extern NTSTATUS iohid_bus_wait(void *) DECLSPEC_HIDDEN; -extern NTSTATUS iohid_bus_stop(void *) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI iohid_bus_init(void *) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI iohid_bus_wait(void *) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI iohid_bus_stop(void *) DECLSPEC_HIDDEN; extern void bus_event_cleanup(struct bus_event *event) DECLSPEC_HIDDEN; extern void bus_event_queue_destroy(struct list *queue) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 651b23aa8f4..f21b5a25b04 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include <stdarg.h> @@ -143,7 +147,7 @@ static const struct device_desc mouse_device_desc = .serialnumber = {"0000"}, }; -static NTSTATUS mouse_device_create(void *args) +static NTSTATUS WINAPI mouse_device_create(void *args) { struct device_create_params *params = args; params->desc = mouse_device_desc; @@ -241,7 +245,7 @@ static const struct device_desc keyboard_device_desc = .serialnumber = {"0000"}, }; -static NTSTATUS keyboard_device_create(void *args) +static NTSTATUS WINAPI keyboard_device_create(void *args) { struct device_create_params *params = args; params->desc = keyboard_device_desc; @@ -274,7 +278,7 @@ static ULONG unix_device_incref(struct unix_device *iface) return InterlockedIncrement(&iface->ref); } -static NTSTATUS unix_device_remove(void *args) +static NTSTATUS WINAPI unix_device_remove(void *args) { struct unix_device *iface = args; iface->vtbl->stop(iface); @@ -282,20 +286,20 @@ static NTSTATUS unix_device_remove(void *args) return STATUS_SUCCESS; } -static NTSTATUS unix_device_start(void *args) +static NTSTATUS WINAPI unix_device_start(void *args) { struct unix_device *iface = args; return iface->vtbl->start(iface); } -static NTSTATUS unix_device_get_report_descriptor(void *args) +static NTSTATUS WINAPI unix_device_get_report_descriptor(void *args) { struct device_descriptor_params *params = args; struct unix_device *iface = params->iface; return iface->vtbl->get_report_descriptor(iface, params->buffer, params->length, params->out_length); } -static NTSTATUS unix_device_set_output_report(void *args) +static NTSTATUS WINAPI unix_device_set_output_report(void *args) { struct device_report_params *params = args; struct unix_device *iface = params->iface; @@ -303,7 +307,7 @@ static NTSTATUS unix_device_set_output_report(void *args) return STATUS_SUCCESS; } -static NTSTATUS unix_device_get_feature_report(void *args) +static NTSTATUS WINAPI unix_device_get_feature_report(void *args) { struct device_report_params *params = args; struct unix_device *iface = params->iface; @@ -311,7 +315,7 @@ static NTSTATUS unix_device_get_feature_report(void *args) return STATUS_SUCCESS; } -static NTSTATUS unix_device_set_feature_report(void *args) +static NTSTATUS WINAPI unix_device_set_feature_report(void *args) { struct device_report_params *params = args; struct unix_device *iface = params->iface; @@ -319,7 +323,7 @@ static NTSTATUS unix_device_set_feature_report(void *args) return STATUS_SUCCESS; } -const unixlib_entry_t __wine_unix_call_funcs[] = +static const unix_entry_point unix_funcs[] = { sdl_bus_init, sdl_bus_wait, @@ -424,3 +428,10 @@ BOOL bus_event_queue_pop(struct list *queue, struct bus_event *event) return TRUE; } + +NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) +{ + if (reason != DLL_PROCESS_ATTACH) return STATUS_SUCCESS; + *(const unix_entry_point **)ptr_out = unix_funcs; + return STATUS_SUCCESS; +} diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index 55ba42500cf..e5156176c46 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -29,7 +29,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "wine/unixlib.h" struct device_desc { @@ -137,7 +136,7 @@ enum unix_funcs device_set_feature_report, }; -extern const unixlib_entry_t __wine_unix_call_funcs[] DECLSPEC_HIDDEN; +typedef NTSTATUS (WINAPI *unix_entry_point)(void *); static inline const char *debugstr_device_desc(struct device_desc *desc) { -- 2.33.0

1 4

[PATCH v2 1/6] robocopy: Add stub
by Florian Eder 17 Sep '21

17 Sep '21

Basic files and required changes to configure(.ac) to create a stub version of the robocopy utility Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43653 Signed-off-by: Florian Eder <others.meder(a)gmail.com> --- v2: Modified according to code review, again, please feel free to give any kind of feedback regarding the code :-) --- configure | 2 +- configure.ac | 1 + programs/robocopy/Makefile.in | 8 ++++++++ programs/robocopy/main.c | 29 +++++++++++++++++++++++++++++ programs/robocopy/robocopy.rc | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 programs/robocopy/Makefile.in create mode 100644 programs/robocopy/main.c create mode 100644 programs/robocopy/robocopy.rc diff --git a/configure b/configure index 1adbf1789f3..b27b1b14e7d 100755 --- a/configure +++ b/configure @@ -21266,6 +21266,7 @@ wine_fn_config_makefile programs/regedit/tests enable_tests wine_fn_config_makefile programs/regini enable_regini wine_fn_config_makefile programs/regsvcs enable_regsvcs wine_fn_config_makefile programs/regsvr32 enable_regsvr32 +wine_fn_config_makefile programs/robocopy enable_robocopy wine_fn_config_makefile programs/rpcss enable_rpcss wine_fn_config_makefile programs/rundll.exe16 enable_win16 wine_fn_config_makefile programs/rundll32 enable_rundll32 @@ -22799,4 +22800,3 @@ IFS="$ac_save_IFS" $as_echo " $as_me: Finished. Do '${ac_make}' to compile Wine. " >&6 - diff --git a/configure.ac b/configure.ac index eb970972936..b7faae4e4c4 100644 --- a/configure.ac +++ b/configure.ac @@ -3965,6 +3965,7 @@ WINE_CONFIG_MAKEFILE(programs/regedit/tests) WINE_CONFIG_MAKEFILE(programs/regini) WINE_CONFIG_MAKEFILE(programs/regsvcs) WINE_CONFIG_MAKEFILE(programs/regsvr32) +WINE_CONFIG_MAKEFILE(programs/robocopy) WINE_CONFIG_MAKEFILE(programs/rpcss) WINE_CONFIG_MAKEFILE(programs/rundll.exe16,enable_win16) WINE_CONFIG_MAKEFILE(programs/rundll32) diff --git a/programs/robocopy/Makefile.in b/programs/robocopy/Makefile.in new file mode 100644 index 00000000000..5a48be3725b --- /dev/null +++ b/programs/robocopy/Makefile.in @@ -0,0 +1,8 @@ +MODULE = robocopy.exe + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + +C_SRCS = \ + main.c + +RC_SRCS = robocopy.rc diff --git a/programs/robocopy/main.c b/programs/robocopy/main.c new file mode 100644 index 00000000000..00dacc8ab6c --- /dev/null +++ b/programs/robocopy/main.c @@ -0,0 +1,29 @@ +/* + * Copyright 2021 Florian Eder + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(robocopy); + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + WINE_FIXME("robocopy stub"); + return 0; +} diff --git a/programs/robocopy/robocopy.rc b/programs/robocopy/robocopy.rc new file mode 100644 index 00000000000..edae5b71d86 --- /dev/null +++ b/programs/robocopy/robocopy.rc @@ -0,0 +1,34 @@ +/* + * Copyright 2021 Florian Eder + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> + +#pragma makedep po + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define WINE_FILEDESCRIPTION_STR "Wine Robocopy" +#define WINE_FILENAME_STR "robocopy.exe" +#define WINE_FILETYPE VFT_APP +#define WINE_FILEVERSION 5,1,10,1027 +#define WINE_FILEVERSION_STR "5.1.10.1027" + +#define WINE_PRODUCTVERSION 5,1,10,1027 +#define WINE_PRODUCTVERSION_STR "XP027" + +#include "wine/wine_common_ver.rc" -- 2.32.0

2 10

[PATCH] msxml3/tests: Avoid double-free using BSTR helper.
by Daniel Lehman 17 Sep '21

17 Sep '21

2 1

[PATCH 1/3] winegstreamer: Fix return code in init_gst failure case.
by Derek Lesho 16 Sep '21

16 Sep '21

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/quartz_parser.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 5299f4dc2ed..a8e7e3d979f 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -982,7 +982,10 @@ static HRESULT parser_sink_connect(struct strmbase_sink *iface, IPin *peer, cons goto err; if (!filter->init_gst(filter)) + { + hr = E_FAIL; goto err; + } for (i = 0; i < filter->source_count; ++i) { -- 2.33.0

3 6

[PATCH v12 1/2] ntdll/socket: Implement exclusive flag for IOCTL_AFD_POLL.
by Guillaume Charifi 16 Sep '21

16 Sep '21

Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/ntdll/unix/socket.c | 6 ++-- include/wine/afd.h | 2 +- server/protocol.def | 1 + server/sock.c | 73 ++++++++++++++++++++++++++++++++++++++-- 4 files changed, 75 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 73d61c0d4e6..c40d0b526d7 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -736,12 +736,11 @@ static NTSTATUS sock_poll( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi || in_size < offsetof( struct afd_poll_params, sockets[params->count] )) return STATUS_INVALID_PARAMETER; - TRACE( "timeout %s, count %u, unknown %#x, padding (%#x, %#x, %#x), sockets[0] {%04lx, %#x}\n", - wine_dbgstr_longlong(params->timeout), params->count, params->unknown, + TRACE( "timeout %s, count %u, exclusive %u, padding (%#x, %#x, %#x), sockets[0] {%04lx, %#x}\n", + wine_dbgstr_longlong(params->timeout), params->count, params->exclusive, params->padding[0], params->padding[1], params->padding[2], params->sockets[0].socket, params->sockets[0].flags ); - if (params->unknown) FIXME( "unknown boolean is %#x\n", params->unknown ); if (params->padding[0]) FIXME( "padding[0] is %#x\n", params->padding[0] ); if (params->padding[1]) FIXME( "padding[1] is %#x\n", params->padding[1] ); if (params->padding[2]) FIXME( "padding[2] is %#x\n", params->padding[2] ); @@ -782,6 +781,7 @@ static NTSTATUS sock_poll( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi SERVER_START_REQ( poll_socket ) { req->async = server_async( handle, &async->io, event, apc, apc_user, iosb_client_ptr(io) ); + req->exclusive = !!params->exclusive; req->timeout = params->timeout; wine_server_add_data( req, input, params->count * sizeof(*input) ); wine_server_set_reply( req, async->sockets, params->count * sizeof(async->sockets[0]) ); diff --git a/include/wine/afd.h b/include/wine/afd.h index e67ecae25a9..f4682f464e8 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -104,7 +104,7 @@ struct afd_poll_params { LONGLONG timeout; unsigned int count; - BOOLEAN unknown; + BOOLEAN exclusive; BOOLEAN padding[3]; struct { diff --git a/server/protocol.def b/server/protocol.def index a5030fcf813..6a3faf3e625 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1451,6 +1451,7 @@ struct poll_socket_output /* Perform an async poll on a socket */ @REQ(poll_socket) + int exclusive; async_data_t async; /* async I/O parameters */ timeout_t timeout; /* timeout */ VARARG(sockets,poll_socket_input); /* list of sockets to poll */ diff --git a/server/sock.c b/server/sock.c index fc234e89865..4ceff1b943e 100644 --- a/server/sock.c +++ b/server/sock.c @@ -128,6 +128,7 @@ struct poll_req struct async *async; struct iosb *iosb; struct timeout_user *timeout; + int exclusive; unsigned int count; struct poll_socket_output *output; struct @@ -205,6 +206,7 @@ struct sock struct list accept_list; /* list of pending accept requests */ struct accept_req *accept_recv_req; /* pending accept-into request which will recv on this socket */ struct connect_req *connect_req; /* pending connection request */ + struct poll_req *main_poll; /* main poll */ union win_sockaddr addr; /* socket name */ int addr_len; /* socket name length */ unsigned int rcvbuf; /* advisory recv buffer size */ @@ -231,6 +233,7 @@ static int sock_get_poll_events( struct fd *fd ); static void sock_poll_event( struct fd *fd, int event ); static enum server_fd_type sock_get_fd_type( struct fd *fd ); static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); +static void sock_cancel_async( struct fd *fd, struct async *async ); static void sock_queue_async( struct fd *fd, struct async *async, int type, int count ); static void sock_reselect_async( struct fd *fd, struct async_queue *queue ); @@ -274,7 +277,7 @@ static const struct fd_ops sock_fd_ops = default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ sock_ioctl, /* ioctl */ - default_fd_cancel_async, /* cancel_async */ + sock_cancel_async, /* cancel_async */ sock_queue_async, /* queue_async */ sock_reselect_async /* reselect_async */ }; @@ -789,6 +792,7 @@ static void free_poll_req( void *private ) for (i = 0; i < req->count; ++i) release_object( req->sockets[i].sock ); + release_object( req->async ); release_object( req->iosb ); list_remove( &req->entry ); @@ -837,6 +841,8 @@ static void complete_async_polls( struct sock *sock, int event, int error ) int flags = get_poll_flags( sock, event ); struct poll_req *req, *next; + sock->main_poll = NULL; + LIST_FOR_EACH_ENTRY_SAFE( req, next, &poll_list, struct poll_req, entry ) { unsigned int i; @@ -865,11 +871,20 @@ static void complete_async_polls( struct sock *sock, int event, int error ) static void async_poll_timeout( void *private ) { struct poll_req *req = private; + unsigned int i; req->timeout = NULL; if (req->iosb->status != STATUS_PENDING) return; + for (i = 0; i < req->count; ++i) + { + struct sock *sock = req->sockets[i].sock; + + if (sock->main_poll == req) + sock->main_poll = NULL; + } + async_request_complete( req->async, STATUS_TIMEOUT, 0, req->count * sizeof(*req->output), req->output ); } @@ -1217,6 +1232,29 @@ static enum server_fd_type sock_get_fd_type( struct fd *fd ) return FD_TYPE_SOCKET; } +static void sock_cancel_async( struct fd *fd, struct async *async ) +{ + struct sock *sock = get_fd_user( fd ); + struct poll_req *req; + + if (sock->main_poll) + { + LIST_FOR_EACH_ENTRY( req, &poll_list, struct poll_req, entry ) + { + if (req->async != async) + continue; + + if (req == sock->main_poll) + { + sock->main_poll = NULL; + break; + } + } + } + + async_terminate( async, STATUS_CANCELLED ); +} + static void sock_queue_async( struct fd *fd, struct async *async, int type, int count ) { struct sock *sock = get_fd_user( fd ); @@ -1383,6 +1421,7 @@ static struct sock *create_socket(void) sock->ifchange_obj = NULL; sock->accept_recv_req = NULL; sock->connect_req = NULL; + sock->main_poll = NULL; memset( &sock->addr, 0, sizeof(sock->addr) ); sock->addr_len = 0; sock->rd_shutdown = 0; @@ -2840,7 +2879,32 @@ static int poll_single_socket( struct sock *sock, int mask ) return get_poll_flags( sock, pollfd.revents ) & mask; } -static void poll_socket( struct sock *poll_sock, struct async *async, timeout_t timeout, +static void poll_handle_exclusive(struct poll_req *req) +{ + unsigned int i; + + for (i = 0; i < req->count; ++i) + { + struct sock *sock = req->sockets[i].sock; + struct poll_req *main_poll = sock->main_poll; + + if (main_poll && main_poll->exclusive && req->exclusive) + { + /* Previous exclusive main poll replaced by new exclusive poll. */ + main_poll->iosb->status = STATUS_SUCCESS; + main_poll->iosb->out_data = main_poll->output; + main_poll->iosb->out_size = main_poll->count * sizeof(*main_poll->output); + async_terminate(main_poll->async, STATUS_ALERTED); + + main_poll = NULL; + } + + if (!main_poll) + sock->main_poll = req; + } +} + +static void poll_socket( struct sock *poll_sock, struct async *async, int exclusive, timeout_t timeout, unsigned int count, const struct poll_socket_input *input ) { struct poll_socket_output *output; @@ -2881,11 +2945,14 @@ static void poll_socket( struct sock *poll_sock, struct async *async, timeout_t req->sockets[i].flags = input[i].flags; } + req->exclusive = exclusive; req->count = count; req->async = (struct async *)grab_object( async ); req->iosb = async_get_iosb( async ); req->output = output; + poll_handle_exclusive(req); + list_add_tail( &poll_list, &req->entry ); async_set_completion_callback( async, free_poll_req, req ); queue_async( &poll_sock->poll_q, async ); @@ -3287,7 +3354,7 @@ DECL_HANDLER(poll_socket) if ((async = create_request_async( sock->fd, get_fd_comp_flags( sock->fd ), &req->async ))) { - poll_socket( sock, async, req->timeout, count, input ); + poll_socket( sock, async, req->exclusive, req->timeout, count, input ); reply->wait = async_handoff( async, NULL, 0 ); reply->options = get_fd_options( sock->fd ); release_object( async ); -- 2.33.0

2 2

[PATCH 1/3] ntdll: Factor out SMBIOS table creation.
by Brendan Shanks 16 Sep '21

16 Sep '21

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntdll/unix/system.c | 374 +++++++++++++++++++++------------------ 1 file changed, 202 insertions(+), 172 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 2cdc6278f3d..145cb0810cd 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1264,13 +1264,200 @@ static NTSTATUS create_cpuset_info(SYSTEM_CPU_SET_INFORMATION *info) #ifdef linux -static void copy_smbios_string( char **buffer, char *s, size_t len ) +static void copy_smbios_string( char **buffer, const char *s, size_t len ) { if (!len) return; memcpy(*buffer, s, len + 1); *buffer += len + 1; } +#define S(s) const char * s, size_t s ## _len +static NTSTATUS create_smbios_tables( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG available_len, + ULONG *required_len, + S(bios_vendor), S(bios_version), S(bios_date), + S(system_vendor), S(system_product), S(system_version), + S(system_serial), const GUID *system_uuid, S(system_sku), + S(system_family), + S(board_vendor), S(board_product), S(board_version), + S(board_serial), S(board_asset_tag), + S(chassis_vendor), BYTE chassis_type, S(chassis_version), + S(chassis_serial), S(chassis_asset_tag) ) +#undef S +{ + char *buffer = (char*)sfti->TableBuffer; + BYTE string_count; + BYTE handle_count = 0; + struct smbios_prologue *prologue; + struct smbios_bios *bios; + struct smbios_system *system; + struct smbios_board *board; + struct smbios_chassis *chassis; + struct smbios_boot_info *boot_info; + struct smbios_header *end_of_table; + + *required_len = sizeof(struct smbios_prologue); + +#define L(l) (l + (l ? 1 : 0)) + *required_len += sizeof(struct smbios_bios); + *required_len += max(L(bios_vendor_len) + L(bios_version_len) + L(bios_date_len) + 1, 2); + + *required_len += sizeof(struct smbios_system); + *required_len += max(L(system_vendor_len) + L(system_product_len) + L(system_version_len) + + L(system_serial_len) + L(system_sku_len) + L(system_family_len) + 1, 2); + + *required_len += sizeof(struct smbios_board); + *required_len += max(L(board_vendor_len) + L(board_product_len) + L(board_version_len) + + L(board_serial_len) + L(board_asset_tag_len) + 1, 2); + + *required_len += sizeof(struct smbios_chassis); + *required_len += max(L(chassis_vendor_len) + L(chassis_version_len) + L(chassis_serial_len) + + L(chassis_asset_tag_len) + 1, 2); + + *required_len += sizeof(struct smbios_boot_info); + *required_len += 2; + + *required_len += sizeof(struct smbios_header); + *required_len += 2; +#undef L + + sfti->TableBufferLength = *required_len; + + *required_len += FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); + + if (available_len < *required_len) + return STATUS_BUFFER_TOO_SMALL; + + prologue = (struct smbios_prologue*)buffer; + prologue->calling_method = 0; + prologue->major_version = 2; + prologue->minor_version = 4; + prologue->revision = 0; + prologue->length = sfti->TableBufferLength - sizeof(struct smbios_prologue); + buffer += sizeof(struct smbios_prologue); + + string_count = 0; + bios = (struct smbios_bios*)buffer; + bios->hdr.type = 0; + bios->hdr.length = sizeof(struct smbios_bios); + bios->hdr.handle = handle_count++; + bios->vendor = bios_vendor_len ? ++string_count : 0; + bios->version = bios_version_len ? ++string_count : 0; + bios->start = 0; + bios->date = bios_date_len ? ++string_count : 0; + bios->size = 0; + bios->characteristics = 0x4; /* not supported */ + bios->characteristics_ext[0] = 0; + bios->characteristics_ext[1] = 0; + bios->system_bios_major_release = 0xFF; /* not supported */ + bios->system_bios_minor_release = 0xFF; /* not supported */ + bios->ec_firmware_major_release = 0xFF; /* not supported */ + bios->ec_firmware_minor_release = 0xFF; /* not supported */ + buffer += sizeof(struct smbios_bios); + + copy_smbios_string(&buffer, bios_vendor, bios_vendor_len); + copy_smbios_string(&buffer, bios_version, bios_version_len); + copy_smbios_string(&buffer, bios_date, bios_date_len); + if (!string_count) *buffer++ = 0; + *buffer++ = 0; + + string_count = 0; + system = (struct smbios_system*)buffer; + system->hdr.type = 1; + system->hdr.length = sizeof(struct smbios_system); + system->hdr.handle = handle_count++; + system->vendor = system_vendor_len ? ++string_count : 0; + system->product = system_product_len ? ++string_count : 0; + system->version = system_version_len ? ++string_count : 0; + system->serial = system_serial_len ? ++string_count : 0; + memcpy( system->uuid, system_uuid, sizeof(GUID) ); + system->wake_up_type = 0x02; /* unknown */ + system->sku_number = system_sku_len ? ++string_count : 0; + system->family = system_family_len ? ++string_count : 0; + buffer += sizeof(struct smbios_system); + + copy_smbios_string(&buffer, system_vendor, system_vendor_len); + copy_smbios_string(&buffer, system_product, system_product_len); + copy_smbios_string(&buffer, system_version, system_version_len); + copy_smbios_string(&buffer, system_serial, system_serial_len); + copy_smbios_string(&buffer, system_sku, system_sku_len); + copy_smbios_string(&buffer, system_family, system_family_len); + if (!string_count) *buffer++ = 0; + *buffer++ = 0; + + string_count = 0; + chassis = (struct smbios_chassis*)buffer; + chassis->hdr.type = 3; + chassis->hdr.length = sizeof(struct smbios_chassis); + chassis->hdr.handle = handle_count++; + chassis->vendor = chassis_vendor_len ? ++string_count : 0; + chassis->type = chassis_type; + chassis->version = chassis_version_len ? ++string_count : 0; + chassis->serial = chassis_serial_len ? ++string_count : 0; + chassis->asset_tag = chassis_asset_tag_len ? ++string_count : 0; + chassis->boot_state = 0x02; /* unknown */ + chassis->power_supply_state = 0x02; /* unknown */ + chassis->thermal_state = 0x02; /* unknown */ + chassis->security_status = 0x02; /* unknown */ + chassis->oem_defined = 0; + chassis->height = 0; /* undefined */ + chassis->num_power_cords = 0; /* unspecified */ + chassis->num_contained_elements = 0; + chassis->contained_element_rec_length = 3; + buffer += sizeof(struct smbios_chassis); + + copy_smbios_string(&buffer, chassis_vendor, chassis_vendor_len); + copy_smbios_string(&buffer, chassis_version, chassis_version_len); + copy_smbios_string(&buffer, chassis_serial, chassis_serial_len); + copy_smbios_string(&buffer, chassis_asset_tag, chassis_asset_tag_len); + if (!string_count) *buffer++ = 0; + *buffer++ = 0; + + string_count = 0; + board = (struct smbios_board*)buffer; + board->hdr.type = 2; + board->hdr.length = sizeof(struct smbios_board); + board->hdr.handle = handle_count++; + board->vendor = board_vendor_len ? ++string_count : 0; + board->product = board_product_len ? ++string_count : 0; + board->version = board_version_len ? ++string_count : 0; + board->serial = board_serial_len ? ++string_count : 0; + board->asset_tag = board_asset_tag_len ? ++string_count : 0; + board->feature_flags = 0x5; /* hosting board, removable */ + board->location = 0; + board->chassis_handle = chassis->hdr.handle; + board->board_type = 0xa; /* motherboard */ + board->num_contained_handles = 0; + buffer += sizeof(struct smbios_board); + + copy_smbios_string(&buffer, board_vendor, board_vendor_len); + copy_smbios_string(&buffer, board_product, board_product_len); + copy_smbios_string(&buffer, board_version, board_version_len); + copy_smbios_string(&buffer, board_serial, board_serial_len); + copy_smbios_string(&buffer, board_asset_tag, board_asset_tag_len); + if (!string_count) *buffer++ = 0; + *buffer++ = 0; + + boot_info = (struct smbios_boot_info*)buffer; + boot_info->hdr.type = 32; + boot_info->hdr.length = sizeof(struct smbios_boot_info); + boot_info->hdr.handle = handle_count++; + memset(boot_info->reserved, 0, sizeof(boot_info->reserved)); + memset(boot_info->boot_status, 0, sizeof(boot_info->boot_status)); /* no errors detected */ + buffer += sizeof(struct smbios_boot_info); + *buffer++ = 0; + *buffer++ = 0; + + end_of_table = (struct smbios_header*)buffer; + end_of_table->type = 127; + end_of_table->length = sizeof(struct smbios_header); + end_of_table->handle = handle_count++; + buffer += sizeof(struct smbios_header); + *buffer++ = 0; + *buffer++ = 0; + + return STATUS_SUCCESS; +} + static size_t get_smbios_string( const char *path, char *str, size_t size ) { FILE *file; @@ -1343,16 +1530,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON char chassis_vendor[128], chassis_version[128], chassis_serial[128], chassis_asset_tag[128]; char chassis_type[11] = "2"; /* unknown */ size_t chassis_vendor_len, chassis_version_len, chassis_serial_len, chassis_asset_tag_len; - char *buffer = (char*)sfti->TableBuffer; - BYTE string_count; - BYTE handle_count = 0; - struct smbios_prologue *prologue; - struct smbios_bios *bios; - struct smbios_system *system; - struct smbios_board *board; - struct smbios_chassis *chassis; - struct smbios_boot_info *boot_info; - struct smbios_header *end_of_table; + GUID system_uuid; #define S(s) s, sizeof(s) bios_vendor_len = get_smbios_string("/sys/class/dmi/id/bios_vendor", S(bios_vendor)); @@ -1376,167 +1554,19 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON get_smbios_string("/sys/class/dmi/id/chassis_type", S(chassis_type)); #undef S - *required_len = sizeof(struct smbios_prologue); - -#define L(l) (l + (l ? 1 : 0)) - *required_len += sizeof(struct smbios_bios); - *required_len += max(L(bios_vendor_len) + L(bios_version_len) + L(bios_date_len) + 1, 2); - - *required_len += sizeof(struct smbios_system); - *required_len += max(L(system_vendor_len) + L(system_product_len) + L(system_version_len) + - L(system_serial_len) + L(system_sku_len) + L(system_family_len) + 1, 2); - - *required_len += sizeof(struct smbios_board); - *required_len += max(L(board_vendor_len) + L(board_product_len) + L(board_version_len) + - L(board_serial_len) + L(board_asset_tag_len) + 1, 2); - - *required_len += sizeof(struct smbios_chassis); - *required_len += max(L(chassis_vendor_len) + L(chassis_version_len) + L(chassis_serial_len) + - L(chassis_asset_tag_len) + 1, 2); - - *required_len += sizeof(struct smbios_boot_info); - *required_len += 2; - - *required_len += sizeof(struct smbios_header); - *required_len += 2; -#undef L - - sfti->TableBufferLength = *required_len; - - *required_len += FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); - - if (available_len < *required_len) - return STATUS_BUFFER_TOO_SMALL; - - prologue = (struct smbios_prologue*)buffer; - prologue->calling_method = 0; - prologue->major_version = 2; - prologue->minor_version = 4; - prologue->revision = 0; - prologue->length = sfti->TableBufferLength - sizeof(struct smbios_prologue); - buffer += sizeof(struct smbios_prologue); - - string_count = 0; - bios = (struct smbios_bios*)buffer; - bios->hdr.type = 0; - bios->hdr.length = sizeof(struct smbios_bios); - bios->hdr.handle = handle_count++; - bios->vendor = bios_vendor_len ? ++string_count : 0; - bios->version = bios_version_len ? ++string_count : 0; - bios->start = 0; - bios->date = bios_date_len ? ++string_count : 0; - bios->size = 0; - bios->characteristics = 0x4; /* not supported */ - bios->characteristics_ext[0] = 0; - bios->characteristics_ext[1] = 0; - bios->system_bios_major_release = 0xFF; /* not supported */ - bios->system_bios_minor_release = 0xFF; /* not supported */ - bios->ec_firmware_major_release = 0xFF; /* not supported */ - bios->ec_firmware_minor_release = 0xFF; /* not supported */ - buffer += sizeof(struct smbios_bios); - - copy_smbios_string(&buffer, bios_vendor, bios_vendor_len); - copy_smbios_string(&buffer, bios_version, bios_version_len); - copy_smbios_string(&buffer, bios_date, bios_date_len); - if (!string_count) *buffer++ = 0; - *buffer++ = 0; - - string_count = 0; - system = (struct smbios_system*)buffer; - system->hdr.type = 1; - system->hdr.length = sizeof(struct smbios_system); - system->hdr.handle = handle_count++; - system->vendor = system_vendor_len ? ++string_count : 0; - system->product = system_product_len ? ++string_count : 0; - system->version = system_version_len ? ++string_count : 0; - system->serial = system_serial_len ? ++string_count : 0; - get_system_uuid( (GUID *)system->uuid ); - system->wake_up_type = 0x02; /* unknown */ - system->sku_number = system_sku_len ? ++string_count : 0; - system->family = system_family_len ? ++string_count : 0; - buffer += sizeof(struct smbios_system); - - copy_smbios_string(&buffer, system_vendor, system_vendor_len); - copy_smbios_string(&buffer, system_product, system_product_len); - copy_smbios_string(&buffer, system_version, system_version_len); - copy_smbios_string(&buffer, system_serial, system_serial_len); - copy_smbios_string(&buffer, system_sku, system_sku_len); - copy_smbios_string(&buffer, system_family, system_family_len); - if (!string_count) *buffer++ = 0; - *buffer++ = 0; - - string_count = 0; - chassis = (struct smbios_chassis*)buffer; - chassis->hdr.type = 3; - chassis->hdr.length = sizeof(struct smbios_chassis); - chassis->hdr.handle = handle_count++; - chassis->vendor = chassis_vendor_len ? ++string_count : 0; - chassis->type = atoi(chassis_type); - chassis->version = chassis_version_len ? ++string_count : 0; - chassis->serial = chassis_serial_len ? ++string_count : 0; - chassis->asset_tag = chassis_asset_tag_len ? ++string_count : 0; - chassis->boot_state = 0x02; /* unknown */ - chassis->power_supply_state = 0x02; /* unknown */ - chassis->thermal_state = 0x02; /* unknown */ - chassis->security_status = 0x02; /* unknown */ - chassis->oem_defined = 0; - chassis->height = 0; /* undefined */ - chassis->num_power_cords = 0; /* unspecified */ - chassis->num_contained_elements = 0; - chassis->contained_element_rec_length = 3; - buffer += sizeof(struct smbios_chassis); - - copy_smbios_string(&buffer, chassis_vendor, chassis_vendor_len); - copy_smbios_string(&buffer, chassis_version, chassis_version_len); - copy_smbios_string(&buffer, chassis_serial, chassis_serial_len); - copy_smbios_string(&buffer, chassis_asset_tag, chassis_asset_tag_len); - if (!string_count) *buffer++ = 0; - *buffer++ = 0; - - string_count = 0; - board = (struct smbios_board*)buffer; - board->hdr.type = 2; - board->hdr.length = sizeof(struct smbios_board); - board->hdr.handle = handle_count++; - board->vendor = board_vendor_len ? ++string_count : 0; - board->product = board_product_len ? ++string_count : 0; - board->version = board_version_len ? ++string_count : 0; - board->serial = board_serial_len ? ++string_count : 0; - board->asset_tag = board_asset_tag_len ? ++string_count : 0; - board->feature_flags = 0x5; /* hosting board, removable */ - board->location = 0; - board->chassis_handle = chassis->hdr.handle; - board->board_type = 0xa; /* motherboard */ - board->num_contained_handles = 0; - buffer += sizeof(struct smbios_board); - - copy_smbios_string(&buffer, board_vendor, board_vendor_len); - copy_smbios_string(&buffer, board_product, board_product_len); - copy_smbios_string(&buffer, board_version, board_version_len); - copy_smbios_string(&buffer, board_serial, board_serial_len); - copy_smbios_string(&buffer, board_asset_tag, board_asset_tag_len); - if (!string_count) *buffer++ = 0; - *buffer++ = 0; - - boot_info = (struct smbios_boot_info*)buffer; - boot_info->hdr.type = 32; - boot_info->hdr.length = sizeof(struct smbios_boot_info); - boot_info->hdr.handle = handle_count++; - memset(boot_info->reserved, 0, sizeof(boot_info->reserved)); - memset(boot_info->boot_status, 0, sizeof(boot_info->boot_status)); /* no errors detected */ - buffer += sizeof(struct smbios_boot_info); - *buffer++ = 0; - *buffer++ = 0; - - end_of_table = (struct smbios_header*)buffer; - end_of_table->type = 127; - end_of_table->length = sizeof(struct smbios_header); - end_of_table->handle = handle_count++; - buffer += sizeof(struct smbios_header); - *buffer++ = 0; - *buffer++ = 0; - - return STATUS_SUCCESS; + get_system_uuid(&system_uuid); + +#define S(s) s, s ## _len + return create_smbios_tables( sfti, available_len, required_len, + S(bios_vendor), S(bios_version), S(bios_date), + S(system_vendor), S(system_product), S(system_version), + S(system_serial), &system_uuid, S(system_sku), + S(system_family), + S(board_vendor), S(board_product), S(board_version), + S(board_serial), S(board_asset_tag), + S(chassis_vendor), atoi(chassis_type), S(chassis_version), + S(chassis_serial), S(chassis_asset_tag) ); +#undef S } default: FIXME("info_class SYSTEM_FIRMWARE_TABLE_INFORMATION provider %08x\n", sfti->ProviderSignature); -- 2.30.1 (Apple Git-130)

2 3

[PATCH v3 1/6] user32/tests: Fix existing winevents in test_showwindow() message sequences.
by Connor McAdams 16 Sep '21

16 Sep '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- -v3: Actually run test_mdi_messages() with winevents enabled. dlls/user32/tests/msg.c | 46 ++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 4c9f1dc6913..420ada6e384 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -724,7 +724,7 @@ static const struct message WmCreateMaxPopupSeq[] = { { WM_NCCREATE, sent }, { WM_NCCALCSIZE, sent|wparam, 0 }, { WM_CREATE, sent }, - { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_SIZE, sent|wparam, SIZE_RESTORED }, { WM_MOVE, sent }, { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, @@ -734,12 +734,12 @@ static const struct message WmCreateMaxPopupSeq[] = { { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOREDRAW|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_SHOWWINDOW, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { HCBT_ACTIVATE, hook }, - { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_NCPAINT, sent|wparam|optional, 1 }, @@ -751,7 +751,7 @@ static const struct message WmCreateMaxPopupSeq[] = { { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, { WM_GETTEXT, sent|optional }, { WM_SYNCPAINT, sent|wparam|optional, 4 }, @@ -768,7 +768,7 @@ static const struct message WmCreateInvisibleMaxPopupSeq[] = { { WM_NCCREATE, sent }, { WM_NCCALCSIZE, sent|wparam, 0 }, { WM_CREATE, sent }, - { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_SIZE, sent|wparam, SIZE_RESTORED }, { WM_MOVE, sent }, { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, @@ -778,7 +778,7 @@ static const struct message WmCreateInvisibleMaxPopupSeq[] = { { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOREDRAW|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { 0 } }; /* ShowWindow(SW_SHOWMAXIMIZED) for a resized not visible popup window */ @@ -787,9 +787,9 @@ static const struct message WmShowMaxPopupResizedSeq[] = { { WM_GETMINMAXINFO, sent }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED, 0, SWP_STATECHANGED /* w1064v1809 */ }, { WM_NCCALCSIZE, sent|wparam, TRUE }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { HCBT_ACTIVATE, hook }, - { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_NCPAINT, sent|wparam|optional, 1 }, @@ -801,7 +801,7 @@ static const struct message WmShowMaxPopupResizedSeq[] = { { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, { WM_GETTEXT, sent|optional }, { WM_NCPAINT, sent|wparam|optional, 1 }, @@ -810,7 +810,7 @@ static const struct message WmShowMaxPopupResizedSeq[] = { /* WinNT4.0 sends WM_MOVE */ { WM_MOVE, sent|defwinproc|optional }, { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { 0 } }; /* ShowWindow(SW_SHOWMAXIMIZED) for a not visible popup window */ @@ -819,9 +819,9 @@ static const struct message WmShowMaxPopupSeq[] = { { WM_GETMINMAXINFO, sent }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED, 0, SWP_STATECHANGED /* w1064v1809 */ }, { WM_NCCALCSIZE, sent|wparam, TRUE }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { HCBT_ACTIVATE, hook }, - { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_NCPAINT, sent|wparam|optional, 1 }, @@ -833,7 +833,7 @@ static const struct message WmShowMaxPopupSeq[] = { { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, { WM_GETTEXT, sent|optional }, { WM_SYNCPAINT, sent|wparam|optional, 4 }, @@ -842,8 +842,8 @@ static const struct message WmShowMaxPopupSeq[] = { { WM_NCPAINT, sent|wparam|defwinproc|optional, 1 }, { WM_ERASEBKGND, sent|defwinproc|optional }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOMOVE|SWP_NOSIZE, 0, SWP_STATECHANGED /* w1064v1809 */ }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_SIZE, sent|defwinproc|optional }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { 0 } }; /* CreateWindow(WS_VISIBLE) for popup window */ @@ -852,14 +852,14 @@ static const struct message WmCreatePopupSeq[] = { { WM_NCCREATE, sent }, { WM_NCCALCSIZE, sent|wparam, 0 }, { WM_CREATE, sent }, - { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_SIZE, sent|wparam, SIZE_RESTORED }, { WM_MOVE, sent }, { WM_SHOWWINDOW, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { HCBT_ACTIVATE, hook }, - { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_NCPAINT, sent|wparam|optional, 1 }, @@ -871,7 +871,7 @@ static const struct message WmCreatePopupSeq[] = { { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, { WM_GETTEXT, sent|optional }, { WM_SYNCPAINT, sent|wparam|optional, 4 }, @@ -894,7 +894,7 @@ static const struct message WmShowVisMaxPopupSeq[] = { { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { 0 } }; /* ShowWindow(hwnd, SW_RESTORE) to a minimized window */ @@ -2068,7 +2068,7 @@ static const struct message WmSHOWNAChildVisParVis[] = { static const struct message WmSHOWNAChildInvisParVis[] = { { WM_SHOWWINDOW, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_ERASEBKGND, sent|optional }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOACTIVATE|SWP_NOCLIENTMOVE }, { 0 } @@ -2091,7 +2091,7 @@ static const struct message WmSHOWNATopInvisible[] = { { WM_WINDOWPOSCHANGED, sent|optional }, { WM_SHOWWINDOW, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_NCPAINT, sent|wparam|optional, 1 }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, @@ -2099,7 +2099,7 @@ static const struct message WmSHOWNATopInvisible[] = { { WM_NCCALCSIZE, sent|wparam|optional, 1 }, { WM_NCPAINT, sent|wparam|optional, 1 }, { WM_ERASEBKGND, sent|optional }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 sends it, but Win8+ doesn't. */ { WM_SIZE, sent|wparam, SIZE_RESTORED }, { WM_MOVE, sent }, { 0 } -- 2.25.1

2 11

[PATCH 8/8] user32/tests: Add display device interface tests.
by Zhiyi Zhang 16 Sep '21

16 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/Makefile.in | 2 +- dlls/user32/tests/monitor.c | 90 +++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index dd101d69f3c..abe340403f4 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = user32.dll -IMPORTS = user32 gdi32 advapi32 hid +IMPORTS = user32 gdi32 advapi32 hid setupapi C_SRCS = \ broadcast.c \ diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index bd348576726..de460187fbf 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -3,6 +3,7 @@ * * Copyright 2005 Huw Davies * Copyright 2008 Dmitry Timoshkov + * Copyright 2021 Zhiyi Zhang for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,6 +29,11 @@ #include "winuser.h" #include "winreg.h" #include "winternl.h" +#include "cfgmgr32.h" +#include "initguid.h" +#include "devguid.h" +#include "ntddvdeo.h" +#include "setupapi.h" #include "ddk/d3dkmthk.h" #include "wine/heap.h" #include <stdio.h> @@ -2353,6 +2359,89 @@ static void test_display_dc(void) } } +#define check_device_interface(a, b) _check_device_interface(__LINE__, a, b) +static void _check_device_interface(int line, const char *instance_id, const GUID *guid) +{ + SP_DEVICE_INTERFACE_DATA iface_data = {sizeof(iface_data)}; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo; + BOOL ret; + + devinfo = SetupDiGetClassDevsA(guid, instance_id, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + ret = SetupDiEnumDeviceInfo(devinfo, 0, &device_data); + ok_(__FILE__, line)(ret || broken(!ret) /* <= Win7 */, + "SetupDiEnumDeviceInfo failed, error %u.\n", GetLastError()); + if (!ret) + { + SetupDiDestroyDeviceInfoList(devinfo); + return; + } + ret = SetupDiEnumDeviceInterfaces(devinfo, &device_data, guid, 0, &iface_data); + ok_(__FILE__, line)(ret, "SetupDiEnumDeviceInterfaces failed, error %u.\n", GetLastError()); + ok_(__FILE__, line)(IsEqualGUID(&iface_data.InterfaceClassGuid, guid), + "Expected guid %s, got %s.\n", wine_dbgstr_guid(guid), + wine_dbgstr_guid(&iface_data.InterfaceClassGuid)); + + SetupDiDestroyDeviceInfoList(devinfo); +} + +static void test_display_device_interfaces(void) +{ + SP_DEVICE_INTERFACE_DATA iface_data = {sizeof(iface_data)}; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + char instance_id[MAX_DEVICE_ID_LEN]; + DWORD device_idx = 0, size, error; + HDEVINFO devinfo; + BOOL ret; + + /* GPUs */ + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, DIGCF_PRESENT); + ok(devinfo != INVALID_HANDLE_VALUE, "SetupDiGetClassDevsW failed, error %u.\n", GetLastError()); + while ((ret = SetupDiEnumDeviceInfo(devinfo, device_idx, &device_data))) + { + ret = SetupDiGetDeviceInstanceIdA(devinfo, &device_data, instance_id, + ARRAY_SIZE(instance_id), &size); + ok(ret, "SetupDiGetDeviceInstanceIdA failed, error %u.\n", GetLastError()); + + winetest_push_context("GPU %d", device_idx); + + check_device_interface(instance_id, &GUID_DEVINTERFACE_DISPLAY_ADAPTER); + check_device_interface(instance_id, &GUID_DISPLAY_DEVICE_ARRIVAL); + + winetest_pop_context(); + ++device_idx; + } + error = GetLastError(); + ok(!ret, "SetupDiEnumDeviceInfo succeeded.\n"); + ok(error == ERROR_NO_MORE_ITEMS, "Expected error %u, got %u.\n", ERROR_NO_MORE_ITEMS, error); + ok(device_idx > 0, "Expected at least one GPU.\n"); + SetupDiDestroyDeviceInfoList(devinfo); + + /* Monitors */ + device_idx = 0; + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, L"DISPLAY", NULL, DIGCF_PRESENT); + ok(devinfo != INVALID_HANDLE_VALUE, "SetupDiGetClassDevsW failed, error %u.\n", GetLastError()); + while ((ret = SetupDiEnumDeviceInfo(devinfo, device_idx, &device_data))) + { + ret = SetupDiGetDeviceInstanceIdA(devinfo, &device_data, instance_id, + ARRAY_SIZE(instance_id), &size); + ok(ret, "SetupDiGetDeviceInstanceIdA failed, error %u.\n", GetLastError()); + + winetest_push_context("Monitor %d", device_idx); + + check_device_interface(instance_id, &GUID_DEVINTERFACE_MONITOR); + + winetest_pop_context(); + ++device_idx; + } + error = GetLastError(); + ok(!ret, "SetupDiEnumDeviceInfo succeeded.\n"); + ok(error == ERROR_NO_MORE_ITEMS, "Expected error %u, got %u.\n", ERROR_NO_MORE_ITEMS, error); + ok(device_idx > 0 || broken(device_idx == 0) /* w7u_2qxl TestBot */, + "Expected at least one monitor.\n"); + SetupDiDestroyDeviceInfoList(devinfo); +} + START_TEST(monitor) { init_function_pointers(); @@ -2365,4 +2454,5 @@ START_TEST(monitor) test_display_config(); test_handles(); test_display_dc(); + test_display_device_interfaces(); } -- 2.30.2

3 2

[PATCH v2 1/3] ntdll: Factor out get_vprot_range_size() function.
by Paul Gofman 16 Sep '21

16 Sep '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/virtual.c | 49 ++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 984af2d4a21..3028910ce5c 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -943,6 +943,23 @@ static BYTE get_page_vprot( const void *addr ) } +/*********************************************************************** + * get_vprot_range_size + * + * Return the size of the region with equal masked protection byte. + * The function assumes that base and size are page aligned and + * base + size does not wrap around. */ +static SIZE_T get_vprot_range_size( BYTE *base, SIZE_T size, BYTE mask, BYTE *vprot ) +{ + BYTE *addr; + + *vprot = get_page_vprot( base ); + for (addr = base + page_size; addr != base + size; addr += page_size) + if ((*vprot ^ get_page_vprot( addr )) & mask) break; + + return addr - base; +} + /*********************************************************************** * set_page_vprot * @@ -2047,18 +2064,21 @@ done: */ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vprot ) { - SIZE_T i, start; + SIZE_T offset; - start = ((char *)base - (char *)view->base) >> page_shift; - *vprot = get_page_vprot( base ); + base = ROUND_ADDR( base, page_mask ); + offset = (BYTE *)base - (BYTE *)view->base; if (view->protect & SEC_RESERVE) { SIZE_T ret = 0; + + *vprot = get_page_vprot( base ); + SERVER_START_REQ( get_mapping_committed_range ) { req->base = wine_server_client_ptr( view->base ); - req->offset = start << page_shift; + req->offset = offset; if (!wine_server_call( req )) { ret = reply->size; @@ -2072,9 +2092,8 @@ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vpro SERVER_END_REQ; return ret; } - for (i = start + 1; i < view->size >> page_shift; i++) - if ((*vprot ^ get_page_vprot( (char *)view->base + (i << page_shift) )) & VPROT_COMMITTED) break; - return (i - start) << page_shift; + + return get_vprot_range_size( base, view->size - offset, VPROT_COMMITTED, vprot ); } @@ -4098,7 +4117,7 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, SIZE_T len, SIZE_T *res_len ) { struct file_view *view; - char *base, *alloc_base = 0, *alloc_end = working_set_limit; + BYTE *base, *alloc_base = 0, *alloc_end = working_set_limit; struct wine_rb_entry *ptr; sigset_t sigset; @@ -4145,20 +4164,20 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, while (ptr) { view = WINE_RB_ENTRY_VALUE( ptr, struct file_view, entry ); - if ((char *)view->base > base) + if ((BYTE *)view->base > base) { alloc_end = view->base; ptr = ptr->left; } - else if ((char *)view->base + view->size <= base) + else if ((BYTE *)view->base + view->size <= base) { - alloc_base = (char *)view->base + view->size; + alloc_base = (BYTE *)view->base + view->size; ptr = ptr->right; } else { alloc_base = view->base; - alloc_end = (char *)view->base + view->size; + alloc_end = (BYTE *)view->base + view->size; break; } } @@ -4196,7 +4215,6 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, else { BYTE vprot; - char *ptr; SIZE_T range_size = get_committed_size( view, base, &vprot ); info->State = (vprot & VPROT_COMMITTED) ? MEM_COMMIT : MEM_RESERVE; @@ -4205,9 +4223,8 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, if (view->protect & SEC_IMAGE) info->Type = MEM_IMAGE; else if (view->protect & (SEC_FILE | SEC_RESERVE | SEC_COMMIT)) info->Type = MEM_MAPPED; else info->Type = MEM_PRIVATE; - for (ptr = base; ptr < base + range_size; ptr += page_size) - if ((get_page_vprot( ptr ) ^ vprot) & ~VPROT_WRITEWATCH) break; - info->RegionSize = ptr - base; + + info->RegionSize = get_vprot_range_size( base, range_size, ~VPROT_WRITEWATCH, &vprot ); } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); -- 2.31.1

1 2

[PATCH] mshtml: Fix out-of-bounds props access.
by Gabriel Ivăncescu 16 Sep '21

16 Sep '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index c758800..64ead8f 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1736,7 +1736,7 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID DWORD idx = id - DISPID_DYNPROP_0; dynamic_prop_t *prop; - if(!get_dynamic_data(This) || idx > This->dynamic_data->prop_cnt) + if(!get_dynamic_data(This) || idx >= This->dynamic_data->prop_cnt) return S_OK; prop = This->dynamic_data->props + idx; -- 2.31.1

2 1

[PATCH 1/3] ntdll: Factor out get_vprot_range_size() function.
by Paul Gofman 16 Sep '21

16 Sep '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/virtual.c | 49 ++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 984af2d4a21..3028910ce5c 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -943,6 +943,23 @@ static BYTE get_page_vprot( const void *addr ) } +/*********************************************************************** + * get_vprot_range_size + * + * Return the size of the region with equal masked protection byte. + * The function assumes that base and size are page aligned and + * base + size does not wrap around. */ +static SIZE_T get_vprot_range_size( BYTE *base, SIZE_T size, BYTE mask, BYTE *vprot ) +{ + BYTE *addr; + + *vprot = get_page_vprot( base ); + for (addr = base + page_size; addr != base + size; addr += page_size) + if ((*vprot ^ get_page_vprot( addr )) & mask) break; + + return addr - base; +} + /*********************************************************************** * set_page_vprot * @@ -2047,18 +2064,21 @@ done: */ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vprot ) { - SIZE_T i, start; + SIZE_T offset; - start = ((char *)base - (char *)view->base) >> page_shift; - *vprot = get_page_vprot( base ); + base = ROUND_ADDR( base, page_mask ); + offset = (BYTE *)base - (BYTE *)view->base; if (view->protect & SEC_RESERVE) { SIZE_T ret = 0; + + *vprot = get_page_vprot( base ); + SERVER_START_REQ( get_mapping_committed_range ) { req->base = wine_server_client_ptr( view->base ); - req->offset = start << page_shift; + req->offset = offset; if (!wine_server_call( req )) { ret = reply->size; @@ -2072,9 +2092,8 @@ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vpro SERVER_END_REQ; return ret; } - for (i = start + 1; i < view->size >> page_shift; i++) - if ((*vprot ^ get_page_vprot( (char *)view->base + (i << page_shift) )) & VPROT_COMMITTED) break; - return (i - start) << page_shift; + + return get_vprot_range_size( base, view->size - offset, VPROT_COMMITTED, vprot ); } @@ -4098,7 +4117,7 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, SIZE_T len, SIZE_T *res_len ) { struct file_view *view; - char *base, *alloc_base = 0, *alloc_end = working_set_limit; + BYTE *base, *alloc_base = 0, *alloc_end = working_set_limit; struct wine_rb_entry *ptr; sigset_t sigset; @@ -4145,20 +4164,20 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, while (ptr) { view = WINE_RB_ENTRY_VALUE( ptr, struct file_view, entry ); - if ((char *)view->base > base) + if ((BYTE *)view->base > base) { alloc_end = view->base; ptr = ptr->left; } - else if ((char *)view->base + view->size <= base) + else if ((BYTE *)view->base + view->size <= base) { - alloc_base = (char *)view->base + view->size; + alloc_base = (BYTE *)view->base + view->size; ptr = ptr->right; } else { alloc_base = view->base; - alloc_end = (char *)view->base + view->size; + alloc_end = (BYTE *)view->base + view->size; break; } } @@ -4196,7 +4215,6 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, else { BYTE vprot; - char *ptr; SIZE_T range_size = get_committed_size( view, base, &vprot ); info->State = (vprot & VPROT_COMMITTED) ? MEM_COMMIT : MEM_RESERVE; @@ -4205,9 +4223,8 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, if (view->protect & SEC_IMAGE) info->Type = MEM_IMAGE; else if (view->protect & (SEC_FILE | SEC_RESERVE | SEC_COMMIT)) info->Type = MEM_MAPPED; else info->Type = MEM_PRIVATE; - for (ptr = base; ptr < base + range_size; ptr += page_size) - if ((get_page_vprot( ptr ) ^ vprot) & ~VPROT_WRITEWATCH) break; - info->RegionSize = ptr - base; + + info->RegionSize = get_vprot_range_size( base, range_size, ~VPROT_WRITEWATCH, &vprot ); } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); -- 2.31.1

1 2

[PATCH v11 1/2] ntdll/socket: Implement exclusive flag for IOCTL_AFD_POLL.
by Guillaume Charifi 16 Sep '21

16 Sep '21

Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/ntdll/unix/socket.c | 6 ++-- include/wine/afd.h | 2 +- server/protocol.def | 1 + server/sock.c | 67 ++++++++++++++++++++++++++++++++++++++-- 4 files changed, 69 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 73d61c0d4e6..c40d0b526d7 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -736,12 +736,11 @@ static NTSTATUS sock_poll( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi || in_size < offsetof( struct afd_poll_params, sockets[params->count] )) return STATUS_INVALID_PARAMETER; - TRACE( "timeout %s, count %u, unknown %#x, padding (%#x, %#x, %#x), sockets[0] {%04lx, %#x}\n", - wine_dbgstr_longlong(params->timeout), params->count, params->unknown, + TRACE( "timeout %s, count %u, exclusive %u, padding (%#x, %#x, %#x), sockets[0] {%04lx, %#x}\n", + wine_dbgstr_longlong(params->timeout), params->count, params->exclusive, params->padding[0], params->padding[1], params->padding[2], params->sockets[0].socket, params->sockets[0].flags ); - if (params->unknown) FIXME( "unknown boolean is %#x\n", params->unknown ); if (params->padding[0]) FIXME( "padding[0] is %#x\n", params->padding[0] ); if (params->padding[1]) FIXME( "padding[1] is %#x\n", params->padding[1] ); if (params->padding[2]) FIXME( "padding[2] is %#x\n", params->padding[2] ); @@ -782,6 +781,7 @@ static NTSTATUS sock_poll( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi SERVER_START_REQ( poll_socket ) { req->async = server_async( handle, &async->io, event, apc, apc_user, iosb_client_ptr(io) ); + req->exclusive = !!params->exclusive; req->timeout = params->timeout; wine_server_add_data( req, input, params->count * sizeof(*input) ); wine_server_set_reply( req, async->sockets, params->count * sizeof(async->sockets[0]) ); diff --git a/include/wine/afd.h b/include/wine/afd.h index e67ecae25a9..f4682f464e8 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -104,7 +104,7 @@ struct afd_poll_params { LONGLONG timeout; unsigned int count; - BOOLEAN unknown; + BOOLEAN exclusive; BOOLEAN padding[3]; struct { diff --git a/server/protocol.def b/server/protocol.def index a5030fcf813..6a3faf3e625 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1451,6 +1451,7 @@ struct poll_socket_output /* Perform an async poll on a socket */ @REQ(poll_socket) + int exclusive; async_data_t async; /* async I/O parameters */ timeout_t timeout; /* timeout */ VARARG(sockets,poll_socket_input); /* list of sockets to poll */ diff --git a/server/sock.c b/server/sock.c index fc234e89865..bfff6a562ad 100644 --- a/server/sock.c +++ b/server/sock.c @@ -128,6 +128,7 @@ struct poll_req struct async *async; struct iosb *iosb; struct timeout_user *timeout; + int exclusive; unsigned int count; struct poll_socket_output *output; struct @@ -205,6 +206,7 @@ struct sock struct list accept_list; /* list of pending accept requests */ struct accept_req *accept_recv_req; /* pending accept-into request which will recv on this socket */ struct connect_req *connect_req; /* pending connection request */ + struct poll_req *main_poll; /* main poll */ union win_sockaddr addr; /* socket name */ int addr_len; /* socket name length */ unsigned int rcvbuf; /* advisory recv buffer size */ @@ -231,6 +233,7 @@ static int sock_get_poll_events( struct fd *fd ); static void sock_poll_event( struct fd *fd, int event ); static enum server_fd_type sock_get_fd_type( struct fd *fd ); static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); +static void sock_cancel_async( struct fd *fd, struct async *async ); static void sock_queue_async( struct fd *fd, struct async *async, int type, int count ); static void sock_reselect_async( struct fd *fd, struct async_queue *queue ); @@ -274,7 +277,7 @@ static const struct fd_ops sock_fd_ops = default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ sock_ioctl, /* ioctl */ - default_fd_cancel_async, /* cancel_async */ + sock_cancel_async, /* cancel_async */ sock_queue_async, /* queue_async */ sock_reselect_async /* reselect_async */ }; @@ -788,7 +791,13 @@ static void free_poll_req( void *private ) if (req->timeout) remove_timeout_user( req->timeout ); for (i = 0; i < req->count; ++i) + { + if (req->sockets[i].sock->main_poll == req) + req->sockets[i].sock->main_poll = NULL; + release_object( req->sockets[i].sock ); + } + release_object( req->async ); release_object( req->iosb ); list_remove( &req->entry ); @@ -1217,6 +1226,30 @@ static enum server_fd_type sock_get_fd_type( struct fd *fd ) return FD_TYPE_SOCKET; } +static void sock_cancel_async( struct fd *fd, struct async *async ) +{ + struct sock *sock = get_fd_user( fd ); + struct poll_req *req; + unsigned int i; + + if (sock->main_poll) + { + LIST_FOR_EACH_ENTRY( req, &poll_list, struct poll_req, entry ) + { + if (req->async != async) + continue; + + if (req == sock->main_poll) + { + sock->main_poll = NULL; + break; + } + } + } + + async_terminate( async, STATUS_CANCELLED ); +} + static void sock_queue_async( struct fd *fd, struct async *async, int type, int count ) { struct sock *sock = get_fd_user( fd ); @@ -1383,6 +1416,7 @@ static struct sock *create_socket(void) sock->ifchange_obj = NULL; sock->accept_recv_req = NULL; sock->connect_req = NULL; + sock->main_poll = NULL; memset( &sock->addr, 0, sizeof(sock->addr) ); sock->addr_len = 0; sock->rd_shutdown = 0; @@ -2840,7 +2874,31 @@ static int poll_single_socket( struct sock *sock, int mask ) return get_poll_flags( sock, pollfd.revents ) & mask; } -static void poll_socket( struct sock *poll_sock, struct async *async, timeout_t timeout, +static void poll_handle_exclusive(struct poll_req *req) +{ + unsigned int i; + + for (i = 0; i < req->count; ++i) + { + struct poll_req *main_poll = req->sockets[i].sock->main_poll; + + if (main_poll && main_poll->exclusive && req->exclusive) + { + /* Previous exclusive main poll replaced by new exclusive poll. */ + main_poll->iosb->status = STATUS_SUCCESS; + main_poll->iosb->out_data = main_poll->output; + main_poll->iosb->out_size = main_poll->count * sizeof(*main_poll->output); + async_terminate(main_poll->async, STATUS_ALERTED); + + main_poll = NULL; + } + + if (!main_poll) + req->sockets[i].sock->main_poll = req; + } +} + +static void poll_socket( struct sock *poll_sock, struct async *async, int exclusive, timeout_t timeout, unsigned int count, const struct poll_socket_input *input ) { struct poll_socket_output *output; @@ -2881,11 +2939,14 @@ static void poll_socket( struct sock *poll_sock, struct async *async, timeout_t req->sockets[i].flags = input[i].flags; } + req->exclusive = exclusive; req->count = count; req->async = (struct async *)grab_object( async ); req->iosb = async_get_iosb( async ); req->output = output; + poll_handle_exclusive(req); + list_add_tail( &poll_list, &req->entry ); async_set_completion_callback( async, free_poll_req, req ); queue_async( &poll_sock->poll_q, async ); @@ -3287,7 +3348,7 @@ DECL_HANDLER(poll_socket) if ((async = create_request_async( sock->fd, get_fd_comp_flags( sock->fd ), &req->async ))) { - poll_socket( sock, async, req->timeout, count, input ); + poll_socket( sock, async, req->exclusive, req->timeout, count, input ); reply->wait = async_handoff( async, NULL, 0 ); reply->options = get_fd_options( sock->fd ); release_object( async ); -- 2.33.0

2 2

[PATCH v2 1/5] user32/tests: Fix existing winevents in test_showwindow() message sequences.
by Connor McAdams 16 Sep '21

16 Sep '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- -v2: Don't run test_showwindow() until after missing winevents are added. dlls/user32/tests/msg.c | 46 ++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 4c9f1dc6913..420ada6e384 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -724,7 +724,7 @@ static const struct message WmCreateMaxPopupSeq[] = { { WM_NCCREATE, sent }, { WM_NCCALCSIZE, sent|wparam, 0 }, { WM_CREATE, sent }, - { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_SIZE, sent|wparam, SIZE_RESTORED }, { WM_MOVE, sent }, { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, @@ -734,12 +734,12 @@ static const struct message WmCreateMaxPopupSeq[] = { { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOREDRAW|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_SHOWWINDOW, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { HCBT_ACTIVATE, hook }, - { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_NCPAINT, sent|wparam|optional, 1 }, @@ -751,7 +751,7 @@ static const struct message WmCreateMaxPopupSeq[] = { { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, { WM_GETTEXT, sent|optional }, { WM_SYNCPAINT, sent|wparam|optional, 4 }, @@ -768,7 +768,7 @@ static const struct message WmCreateInvisibleMaxPopupSeq[] = { { WM_NCCREATE, sent }, { WM_NCCALCSIZE, sent|wparam, 0 }, { WM_CREATE, sent }, - { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_SIZE, sent|wparam, SIZE_RESTORED }, { WM_MOVE, sent }, { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, @@ -778,7 +778,7 @@ static const struct message WmCreateInvisibleMaxPopupSeq[] = { { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOREDRAW|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { 0 } }; /* ShowWindow(SW_SHOWMAXIMIZED) for a resized not visible popup window */ @@ -787,9 +787,9 @@ static const struct message WmShowMaxPopupResizedSeq[] = { { WM_GETMINMAXINFO, sent }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED, 0, SWP_STATECHANGED /* w1064v1809 */ }, { WM_NCCALCSIZE, sent|wparam, TRUE }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { HCBT_ACTIVATE, hook }, - { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_NCPAINT, sent|wparam|optional, 1 }, @@ -801,7 +801,7 @@ static const struct message WmShowMaxPopupResizedSeq[] = { { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, { WM_GETTEXT, sent|optional }, { WM_NCPAINT, sent|wparam|optional, 1 }, @@ -810,7 +810,7 @@ static const struct message WmShowMaxPopupResizedSeq[] = { /* WinNT4.0 sends WM_MOVE */ { WM_MOVE, sent|defwinproc|optional }, { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { 0 } }; /* ShowWindow(SW_SHOWMAXIMIZED) for a not visible popup window */ @@ -819,9 +819,9 @@ static const struct message WmShowMaxPopupSeq[] = { { WM_GETMINMAXINFO, sent }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED, 0, SWP_STATECHANGED /* w1064v1809 */ }, { WM_NCCALCSIZE, sent|wparam, TRUE }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { HCBT_ACTIVATE, hook }, - { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_NCPAINT, sent|wparam|optional, 1 }, @@ -833,7 +833,7 @@ static const struct message WmShowMaxPopupSeq[] = { { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, { WM_GETTEXT, sent|optional }, { WM_SYNCPAINT, sent|wparam|optional, 4 }, @@ -842,8 +842,8 @@ static const struct message WmShowMaxPopupSeq[] = { { WM_NCPAINT, sent|wparam|defwinproc|optional, 1 }, { WM_ERASEBKGND, sent|defwinproc|optional }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOMOVE|SWP_NOSIZE, 0, SWP_STATECHANGED /* w1064v1809 */ }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_SIZE, sent|defwinproc|optional }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { 0 } }; /* CreateWindow(WS_VISIBLE) for popup window */ @@ -852,14 +852,14 @@ static const struct message WmCreatePopupSeq[] = { { WM_NCCREATE, sent }, { WM_NCCALCSIZE, sent|wparam, 0 }, { WM_CREATE, sent }, - { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_SIZE, sent|wparam, SIZE_RESTORED }, { WM_MOVE, sent }, { WM_SHOWWINDOW, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { HCBT_ACTIVATE, hook }, - { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_NCPAINT, sent|wparam|optional, 1 }, @@ -871,7 +871,7 @@ static const struct message WmCreatePopupSeq[] = { { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, { WM_GETTEXT, sent|optional }, { WM_SYNCPAINT, sent|wparam|optional, 4 }, @@ -894,7 +894,7 @@ static const struct message WmShowVisMaxPopupSeq[] = { { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { 0 } }; /* ShowWindow(hwnd, SW_RESTORE) to a minimized window */ @@ -2068,7 +2068,7 @@ static const struct message WmSHOWNAChildVisParVis[] = { static const struct message WmSHOWNAChildInvisParVis[] = { { WM_SHOWWINDOW, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_ERASEBKGND, sent|optional }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOACTIVATE|SWP_NOCLIENTMOVE }, { 0 } @@ -2091,7 +2091,7 @@ static const struct message WmSHOWNATopInvisible[] = { { WM_WINDOWPOSCHANGED, sent|optional }, { WM_SHOWWINDOW, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_NCPAINT, sent|wparam|optional, 1 }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, @@ -2099,7 +2099,7 @@ static const struct message WmSHOWNATopInvisible[] = { { WM_NCCALCSIZE, sent|wparam|optional, 1 }, { WM_NCPAINT, sent|wparam|optional, 1 }, { WM_ERASEBKGND, sent|optional }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 sends it, but Win8+ doesn't. */ { WM_SIZE, sent|wparam, SIZE_RESTORED }, { WM_MOVE, sent }, { 0 } -- 2.25.1

2 10

[PATCH v2] oleacc: Add tests for AccessibleObjectFromEvent.
by Piotr Caban 16 Sep '21

16 Sep '21

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - don't create new IAccessible implementation in tests - test exact returns values - remove tests that were testing code inside tests dlls/oleacc/tests/main.c | 170 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 162 insertions(+), 8 deletions(-)

2 1

[PATCH] d2d1: Check the vertex count again after duplicate removal in d2d_path_geometry_triangulate().
by Henri Verbeet 16 Sep '21

16 Sep '21

As the test shows, we can create geometries that have less than two vertices after eliminating duplicates. Calling d2d_cdt_triangulate() on those would lead to infinite recursion. In principle we could now get rid of the original vertex count check, but it seems cheap enough that it's worth keeping in order to avoid some unnecessary work in the somewhat more common case that we have less than three vertices before duplicate removal. Based on a patch by Changsheng Chen. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/geometry.c | 7 +++++++ dlls/d2d1/tests/d2d1.c | 22 ++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 6da93de3eb4..c7d0d94f1ad 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2061,6 +2061,13 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) } } + if (vertex_count < 3) + { + WARN("Geometry has %lu vertices after eliminating duplicates.\n", (long)vertex_count); + heap_free(vertices); + return S_OK; + } + geometry->fill.vertices = vertices; geometry->fill.vertex_count = vertex_count; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3e2eda8a4a4..d38d49cd139 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3268,6 +3268,28 @@ static void test_path_geometry(BOOL d3d11) ID2D1PathGeometry_Release(geometry); + /* Degenerate figure. */ + hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); + ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr); + hr = ID2D1PathGeometry_Open(geometry, &sink); + ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr); + set_point(&point, 123.0f, 456.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + quadratic_to(sink, 123.0f, 456.0f, 123.0f, 456.0f); + quadratic_to(sink, 123.0f, 456.0f, 123.0f, 456.0f); + quadratic_to(sink, 123.0f, 456.0f, 123.0f, 456.0f); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + hr = ID2D1GeometrySink_Close(sink); + ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr); + ID2D1GeometrySink_Release(sink); + hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); + ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr); + ok(count == 1, "Got unexpected figure count %u.\n", count); + hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count); + ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr); + ok(count == 4, "Got unexpected segment count %u.\n", count); + ID2D1PathGeometry_Release(geometry); + /* Close right after Open(). */ hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr); -- 2.20.1

1 0

[PATCH] oleacc: Add tests for AccessibleObjectFromEvent.
by Connor McAdams 16 Sep '21

16 Sep '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- -This might technically be a v5, but since the AccessibleObjectFromEvent patch was accepted and not the tests, I've not marked this v5. dlls/oleacc/tests/main.c | 994 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 994 insertions(+) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index ce44e06abe4..34498d2b3fe 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -304,6 +304,772 @@ static IAccessibleVtbl AccessibleVtbl = { static IAccessible Accessible = {&AccessibleVtbl}; +/* + * Create an accessibility tree that looks like this: + * --ACC_TREE_OBJ_ID_ROOT (Full object) + * ----ACC_TREE_OBJ_ID_CHILD_0 (Full object) + * ----ACC_TREE_OBJ_ID_CHILD_1 (Full object) + * ------ACC_TREE_OBJ_ID_CHILD_1_0 (Simple element) + * ------ACC_TREE_OBJ_ID_CHILD_1_1 (Full object) + * ----ACC_TREE_OBJ_ID_CHILD_2 (Simple element) + */ +enum { + ACC_TREE_OBJ_ID_NONE = -1, + ACC_TREE_OBJ_ID_ROOT = 1, + ACC_TREE_OBJ_ID_CHILD_0, + ACC_TREE_OBJ_ID_CHILD_1, + ACC_TREE_OBJ_ID_CHILD_1_0, + ACC_TREE_OBJ_ID_CHILD_1_1, + ACC_TREE_OBJ_ID_CHILD_2, +}; + +typedef struct { + const WCHAR *name; + + INT parent_id, child_id, child_pos; + BOOL is_simple_elem; + UINT child_count; +} acc_tree_object_info; + +typedef struct { + IAccessible IAccessible_iface; + IEnumVARIANT IEnumVARIANT_iface; + + LONG ref; + + const acc_tree_object_info *info; + + HWND hwnd; + UINT enum_pos; + + IAccessible *parent; + IAccessible *children[3]; +} AccTreeObject; + +static AccTreeObject *object_tree = NULL; +static BOOL acc_query_interface_test_fail = FALSE; + +const acc_tree_object_info acc_from_event_obj_tree[] = { + { .name = L"acc_tree_root", + .parent_id = ACC_TREE_OBJ_ID_NONE, + .child_id = ACC_TREE_OBJ_ID_ROOT, + .child_pos = 0, + .child_count = 3, + .is_simple_elem = FALSE, + }, + { .name = L"acc_tree_child_0", + .parent_id = ACC_TREE_OBJ_ID_ROOT, + .child_id = ACC_TREE_OBJ_ID_CHILD_0, + .child_pos = 0, + .child_count = 0, + .is_simple_elem = FALSE, + }, + { .name = L"acc_tree_child_1", + .parent_id = ACC_TREE_OBJ_ID_ROOT, + .child_id = ACC_TREE_OBJ_ID_CHILD_1, + .child_pos = 1, + .child_count = 2, + .is_simple_elem = FALSE, + }, + { .name = L"acc_tree_child_1_0", + .parent_id = ACC_TREE_OBJ_ID_CHILD_1, + .child_id = ACC_TREE_OBJ_ID_CHILD_1_0, + .child_pos = 0, + .child_count = 0, + .is_simple_elem = TRUE, + }, + { .name = L"acc_tree_child_1_1", + .parent_id = ACC_TREE_OBJ_ID_CHILD_1, + .child_id = ACC_TREE_OBJ_ID_CHILD_1_1, + .child_pos = 1, + .child_count = 0, + .is_simple_elem = FALSE, + }, + { .name = L"acc_tree_child_2", + .parent_id = ACC_TREE_OBJ_ID_ROOT, + .child_id = ACC_TREE_OBJ_ID_CHILD_2, + .child_pos = 2, + .child_count = 0, + .is_simple_elem = TRUE, + }, +}; + +/* + * AccTreeObj IAccessible Vtbl. + */ +static inline AccTreeObject* impl_from_AccTreeObject(IAccessible *iface) +{ + return CONTAINING_RECORD(iface, AccTreeObject, IAccessible_iface); +} + +static IAccessible *get_acc_tree_obj_child(IAccessible *iface, VARIANT child_id) +{ + AccTreeObject *obj = impl_from_AccTreeObject(iface); + IAccessible *acc = NULL; + LONG i; + + if (V_VT(&child_id) != VT_I4) + return NULL; + + if (V_I4(&child_id) == CHILDID_SELF) + { + IAccessible_AddRef(iface); + return iface; + } + + for (i = 0; i < obj->info->child_count; i++) + { + AccTreeObject *child = impl_from_AccTreeObject(obj->children[i]); + + if (child->info->child_id == V_I4(&child_id)) + { + acc = &child->IAccessible_iface; + break; + } + } + + if (acc) + IAccessible_AddRef(acc); + + return acc; +} + +static void check_acc_tree_obj_for_child(IAccessible *acc, + INT child_id, IAccessible **found_acc, VARIANT *found_vid) +{ + IDispatch *disp_child; + VARIANT vid; + HRESULT hr; + + V_VT(&vid) = VT_I4; + V_I4(&vid) = child_id; + hr = IAccessible_get_accChild(acc, vid, &disp_child); + if (SUCCEEDED(hr)) + { + /* + * If S_FALSE is returned, the childID was found, but it's a simple + * element. + */ + if (hr == S_FALSE) + { + *found_acc = acc; + V_VT(found_vid) = VT_I4; + V_I4(found_vid) = child_id; + } + else + { + IDispatch_QueryInterface(disp_child, &IID_IAccessible, + (void **)found_acc); + V_VT(found_vid) = VT_I4; + V_I4(found_vid) = CHILDID_SELF; + IDispatch_Release(disp_child); + } + } +} + +static void search_acc_tree_for_child_enumVARIANT(IAccessible *acc, + INT child_id, IAccessible **found_acc, VARIANT *found_vid) +{ + LONG child_cnt, i, rcv; + VARIANT *children; + HRESULT hr; + + IAccessible_get_accChildCount(acc, &child_cnt); + if (!child_cnt) + return; + + check_acc_tree_obj_for_child(acc, child_id, found_acc, found_vid); + if (*found_acc) + return; + + children = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(*children) * child_cnt); + hr = AccessibleChildren(acc, 0, child_cnt, children, &rcv); + ok(hr == S_OK, "AccessibleChildren failed with %#x!\n", hr); + + /* + * We only care about VT_DISPATCH VARIANT's here, because simple elements + * cannot have children, and if they were a match it would've been found + * in check_acc_tree_obj_for_child(). + */ + for (i = 0; i < child_cnt; i++) + { + VARIANT *res = &children[i]; + IAccessible *acc_child; + + if (V_VT(res) != VT_DISPATCH) + continue; + + if (!(*found_acc)) + { + hr = IDispatch_QueryInterface(V_DISPATCH(res), &IID_IAccessible, (void **)&acc_child); + if (SUCCEEDED(hr)) + search_acc_tree_for_child_enumVARIANT(acc_child, child_id, found_acc, found_vid); + + if (*found_acc != acc_child) + IAccessible_Release(acc_child); + } + + IDispatch_Release(V_DISPATCH(res)); + } + + HeapFree(GetProcessHeap(), 0, (void *)children); +} + +static void search_acc_tree_for_child_navigate(IAccessible *acc, + INT child_id, IAccessible **found_acc, VARIANT *found_vid) +{ + VARIANT vid, res; + HRESULT hr; + + check_acc_tree_obj_for_child(acc, child_id, found_acc, found_vid); + if (*found_acc) + return; + + V_VT(&vid) = VT_I4; + V_I4(&vid) = CHILDID_SELF; + hr = IAccessible_accNavigate(acc, NAVDIR_FIRSTCHILD, vid, &res); + if (FAILED(hr)) + return; + + while (SUCCEEDED(hr) && V_VT(&res) != VT_EMPTY && !(*found_acc)) + { + switch (V_VT(&res)) + { + case VT_I4: + vid = res; + hr = IAccessible_accNavigate(acc, NAVDIR_NEXT, vid, &res); + break; + + case VT_DISPATCH: + { + IAccessible *acc_child; + + hr = IDispatch_QueryInterface(V_DISPATCH(&res), &IID_IAccessible, (void **)&acc_child); + IDispatch_Release(V_DISPATCH(&res)); + + if (SUCCEEDED(hr)) + { + search_acc_tree_for_child_navigate(acc_child, child_id, found_acc, found_vid); + + if (!(*found_acc)) + { + V_VT(&vid) = VT_I4; + V_I4(&vid) = CHILDID_SELF; + hr = IAccessible_accNavigate(acc_child, NAVDIR_NEXT, vid, &res); + } + + if (*found_acc != acc_child) + IAccessible_Release(acc_child); + } + break; + } + + default: + ok(0, "Invalid VARIANT type %d from accNavigate\n", V_VT(&res)); + return; + } + } +} + +HRESULT WINAPI AccTreeObject_QueryInterface(IAccessible *iface, REFIID riid, void **ppv) +{ + AccTreeObject *This = impl_from_AccTreeObject(iface); + + if((IsEqualIID(riid, &IID_IAccessible) && !acc_query_interface_test_fail) || + IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID_IUnknown)) { + *ppv = iface; + }else if(IsEqualIID(riid, &IID_IEnumVARIANT)) { + *ppv = &This->IEnumVARIANT_iface; + }else { + *ppv = NULL; + return E_NOINTERFACE; + } + + IAccessible_AddRef(iface); + return S_OK; +} + +ULONG WINAPI AccTreeObject_AddRef(IAccessible *iface) +{ + AccTreeObject *This = impl_from_AccTreeObject(iface); + return InterlockedIncrement(&This->ref); +} + +ULONG WINAPI AccTreeObject_Release(IAccessible *iface) +{ + AccTreeObject *This = impl_from_AccTreeObject(iface); + return InterlockedDecrement(&This->ref); +} + +HRESULT WINAPI AccTreeObject_GetTypeInfoCount( + IAccessible *iface, UINT *pctinfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI AccTreeObject_GetTypeInfo(IAccessible *iface, + UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI AccTreeObject_GetIDsOfNames(IAccessible *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI AccTreeObject_Invoke(IAccessible *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI AccTreeObject_get_accParent( + IAccessible *iface, IDispatch **disp_parent) +{ + AccTreeObject *This = impl_from_AccTreeObject(iface); + + if (This->parent) + return IAccessible_QueryInterface(This->parent, &IID_IDispatch, (void **)disp_parent); + *disp_parent = NULL; + + return S_FALSE; +} + +HRESULT WINAPI AccTreeObject_get_accChildCount( + IAccessible *iface, LONG *pcountChildren) +{ + AccTreeObject *This = impl_from_AccTreeObject(iface); + + *pcountChildren = This->info->child_count; + + return S_OK; +} + +HRESULT WINAPI AccTreeObject_get_accChild(IAccessible *iface, + VARIANT varChildID, IDispatch **ppdispChild) +{ + IAccessible *child; + AccTreeObject *obj; + HRESULT hr; + + *ppdispChild = NULL; + if (!(child = get_acc_tree_obj_child(iface, varChildID))) + return E_INVALIDARG; + + obj = impl_from_AccTreeObject(child); + if (obj->info->is_simple_elem) + { + IAccessible_Release(child); + return S_FALSE; + } + + if (FAILED(hr = IAccessible_QueryInterface(child, &IID_IDispatch, (void **)ppdispChild))) + return hr; + + IAccessible_Release(child); + + return S_OK; +} + +HRESULT WINAPI AccTreeObject_get_accName(IAccessible *iface, + VARIANT varID, BSTR *pszName) +{ + IAccessible *child; + AccTreeObject *obj; + + *pszName = NULL; + if (!(child = get_acc_tree_obj_child(iface, varID))) + return E_INVALIDARG; + + obj = impl_from_AccTreeObject(child); + *pszName = SysAllocString(obj->info->name); + IAccessible_Release(child); + + return S_OK; +} + +HRESULT WINAPI AccTreeObject_get_accValue(IAccessible *iface, + VARIANT varID, BSTR *pszValue) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI AccTreeObject_get_accDescription(IAccessible *iface, + VARIANT varID, BSTR *pszDescription) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI AccTreeObject_get_accRole(IAccessible *iface, + VARIANT varID, VARIANT *pvarRole) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI AccTreeObject_get_accState(IAccessible *iface, + VARIANT varID, VARIANT *pvarState) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI AccTreeObject_get_accHelp(IAccessible *iface, + VARIANT varID, BSTR *pszHelp) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI AccTreeObject_get_accHelpTopic(IAccessible *iface, + BSTR *pszHelpFile, VARIANT varID, LONG *pidTopic) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI AccTreeObject_get_accKeyboardShortcut(IAccessible *iface, + VARIANT varID, BSTR *pszKeyboardShortcut) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI AccTreeObject_get_accFocus(IAccessible *iface, VARIANT *pvarID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI AccTreeObject_get_accSelection( + IAccessible *iface, VARIANT *pvarID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI AccTreeObject_get_accDefaultAction(IAccessible *iface, + VARIANT varID, BSTR *pszDefaultAction) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI AccTreeObject_accSelect(IAccessible *iface, + LONG flagsSelect, VARIANT varID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI AccTreeObject_accLocation(IAccessible *iface, LONG *pxLeft, + LONG *pyTop, LONG *pcxWidth, LONG *pcyHeight, VARIANT varID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI AccTreeObject_accNavigate(IAccessible *iface, + LONG navDir, VARIANT varStart, VARIANT *pvarEnd) +{ + AccTreeObject *This = impl_from_AccTreeObject(iface); + AccTreeObject *obj_start, *child; + IAccessible *acc_start; + HRESULT hr = S_FALSE; + + V_VT(pvarEnd) = VT_EMPTY; + if (!(acc_start = get_acc_tree_obj_child(iface, varStart))) + return E_INVALIDARG; + + child = NULL; + obj_start = impl_from_AccTreeObject(acc_start); + switch (navDir) + { + case NAVDIR_FIRSTCHILD: + case NAVDIR_LASTCHILD: + { + UINT child_cnt = obj_start->info->child_count; + + /* Cannot start with a child ID offset when getting first/last children. */ + if ((V_I4(&varStart) == CHILDID_SELF) && child_cnt) + { + if (navDir == NAVDIR_FIRSTCHILD) + child = impl_from_AccTreeObject(obj_start->children[0]); + else + child = impl_from_AccTreeObject(obj_start->children[child_cnt - 1]); + } + break; + } + + case NAVDIR_NEXT: + case NAVDIR_PREVIOUS: + { + AccTreeObject *parent; + INT next_pos; + + if (!obj_start->parent) + break; + + if (V_I4(&varStart) == CHILDID_SELF) + parent = impl_from_AccTreeObject(obj_start->parent); + else + parent = This; + + if (navDir == NAVDIR_PREVIOUS) + next_pos = obj_start->info->child_pos - 1; + else + next_pos = obj_start->info->child_pos + 1; + + if ((next_pos < 0) || (parent->info->child_count <= next_pos)) + break; + + child = impl_from_AccTreeObject(parent->children[next_pos]); + break; + } + + default: + break; + } + + if (child) + { + if (child->info->is_simple_elem) + { + V_VT(pvarEnd) = VT_I4; + V_I4(pvarEnd) = child->info->child_id; + } + else + { + V_VT(pvarEnd) = VT_DISPATCH; + IAccessible_QueryInterface(&child->IAccessible_iface, + &IID_IDispatch, (void **)&V_DISPATCH(pvarEnd)); + } + + hr = S_OK; + } + + if (acc_start) + IAccessible_Release(acc_start); + + return hr; +} + +HRESULT WINAPI AccTreeObject_accHitTest(IAccessible *iface, + LONG xLeft, LONG yTop, VARIANT *pvarID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI AccTreeObject_accDoDefaultAction( + IAccessible *iface, VARIANT varID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI AccTreeObject_put_accName(IAccessible *iface, + VARIANT varID, BSTR pszName) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI AccTreeObject_put_accValue(IAccessible *iface, + VARIANT varID, BSTR pszValue) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +IAccessibleVtbl AccTreeObjAccessibleVtbl = { + AccTreeObject_QueryInterface, + AccTreeObject_AddRef, + AccTreeObject_Release, + AccTreeObject_GetTypeInfoCount, + AccTreeObject_GetTypeInfo, + AccTreeObject_GetIDsOfNames, + AccTreeObject_Invoke, + AccTreeObject_get_accParent, + AccTreeObject_get_accChildCount, + AccTreeObject_get_accChild, + AccTreeObject_get_accName, + AccTreeObject_get_accValue, + AccTreeObject_get_accDescription, + AccTreeObject_get_accRole, + AccTreeObject_get_accState, + AccTreeObject_get_accHelp, + AccTreeObject_get_accHelpTopic, + AccTreeObject_get_accKeyboardShortcut, + AccTreeObject_get_accFocus, + AccTreeObject_get_accSelection, + AccTreeObject_get_accDefaultAction, + AccTreeObject_accSelect, + AccTreeObject_accLocation, + AccTreeObject_accNavigate, + AccTreeObject_accHitTest, + AccTreeObject_accDoDefaultAction, + AccTreeObject_put_accName, + AccTreeObject_put_accValue +}; + +/* + * AccTreeObj enumVARIANT Vtbl. + */ +inline AccTreeObject* impl_from_AccTreeObject_EnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, AccTreeObject, IEnumVARIANT_iface); +} + +HRESULT WINAPI AccTreeObject_EnumVARIANT_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + AccTreeObject *This = impl_from_AccTreeObject_EnumVARIANT(iface); + return IAccessible_QueryInterface(&This->IAccessible_iface, riid, ppv); +} + +ULONG WINAPI AccTreeObject_EnumVARIANT_AddRef(IEnumVARIANT *iface) +{ + AccTreeObject *This = impl_from_AccTreeObject_EnumVARIANT(iface); + return IAccessible_AddRef(&This->IAccessible_iface); +} + +ULONG WINAPI AccTreeObject_EnumVARIANT_Release(IEnumVARIANT *iface) +{ + AccTreeObject *This = impl_from_AccTreeObject_EnumVARIANT(iface); + return IAccessible_Release(&This->IAccessible_iface); +} + +HRESULT WINAPI AccTreeObject_EnumVARIANT_Next(IEnumVARIANT *iface, + ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + AccTreeObject *This = impl_from_AccTreeObject_EnumVARIANT(iface); + ULONG fetched = 0; + UINT i; + + for (i = This->enum_pos; i < This->info->child_count; i++) + { + AccTreeObject *child = impl_from_AccTreeObject(This->children[i]); + + if (child->info->is_simple_elem) + { + V_VT(&rgVar[i]) = VT_I4; + V_I4(&rgVar[i]) = child->info->child_id; + } + else + { + V_VT(&rgVar[i]) = VT_DISPATCH; + IAccessible_QueryInterface(&child->IAccessible_iface, &IID_IDispatch, + (void **)&V_DISPATCH(&rgVar[i])); + } + + fetched++; + } + + *pCeltFetched = fetched; + + return celt == fetched ? S_OK : S_FALSE; +} + +HRESULT WINAPI AccTreeObject_EnumVARIANT_Skip(IEnumVARIANT *iface, ULONG celt) +{ + AccTreeObject *This = impl_from_AccTreeObject_EnumVARIANT(iface); + + if ((celt + This->enum_pos) < This->info->child_count) + { + This->enum_pos += celt; + return S_OK; + } + + return S_FALSE; +} + +HRESULT WINAPI AccTreeObject_EnumVARIANT_Reset(IEnumVARIANT *iface) +{ + AccTreeObject *This = impl_from_AccTreeObject_EnumVARIANT(iface); + + This->enum_pos = 0; + + return S_OK; +} + +HRESULT WINAPI AccTreeObject_EnumVARIANT_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +const IEnumVARIANTVtbl AccTreeObjEnumVARIANTVtbl = { + AccTreeObject_EnumVARIANT_QueryInterface, + AccTreeObject_EnumVARIANT_AddRef, + AccTreeObject_EnumVARIANT_Release, + AccTreeObject_EnumVARIANT_Next, + AccTreeObject_EnumVARIANT_Skip, + AccTreeObject_EnumVARIANT_Reset, + AccTreeObject_EnumVARIANT_Clone +}; + +static HRESULT create_acc_obj_tree(const acc_tree_object_info *info, + unsigned int count) +{ + AccTreeObject *tree_objs; + unsigned int i; + + object_tree = NULL; + + tree_objs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(*tree_objs) * count); + if (!tree_objs) + return E_OUTOFMEMORY; + + for (i = 0; i < count; i++) + { + const acc_tree_object_info *cur_obj = &info[i]; + AccTreeObject *obj = &tree_objs[i]; + + obj->IAccessible_iface.lpVtbl = &AccTreeObjAccessibleVtbl; + obj->IEnumVARIANT_iface.lpVtbl = &AccTreeObjEnumVARIANTVtbl; + obj->ref = 1; + obj->info = cur_obj; + + if (cur_obj->parent_id != ACC_TREE_OBJ_ID_NONE) + { + AccTreeObject *parent = &tree_objs[cur_obj->parent_id - 1]; + + obj->parent = &parent->IAccessible_iface; + parent->children[cur_obj->child_pos] = &obj->IAccessible_iface; + } + } + + object_tree = tree_objs; + + return S_OK; +} + +static void free_acc_obj_tree(unsigned int count) +{ + unsigned int i; + + if (!object_tree) + return; + + for (i = 0; i < count; i++) + IAccessible_Release(&object_tree[i].IAccessible_iface); + + HeapFree(GetProcessHeap(), 0, object_tree); + object_tree = NULL; +} + static void test_getroletext(void) { INT ret, role; @@ -564,7 +1330,13 @@ static LRESULT WINAPI test_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA if(lparam == (DWORD)OBJID_CURSOR) return E_UNEXPECTED; if(lparam == (DWORD)OBJID_CLIENT) + { + if (object_tree) + return LresultFromObject(&IID_IAccessible, wparam, + (IUnknown *)&object_tree->IAccessible_iface); + return LresultFromObject(&IID_IUnknown, wparam, &Object); + } if(lparam == (DWORD)OBJID_WINDOW) return 0; @@ -621,6 +1393,227 @@ static void test_AccessibleObjectFromWindow(void) DestroyWindow(hwnd); } +static void test_AccessibleObjectFromEvent(void) +{ + IAccessible *acc, *acc_child; + const WCHAR *expected_name; + BSTR obj_name; + VARIANT cid; + HRESULT hr; + HWND hwnd; + + hwnd = CreateWindowA("oleacc_test", "test", WS_OVERLAPPEDWINDOW, + 0, 0, 0, 0, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed\n"); + + hr = create_acc_obj_tree(acc_from_event_obj_tree, + ARRAY_SIZE(acc_from_event_obj_tree)); + ok(hr == S_OK, "failed to create accessible object tree, hr %#x\n", hr); + + hr = AccessibleObjectFromEvent(NULL, OBJID_CLIENT, CHILDID_SELF, &acc, &cid); + ok(hr == E_FAIL, "got %#x\n", hr); + + hr = AccessibleObjectFromEvent(hwnd, OBJID_CLIENT, CHILDID_SELF, NULL, &cid); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + /* + * Test get_accChild's IDispatch::QueryInterface failing to return an + * IAccessible interface. + */ + acc_query_interface_test_fail = TRUE; + acc = NULL; + VariantInit(&cid); + hr = AccessibleObjectFromEvent(hwnd, OBJID_CLIENT, CHILDID_SELF, &acc, &cid); + ok(hr == E_NOINTERFACE, "got %#x\n", hr); + ok(acc == NULL, "Unexpected acc %p\n", acc); + ok(V_VT(&cid) == VT_EMPTY, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); + acc_query_interface_test_fail = FALSE; + + /* Same behavior as AccessibleObjectFromWindow. */ + hr = AccessibleObjectFromEvent(hwnd, OBJID_CURSOR, CHILDID_SELF, &acc, &cid); + ok(hr == E_UNEXPECTED, "got %#x\n", hr); + + /* Get a full object child. */ + hr = AccessibleObjectFromEvent(hwnd, OBJID_CLIENT, ACC_TREE_OBJ_ID_CHILD_0, &acc, &cid); + ok(SUCCEEDED(hr), "got %#x\n", hr); + ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); + ok(V_I4(&cid) == CHILDID_SELF, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + + expected_name = acc_from_event_obj_tree[ACC_TREE_OBJ_ID_CHILD_0 - 1].name; + hr = IAccessible_get_accName(acc, cid, &obj_name); + ok(SUCCEEDED(hr), "got %#x\n", hr); + ok(!lstrcmpW(obj_name, expected_name), "expected %s, got %s\n", + wine_dbgstr_w(expected_name), wine_dbgstr_w(obj_name)); + SysFreeString(obj_name); + IAccessible_Release(acc); + + /* Get a 'simple element' child. */ + hr = AccessibleObjectFromEvent(hwnd, OBJID_CLIENT, ACC_TREE_OBJ_ID_CHILD_2, &acc, &cid); + ok(SUCCEEDED(hr), "got %#x\n", hr); + ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); + ok(V_I4(&cid) == ACC_TREE_OBJ_ID_CHILD_2, "got %#x, expected %#x\n", V_I4(&cid), ACC_TREE_OBJ_ID_CHILD_2); + + expected_name = acc_from_event_obj_tree[ACC_TREE_OBJ_ID_CHILD_2 - 1].name; + hr = IAccessible_get_accName(acc, cid, &obj_name); + ok(SUCCEEDED(hr), "got %#x\n", hr); + ok(!lstrcmpW(obj_name, expected_name), "expected %s, got %s\n", + wine_dbgstr_w(expected_name), wine_dbgstr_w(obj_name)); + SysFreeString(obj_name); + + /* + * Make sure the IAccessible returned for a simple element is the + * root IAccessible. + */ + V_I4(&cid) = CHILDID_SELF; + expected_name = acc_from_event_obj_tree[ACC_TREE_OBJ_ID_ROOT - 1].name; + hr = IAccessible_get_accName(acc, cid, &obj_name); + ok(SUCCEEDED(hr), "got %#x\n", hr); + ok(!lstrcmpW(obj_name, expected_name), "expected %s, got %s\n", + wine_dbgstr_w(expected_name), wine_dbgstr_w(obj_name)); + SysFreeString(obj_name); + IAccessible_Release(acc); + + /* + * Invalid child ID's are treated by AccessibleObjectFromEvent as simple + * elements, regardless of if get_accChild returns a failure code instead + * of S_FALSE to indicate a simple element. The IAccessible returned is + * the root object, and child ID is still set to the invalid child ID. + */ + V_I4(&cid) = 0; + V_VT(&cid) = VT_EMPTY; + hr = AccessibleObjectFromEvent(hwnd, OBJID_CLIENT, ACC_TREE_OBJ_ID_CHILD_2 + 1, &acc, &cid); + ok(SUCCEEDED(hr), "got %#x\n", hr); + ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); + ok(V_I4(&cid) == (ACC_TREE_OBJ_ID_CHILD_2 + 1), "got %#x, expected %#x\n", + V_I4(&cid), ACC_TREE_OBJ_ID_CHILD_2 + 1); + + V_VT(&cid) = VT_I4; + V_I4(&cid) = CHILDID_SELF; + expected_name = acc_from_event_obj_tree[ACC_TREE_OBJ_ID_ROOT - 1].name; + hr = IAccessible_get_accName(acc, cid, &obj_name); + ok(SUCCEEDED(hr), "got %#x\n", hr); + ok(!lstrcmpW(obj_name, expected_name), "expected %s, got %s\n", + wine_dbgstr_w(expected_name), wine_dbgstr_w(obj_name)); + SysFreeString(obj_name); + IAccessible_Release(acc); + + /* + * AccessibleObjectFromEvent will not search an object tree for a child, + * so if a given child ID is not returned by the get_accChild method on the + * root IAccessible, it won't be found by AccessibleObjectFromEvent. This + * is an issue in things such as web browsers, where one HWND is used as a + * root object with a complex tree of objects within it. + */ + V_I4(&cid) = 0; + V_VT(&cid) = VT_EMPTY; + hr = AccessibleObjectFromEvent(hwnd, OBJID_CLIENT, ACC_TREE_OBJ_ID_CHILD_1_0, &acc, &cid); + ok(SUCCEEDED(hr), "got %#x\n", hr); + ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); + ok(V_I4(&cid) == (ACC_TREE_OBJ_ID_CHILD_1_0), "got %#x, expected %#x\n", + V_I4(&cid), ACC_TREE_OBJ_ID_CHILD_1_0); + + V_VT(&cid) = VT_I4; + V_I4(&cid) = CHILDID_SELF; + expected_name = acc_from_event_obj_tree[ACC_TREE_OBJ_ID_ROOT - 1].name; + hr = IAccessible_get_accName(acc, cid, &obj_name); + ok(SUCCEEDED(hr), "got %#x\n", hr); + ok(!lstrcmpW(obj_name, expected_name), "expected %s, got %s\n", + wine_dbgstr_w(expected_name), wine_dbgstr_w(obj_name)); + SysFreeString(obj_name); + IAccessible_Release(acc); + + V_I4(&cid) = 0; + V_VT(&cid) = VT_EMPTY; + hr = AccessibleObjectFromEvent(hwnd, OBJID_CLIENT, ACC_TREE_OBJ_ID_CHILD_1_1, &acc, &cid); + ok(SUCCEEDED(hr), "got %#x\n", hr); + ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); + ok(V_I4(&cid) == (ACC_TREE_OBJ_ID_CHILD_1_1), "got %#x, expected %#x\n", + V_I4(&cid), ACC_TREE_OBJ_ID_CHILD_1_1); + + V_VT(&cid) = VT_I4; + V_I4(&cid) = CHILDID_SELF; + expected_name = acc_from_event_obj_tree[ACC_TREE_OBJ_ID_ROOT - 1].name; + hr = IAccessible_get_accName(acc, cid, &obj_name); + ok(SUCCEEDED(hr), "got %#x\n", hr); + ok(!lstrcmpW(obj_name, expected_name), "expected %s, got %s\n", + wine_dbgstr_w(expected_name), wine_dbgstr_w(obj_name)); + SysFreeString(obj_name); + IAccessible_Release(acc); + + /* + * Show that ACC_TREE_OBJ_ID_CHILD_1's children are actually reachable + * from the root IAccessible using both possible methods of traversing + * the IAccessible tree (accNavigate and AccessibleChildren). + */ + hr = AccessibleObjectFromEvent(hwnd, OBJID_CLIENT, CHILDID_SELF, &acc, &cid); + ok(SUCCEEDED(hr), "got %#x\n", hr); + ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); + ok(V_I4(&cid) == CHILDID_SELF, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + + /* IAccessible_accNavigate method. */ + V_I4(&cid) = 0; + V_VT(&cid) = VT_EMPTY; + acc_child = NULL; + search_acc_tree_for_child_navigate(acc, ACC_TREE_OBJ_ID_CHILD_1_0, &acc_child, &cid); + ok(!!acc_child, "Failed to find child id %#x in tree!\n", ACC_TREE_OBJ_ID_CHILD_1_0); + + expected_name = acc_from_event_obj_tree[ACC_TREE_OBJ_ID_CHILD_1_0 - 1].name; + hr = IAccessible_get_accName(acc_child, cid, &obj_name); + ok(SUCCEEDED(hr), "got %#x\n", hr); + ok(!lstrcmpW(obj_name, expected_name), "expected %s, got %s\n", + wine_dbgstr_w(expected_name), wine_dbgstr_w(obj_name)); + SysFreeString(obj_name); + IAccessible_Release(acc_child); + + V_I4(&cid) = 0; + V_VT(&cid) = VT_EMPTY; + acc_child = NULL; + search_acc_tree_for_child_navigate(acc, ACC_TREE_OBJ_ID_CHILD_1_1, &acc_child, &cid); + ok(!!acc_child, "Failed to find child id %#x in tree!\n", ACC_TREE_OBJ_ID_CHILD_1_1); + + expected_name = acc_from_event_obj_tree[ACC_TREE_OBJ_ID_CHILD_1_1 - 1].name; + hr = IAccessible_get_accName(acc_child, cid, &obj_name); + ok(SUCCEEDED(hr), "got %#x\n", hr); + ok(!lstrcmpW(obj_name, expected_name), "expected %s, got %s\n", + wine_dbgstr_w(expected_name), wine_dbgstr_w(obj_name)); + SysFreeString(obj_name); + IAccessible_Release(acc_child); + + /* AccessibleChildren (IEnumVARIANT) method. */ + V_I4(&cid) = 0; + V_VT(&cid) = VT_EMPTY; + acc_child = NULL; + search_acc_tree_for_child_enumVARIANT(acc, ACC_TREE_OBJ_ID_CHILD_1_0, &acc_child, &cid); + ok(!!acc_child, "Failed to find child id %#x in tree!\n", ACC_TREE_OBJ_ID_CHILD_1_0); + + expected_name = acc_from_event_obj_tree[ACC_TREE_OBJ_ID_CHILD_1_0 - 1].name; + hr = IAccessible_get_accName(acc_child, cid, &obj_name); + ok(SUCCEEDED(hr), "got %#x\n", hr); + ok(!lstrcmpW(obj_name, expected_name), "expected %s, got %s\n", + wine_dbgstr_w(expected_name), wine_dbgstr_w(obj_name)); + SysFreeString(obj_name); + IAccessible_Release(acc_child); + + V_I4(&cid) = 0; + V_VT(&cid) = VT_EMPTY; + acc_child = NULL; + search_acc_tree_for_child_enumVARIANT(acc, ACC_TREE_OBJ_ID_CHILD_1_1, &acc_child, &cid); + ok(!!acc_child, "Failed to find child id %#x in tree!\n", ACC_TREE_OBJ_ID_CHILD_1_1); + + expected_name = acc_from_event_obj_tree[ACC_TREE_OBJ_ID_CHILD_1_1 - 1].name; + hr = IAccessible_get_accName(acc_child, cid, &obj_name); + ok(SUCCEEDED(hr), "got %#x\n", hr); + ok(!lstrcmpW(obj_name, expected_name), "expected %s, got %s\n", + wine_dbgstr_w(expected_name), wine_dbgstr_w(obj_name)); + SysFreeString(obj_name); + IAccessible_Release(acc_child); + + IAccessible_Release(acc); + + DestroyWindow(hwnd); + free_acc_obj_tree(ARRAY_SIZE(acc_from_event_obj_tree)); +} + static void test_GetProcessHandleFromHwnd(void) { HANDLE proc; @@ -1061,6 +2054,7 @@ START_TEST(main) test_GetProcessHandleFromHwnd(); test_default_client_accessible_object(); test_AccessibleChildren(&Accessible); + test_AccessibleObjectFromEvent(); unregister_window_class(); CoUninitialize(); -- 2.25.1

2 1

[PATCH v10 1/2] ntdll/socket: Implement exclusive flag for IOCTL_AFD_POLL.
by Guillaume Charifi 16 Sep '21

16 Sep '21

Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/ntdll/unix/socket.c | 6 ++-- include/wine/afd.h | 2 +- server/protocol.def | 1 + server/sock.c | 67 ++++++++++++++++++++++++++++++++++++++-- 4 files changed, 69 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 73d61c0d4e6..c40d0b526d7 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -736,12 +736,11 @@ static NTSTATUS sock_poll( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi || in_size < offsetof( struct afd_poll_params, sockets[params->count] )) return STATUS_INVALID_PARAMETER; - TRACE( "timeout %s, count %u, unknown %#x, padding (%#x, %#x, %#x), sockets[0] {%04lx, %#x}\n", - wine_dbgstr_longlong(params->timeout), params->count, params->unknown, + TRACE( "timeout %s, count %u, exclusive %u, padding (%#x, %#x, %#x), sockets[0] {%04lx, %#x}\n", + wine_dbgstr_longlong(params->timeout), params->count, params->exclusive, params->padding[0], params->padding[1], params->padding[2], params->sockets[0].socket, params->sockets[0].flags ); - if (params->unknown) FIXME( "unknown boolean is %#x\n", params->unknown ); if (params->padding[0]) FIXME( "padding[0] is %#x\n", params->padding[0] ); if (params->padding[1]) FIXME( "padding[1] is %#x\n", params->padding[1] ); if (params->padding[2]) FIXME( "padding[2] is %#x\n", params->padding[2] ); @@ -782,6 +781,7 @@ static NTSTATUS sock_poll( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi SERVER_START_REQ( poll_socket ) { req->async = server_async( handle, &async->io, event, apc, apc_user, iosb_client_ptr(io) ); + req->exclusive = !!params->exclusive; req->timeout = params->timeout; wine_server_add_data( req, input, params->count * sizeof(*input) ); wine_server_set_reply( req, async->sockets, params->count * sizeof(async->sockets[0]) ); diff --git a/include/wine/afd.h b/include/wine/afd.h index e67ecae25a9..f4682f464e8 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -104,7 +104,7 @@ struct afd_poll_params { LONGLONG timeout; unsigned int count; - BOOLEAN unknown; + BOOLEAN exclusive; BOOLEAN padding[3]; struct { diff --git a/server/protocol.def b/server/protocol.def index a5030fcf813..6a3faf3e625 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1451,6 +1451,7 @@ struct poll_socket_output /* Perform an async poll on a socket */ @REQ(poll_socket) + int exclusive; async_data_t async; /* async I/O parameters */ timeout_t timeout; /* timeout */ VARARG(sockets,poll_socket_input); /* list of sockets to poll */ diff --git a/server/sock.c b/server/sock.c index fc234e89865..bfff6a562ad 100644 --- a/server/sock.c +++ b/server/sock.c @@ -128,6 +128,7 @@ struct poll_req struct async *async; struct iosb *iosb; struct timeout_user *timeout; + int exclusive; unsigned int count; struct poll_socket_output *output; struct @@ -205,6 +206,7 @@ struct sock struct list accept_list; /* list of pending accept requests */ struct accept_req *accept_recv_req; /* pending accept-into request which will recv on this socket */ struct connect_req *connect_req; /* pending connection request */ + struct poll_req *main_poll; /* main poll */ union win_sockaddr addr; /* socket name */ int addr_len; /* socket name length */ unsigned int rcvbuf; /* advisory recv buffer size */ @@ -231,6 +233,7 @@ static int sock_get_poll_events( struct fd *fd ); static void sock_poll_event( struct fd *fd, int event ); static enum server_fd_type sock_get_fd_type( struct fd *fd ); static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); +static void sock_cancel_async( struct fd *fd, struct async *async ); static void sock_queue_async( struct fd *fd, struct async *async, int type, int count ); static void sock_reselect_async( struct fd *fd, struct async_queue *queue ); @@ -274,7 +277,7 @@ static const struct fd_ops sock_fd_ops = default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ sock_ioctl, /* ioctl */ - default_fd_cancel_async, /* cancel_async */ + sock_cancel_async, /* cancel_async */ sock_queue_async, /* queue_async */ sock_reselect_async /* reselect_async */ }; @@ -788,7 +791,13 @@ static void free_poll_req( void *private ) if (req->timeout) remove_timeout_user( req->timeout ); for (i = 0; i < req->count; ++i) + { + if (req->sockets[i].sock->main_poll == req) + req->sockets[i].sock->main_poll = NULL; + release_object( req->sockets[i].sock ); + } + release_object( req->async ); release_object( req->iosb ); list_remove( &req->entry ); @@ -1217,6 +1226,30 @@ static enum server_fd_type sock_get_fd_type( struct fd *fd ) return FD_TYPE_SOCKET; } +static void sock_cancel_async( struct fd *fd, struct async *async ) +{ + struct sock *sock = get_fd_user( fd ); + struct poll_req *req; + unsigned int i; + + if (sock->main_poll) + { + LIST_FOR_EACH_ENTRY( req, &poll_list, struct poll_req, entry ) + { + if (req->async != async) + continue; + + if (req == sock->main_poll) + { + sock->main_poll = NULL; + break; + } + } + } + + async_terminate( async, STATUS_CANCELLED ); +} + static void sock_queue_async( struct fd *fd, struct async *async, int type, int count ) { struct sock *sock = get_fd_user( fd ); @@ -1383,6 +1416,7 @@ static struct sock *create_socket(void) sock->ifchange_obj = NULL; sock->accept_recv_req = NULL; sock->connect_req = NULL; + sock->main_poll = NULL; memset( &sock->addr, 0, sizeof(sock->addr) ); sock->addr_len = 0; sock->rd_shutdown = 0; @@ -2840,7 +2874,31 @@ static int poll_single_socket( struct sock *sock, int mask ) return get_poll_flags( sock, pollfd.revents ) & mask; } -static void poll_socket( struct sock *poll_sock, struct async *async, timeout_t timeout, +static void poll_handle_exclusive(struct poll_req *req) +{ + unsigned int i; + + for (i = 0; i < req->count; ++i) + { + struct poll_req *main_poll = req->sockets[i].sock->main_poll; + + if (main_poll && main_poll->exclusive && req->exclusive) + { + /* Previous exclusive main poll replaced by new exclusive poll. */ + main_poll->iosb->status = STATUS_SUCCESS; + main_poll->iosb->out_data = main_poll->output; + main_poll->iosb->out_size = main_poll->count * sizeof(*main_poll->output); + async_terminate(main_poll->async, STATUS_ALERTED); + + main_poll = NULL; + } + + if (!main_poll) + req->sockets[i].sock->main_poll = req; + } +} + +static void poll_socket( struct sock *poll_sock, struct async *async, int exclusive, timeout_t timeout, unsigned int count, const struct poll_socket_input *input ) { struct poll_socket_output *output; @@ -2881,11 +2939,14 @@ static void poll_socket( struct sock *poll_sock, struct async *async, timeout_t req->sockets[i].flags = input[i].flags; } + req->exclusive = exclusive; req->count = count; req->async = (struct async *)grab_object( async ); req->iosb = async_get_iosb( async ); req->output = output; + poll_handle_exclusive(req); + list_add_tail( &poll_list, &req->entry ); async_set_completion_callback( async, free_poll_req, req ); queue_async( &poll_sock->poll_q, async ); @@ -3287,7 +3348,7 @@ DECL_HANDLER(poll_socket) if ((async = create_request_async( sock->fd, get_fd_comp_flags( sock->fd ), &req->async ))) { - poll_socket( sock, async, req->timeout, count, input ); + poll_socket( sock, async, req->exclusive, req->timeout, count, input ); reply->wait = async_handoff( async, NULL, 0 ); reply->options = get_fd_options( sock->fd ); release_object( async ); -- 2.33.0

1 1

[PATCH] msvcrt: Use unaligned data types in memset.
by Piotr Caban 16 Sep '21

16 Sep '21

This fixes a regression in memset on ARM described by Martin: ARM can do 64 bit writes with the STRD instruction, but that instruction requires a 32 bit aligned address - while these stores are unaligned. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-)

2 1

[PATCH 2/2 v5] oleacc: Add STATE_SYSTEM_FOCUSED test for default client object.
by Piotr Caban 16 Sep '21

16 Sep '21

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/tests/main.c | 68 ++++++++++++++++++++++++++++++++++------ 1 file changed, 59 insertions(+), 9 deletions(-)

1 0

[PATCH 1/2 v5] oleacc: Check proper GUI thread for window focus.
by Piotr Caban 16 Sep '21

16 Sep '21

From: Connor McAdams <conmanx360(a)gmail.com> Check for window focus against the current foreground window's thread GUI data rather than the currently executing thread's GUI data. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v5: - cleaned up the tests dlls/oleacc/client.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[PATCH v2] d2d1/tests: Add tests for 2D affine effect.
by Ziqing Hui 16 Sep '21

16 Sep '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: * Use compare_figure. * Make image_4x4 static. dlls/d2d1/tests/d2d1.c | 127 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3e2eda8a4a4..7b936fedacc 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9875,6 +9875,132 @@ static void test_effect(BOOL d3d11) release_test_context(&ctx); } +static void test_effect_2d_affine(BOOL d3d11) +{ + D2D1_MATRIX_3X2_F rotate, scale, skew; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + D2D_RECT_F output_bounds = {0}; + struct d2d1_test_context ctx; + ID2D1DeviceContext *context; + D2D1_SIZE_U input_size; + ID2D1Factory1 *factory; + ID2D1Bitmap1 *bitmap; + ID2D1Effect *effect; + ID2D1Image *output; + unsigned int i; + BOOL match; + HRESULT hr; + + static const DWORD image_4x4[] = + { + 0xfdcba987, 0xffff0000, 0x98765432, 0xffffffff, + 0x4b4b4b4b, 0x89abcdef, 0xdeadbeef, 0xabcdef01, + 0x7f000011, 0x40ffffff, 0x12345678, 0xaabbccdd, + 0x44444444, 0xff7f7f7f, 0x1221abba, 0x00000000 + }; + DWORD image_16x16[16 * 16]; + + const struct effect_2d_affine_test + { + const DWORD *img_data; + unsigned int img_width; + unsigned int img_height; + + D2D1_MATRIX_3X2_F *matrix; + + D2D_RECT_F bounds; + const char *figure; + } + effect_2d_affine_tests[] = + { + {image_4x4, 4, 4, &rotate, {-6.0f, -3.0f, 2.0f, 4.0f}, "AQ8B7wEA"}, + {image_4x4, 4, 4, &scale, {-2.0f, -3.0f, 1.0f, 9.0f}, "AQ8BDwEPAQ8BDwEPAQ8BDwF/"}, + {image_4x4, 4, 4, &skew, {-7.0f, -3.0f, 3.0f, 7.0f}, "AQ8BAQ4BAQ4BzwEA"}, + {image_16x16, 16, 16, &rotate, {-14.0f, -3.0f, 10.0f, 21.0f}, + "AQ8BAQ4CAQ0DAQwEAQsFAQoGAQkHAQgIAQcIAQEGBwEBBwYBAQgFAQEJBAEBCgMBAQsCAQEM"}, + {image_16x16, 16, 16, &scale, {-2.0f, -3.0f, 10.0f, 39.0f}, + "AQkGCgYKBgoGCgYKBgoGCgYKBgoGCgYKBgoGCgYKBgoG"}, + {image_16x16, 16, 16, &skew, {-19.0f, -3.0f, 15.0f, 31.0f}, + "AQ8BAQ4CAQ0DAQwEAQsFAQoGAQkHAQgIAQcJAQYKAQULAQQMAQMNAQINAQIMAQMA"}, + }; + + memset(image_16x16, 0xff, sizeof(image_16x16)); + set_matrix_identity(&rotate); + set_matrix_identity(&scale); + set_matrix_identity(&skew); + translate_matrix(&rotate, -2.0f, -2.0f); + translate_matrix(&scale, -2.0f, -2.0f); + translate_matrix(&skew, -2.0f, -2.0f); + rotate_matrix(&rotate, M_PI_4); + scale_matrix(&scale, 0.75f, 2.5f); + skew_matrix(&skew, -1.0f, 1.0f); + + if (!init_test_context(&ctx, d3d11)) + return; + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D12DAffineTransform, &effect); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(effect_2d_affine_tests); ++i) + { + const struct effect_2d_affine_test *test = &effect_2d_affine_tests[i]; + winetest_push_context("Test %u", i); + + set_size_u(&input_size, test->img_width, test->img_height); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_NONE; + bitmap_desc.colorContext = NULL; + hr = ID2D1DeviceContext_CreateBitmap(context, input_size, test->img_data, + sizeof(*test->img_data) * test->img_width, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID2D1Effect_SetInput(effect, 0, (ID2D1Image *)bitmap, FALSE); + todo_wine + hr = ID2D1Effect_SetValue(effect, D2D1_2DAFFINETRANSFORM_PROP_TRANSFORM_MATRIX, + D2D1_PROPERTY_TYPE_MATRIX_3X2, (const BYTE *)test->matrix, sizeof(*test->matrix)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID2D1Effect_GetOutput(effect, &output); + + ID2D1DeviceContext_GetImageLocalBounds(context, output, &output_bounds); + todo_wine + ok(compare_rect(&output_bounds, test->bounds.left, test->bounds.top, test->bounds.right, test->bounds.bottom, 1), + "Got unexpected output bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + output_bounds.left, output_bounds.top, output_bounds.right, output_bounds.bottom, + test->bounds.left, test->bounds.top, test->bounds.right, test->bounds.bottom); + + ID2D1DeviceContext_BeginDraw(context); + ID2D1DeviceContext_Clear(context, 0); + ID2D1DeviceContext_DrawImage(context, output, NULL, NULL, 0, 0); + hr = ID2D1DeviceContext_EndDraw(context, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + match = compare_figure(&ctx, 0, 0, 16, 16, 0xff652e89, 0, test->figure); + todo_wine + ok(match, "Figure does not match.\n"); + + ID2D1Image_Release(output); + ID2D1Bitmap1_Release(bitmap); + winetest_pop_context(); + } + + ID2D1Effect_Release(effect); + ID2D1DeviceContext_Release(context); + ID2D1Factory1_Release(factory); + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -9937,6 +10063,7 @@ START_TEST(d2d1) queue_test(test_geometry_group); queue_test(test_mt_factory); queue_test(test_effect); + queue_test(test_effect_2d_affine); run_queued_tests(); } -- 2.25.1

2 1

[PATCH] mf/evr: Remove duplicated check in GetStreamSinkCount() (Coverity).
by Nikolay Sivov 16 Sep '21

16 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/evr.c | 3 --- dlls/mf/tests/mf.c | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index a5545c157de..9552990006d 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1291,9 +1291,6 @@ static HRESULT WINAPI video_renderer_sink_GetStreamSinkCount(IMFMediaSink *iface TRACE("%p, %p.\n", iface, count); - if (!count) - return E_POINTER; - EnterCriticalSection(&renderer->cs); if (renderer->flags & EVR_SHUT_DOWN) hr = MF_E_SHUTDOWN; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 3dfd852643c..1740e4e36d9 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4559,6 +4559,12 @@ todo_wine hr = IMFMediaSink_Shutdown(sink); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSink_GetStreamSinkCount(sink, NULL); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSink_GetStreamSinkCount(sink, &count); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_FORWARD, FALSE, &rate); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); -- 2.33.0

1 0

[PATCH] winhttp: Don't fail the request if authorization fails.
by Hans Leidekker 16 Sep '21

16 Sep '21

Fixes a regression from 080dfbee311f2684280fafaa3f458f6bce6844bd. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 001fff74a87..f2cb24d4486 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2736,7 +2736,7 @@ static DWORD receive_response( struct request *request, BOOL async ) { if (request->hdr.disable_flags & WINHTTP_DISABLE_AUTHENTICATION) break; - if ((ret = handle_authorization( request, status ))) break; + if (handle_authorization( request, status )) break; /* recurse synchronously */ if (!(ret = send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ))) continue; -- 2.30.2

1 0

[PATCH v2] msvcrt: Avoid disallowed unaligned writes in memset on ARM
by Martin Storsjö 16 Sep '21

16 Sep '21

This fixes a regression in memset on ARM since 7b17d7081512db52ef852705445762ac4016c29f. ARM can do 64 bit writes with the STRD instruction, but that instruction requires a 32 bit aligned address - while these stores are unaligned. Two consecutive stores to uint32_t* pointers can also be fused into one single STRD, as a uint32_t* is supposed to be properly aligned - therefore, do these stores as stores to volatile uint32_t* to avoid fusing them. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- v2: Using a macro to hide the difference. --- dlls/msvcrt/string.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index f2b1b4a5b11..6fade4d80fc 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2876,17 +2876,28 @@ void *__cdecl memset(void *dst, int c, size_t n) unsigned char *d = (unsigned char *)dst; size_t a = 0x20 - ((uintptr_t)d & 0x1f); +#ifdef __arm__ +#define MEMSET_UNALIGNED_64(dst, off, val) do { \ + *(volatile uint32_t *)((dst) + (off) + 0) = val; \ + *(volatile uint32_t *)((dst) + (off) + 4) = val; \ + } while (0) +#else +#define MEMSET_UNALIGNED_64(dst, off, val) do { \ + *(uint64_t *)((dst) + (off)) = val; \ + } while (0) +#endif + if (n >= 16) { - *(uint64_t *)(d + 0) = v; - *(uint64_t *)(d + 8) = v; - *(uint64_t *)(d + n - 16) = v; - *(uint64_t *)(d + n - 8) = v; + MEMSET_UNALIGNED_64(d, 0, v); + MEMSET_UNALIGNED_64(d, 8, v); + MEMSET_UNALIGNED_64(d, n - 16, v); + MEMSET_UNALIGNED_64(d, n - 8, v); if (n <= 32) return dst; - *(uint64_t *)(d + 16) = v; - *(uint64_t *)(d + 24) = v; - *(uint64_t *)(d + n - 32) = v; - *(uint64_t *)(d + n - 24) = v; + MEMSET_UNALIGNED_64(d, 16, v); + MEMSET_UNALIGNED_64(d, 24, v); + MEMSET_UNALIGNED_64(d, n - 32, v); + MEMSET_UNALIGNED_64(d, n - 24, v); if (n <= 64) return dst; n = (n - a) & ~0x1f; @@ -2895,8 +2906,8 @@ void *__cdecl memset(void *dst, int c, size_t n) } if (n >= 8) { - *(uint64_t *)d = v; - *(uint64_t *)(d + n - 8) = v; + MEMSET_UNALIGNED_64(d, 0, v); + MEMSET_UNALIGNED_64(d, n - 8, v); return dst; } if (n >= 4) @@ -2916,6 +2927,7 @@ void *__cdecl memset(void *dst, int c, size_t n) *(uint8_t *)d = v; return dst; } +#undef MEMSET_UNALIGNED_64 return dst; } -- 2.25.1

1 0

[PATCH 00/12] Fifth step for Dwarf 3/4 support in dbghelp
by Eric Pouech 16 Sep '21

16 Sep '21

The following series implements: - finish of refactoring for proper di / cu relationship wrt. image location (regular vs dwz file) - support of alternate .dwz file - references to DIE into an alternate .dwz file A+ --- Eric Pouech (12): dbghelp: separate alternate debug file lookup dbghelp: Added support for locating a .dwz file (GNU extension) attached to a debug file dbghelp/dwarf: store in dwarf2 module's information a potential link to an external DWZ file dbghelp/dwarf: Now properly handling DW_FORM_GNU_strp_alt dbghelp/dwarf: Now loading the alternate dwarf file content as we do for a regular dwarf module dbghelp/dwarf: No longer passing a parse context to dwarf2_find_attribute dbghelp/dwarf: No longer passing a unit context to dwarf2_get_cpp_name dbghelp/dwarf: Folded printing info about unit context when printing debug_info's dbghelp/dwarf: No longer passing a unit context when parsing debug_info content dbghelp/dwarf! Added a new helper to jump into another debug_info dbghelp/dwarf: added proper support for DW_FORM_GNU_ref_alt dbghelp/dwarf: When loading a DWZ alternate file, don't force loading of all debug_infos dlls/dbghelp/dwarf.c | 610 +++++++++++++++++++++-------------- dlls/dbghelp/image_private.h | 1 + dlls/dbghelp/module.c | 100 ++++++ 3 files changed, 463 insertions(+), 248 deletions(-)

1 12

[PATCH] winex11.drv: some windows are not menu.
by Chao Long 16 Sep '21

16 Sep '21

Signed-off-by: Chao Long <longchao(a)uniontech.com> --- dlls/winex11.drv/event.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 1772a27c48b..3e4742078be 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -707,9 +707,11 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) { /* simulate a mouse click on the menu to find out * whether the window wants to be activated */ + DWORD ht = HTCAPTION; + if (GetClassLongW(hwnd, GCL_STYLE) & WS_SYSMENU) ht = HTMENU; LRESULT ma = SendMessageW( hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor( hwnd, GA_ROOT ), - MAKELONG( HTMENU, WM_LBUTTONDOWN ) ); + MAKELONG( ht, WM_LBUTTONDOWN ) ); if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) { set_focus( event->display, hwnd, event_time ); -- 2.20.1

1 0

[PATCH] mfplay: Remove some dead code (Coverity).
by Nikolay Sivov 16 Sep '21

16 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 959cf701b99..f7832598ae6 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1884,7 +1884,6 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba IMFMediaEvent *session_event; MFP_MEDIAPLAYER_STATE state; HRESULT hr, event_status; - IMFPMediaItem *item = NULL; IMFTopology *topology; unsigned int status; PROPVARIANT value; @@ -1964,9 +1963,6 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba ; } - if (item) - IMFPMediaItem_Release(item); - if (event) { media_player_queue_event(player, event); -- 2.33.0

1 0

[PATCH 1/6] dinput8/tests: Add some HID joystick IDirectInputDevice8_GetProperty tests.
by Rémi Bernon 16 Sep '21

16 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput8/tests/hid.c | 199 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 676488223b8..5e0cd51b3c4 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -64,6 +64,8 @@ static HINSTANCE instance; #define EXPECT_VIDPID MAKELONG( 0x1209, 0x0001 ) static const WCHAR expect_vidpid_str[] = L"VID_1209&PID_0001"; static const GUID expect_guid_product = {EXPECT_VIDPID,0x0000,0x0000,{0x00,0x00,'P','I','D','V','I','D'}}; +static const WCHAR expect_path[] = L"\\\\?\\hid#winetest#1&2fafeb0&"; +static const WCHAR expect_path_end[] = L"&0000#{4d1e55b2-f16f-11cf-88cb-001111000030}"; static struct winetest_shared_data *test_data; static HANDLE okfile; @@ -3361,12 +3363,57 @@ static void test_simple_joystick(void) .wUsage = HID_USAGE_GENERIC_JOYSTICK, }; + DIPROPGUIDANDPATH prop_guid_path = + { + .diph = + { + .dwSize = sizeof(DIPROPGUIDANDPATH), + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwHow = DIPH_DEVICE, + }, + }; + DIPROPSTRING prop_string = + { + .diph = + { + .dwSize = sizeof(DIPROPSTRING), + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwHow = DIPH_DEVICE, + }, + }; + DIPROPDWORD prop_dword = + { + .diph = + { + .dwSize = sizeof(DIPROPDWORD), + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwHow = DIPH_DEVICE, + }, + }; + DIPROPRANGE prop_range = + { + .diph = + { + .dwSize = sizeof(DIPROPRANGE), + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwHow = DIPH_DEVICE, + }, + }; + DIPROPPOINTER prop_pointer = + { + .diph = + { + .dwSize = sizeof(DIPROPPOINTER), + .dwHeaderSize = sizeof(DIPROPHEADER), + }, + }; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; DIDEVICEINSTANCEW devinst = {0}; IDirectInputDevice8W *device; DIDEVCAPS caps = {0}; IDirectInput8W *di; HRESULT hr; + WCHAR *tmp; ULONG ref; GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); @@ -3465,6 +3512,158 @@ static void test_simple_joystick(void) check_member( caps, expect_caps, "%d", dwHardwareRevision ); check_member( caps, expect_caps, "%d", dwFFDriverVersion ); + hr = IDirectInputDevice8_GetProperty( device, NULL, NULL ); + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetProperty returned %#x\n", hr ); + hr = IDirectInputDevice8_GetProperty( device, &GUID_NULL, NULL ); + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetProperty returned %#x\n", hr ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, NULL ); + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetProperty returned %#x\n", hr ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &prop_string.diph ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetProperty returned %#x\n", hr ); + prop_dword.diph.dwHeaderSize = sizeof(DIPROPHEADER) - 1; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &prop_dword.diph ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetProperty returned %#x\n", hr ); + prop_dword.diph.dwHeaderSize = sizeof(DIPROPHEADER); + + prop_dword.dwData = 0xdeadbeef; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &prop_dword.diph ); + ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_VIDPID returned %#x\n", hr ); + ok( prop_dword.dwData == EXPECT_VIDPID, "got %#x expected %#x\n", prop_dword.dwData, EXPECT_VIDPID ); + + hr = IDirectInputDevice8_GetProperty( device, DIPROP_GUIDANDPATH, &prop_guid_path.diph ); + ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_GUIDANDPATH returned %#x\n", hr ); + todo_wine + ok( IsEqualGUID( &prop_guid_path.guidClass, &GUID_DEVCLASS_HIDCLASS ), "got guid %s\n", + debugstr_guid( &prop_guid_path.guidClass ) ); + todo_wine + ok( !wcsncmp( prop_guid_path.wszPath, expect_path, wcslen( expect_path ) ), "got path %s\n", + debugstr_w(prop_guid_path.wszPath) ); + if (!(tmp = wcsrchr( prop_guid_path.wszPath, '&' ))) + todo_wine ok( 0, "got path %s\n", debugstr_w(prop_guid_path.wszPath) ); + else + { + ok( !wcscmp( wcsrchr( prop_guid_path.wszPath, '&' ), expect_path_end ), "got path %s\n", + debugstr_w(prop_guid_path.wszPath) ); + } + + hr = IDirectInputDevice8_GetProperty( device, DIPROP_INSTANCENAME, &prop_string.diph ); + ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_INSTANCENAME returned %#x\n", hr ); + todo_wine + ok( !wcscmp( prop_string.wsz, expect_devinst.tszInstanceName ), "got instance %s\n", + debugstr_w(prop_string.wsz) ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_PRODUCTNAME, &prop_string.diph ); + ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_PRODUCTNAME returned %#x\n", hr ); + todo_wine + ok( !wcscmp( prop_string.wsz, expect_devinst.tszProductName ), "got product %s\n", + debugstr_w(prop_string.wsz) ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_TYPENAME, &prop_string.diph ); + todo_wine + ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_TYPENAME returned %#x\n", hr ); + todo_wine + ok( !wcscmp( prop_string.wsz, expect_vidpid_str ), "got type %s\n", debugstr_w(prop_string.wsz) ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_USERNAME, &prop_string.diph ); + ok( hr == S_FALSE, "IDirectInputDevice8_GetProperty DIPROP_USERNAME returned %#x\n", hr ); + todo_wine + ok( !wcscmp( prop_string.wsz, L"" ), "got user %s\n", debugstr_w(prop_string.wsz) ); + + prop_dword.dwData = 0xdeadbeef; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_JOYSTICKID, &prop_dword.diph ); + ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_JOYSTICKID returned %#x\n", hr ); + todo_wine + ok( prop_dword.dwData == 0, "got %#x expected %#x\n", prop_dword.dwData, 0 ); + + prop_dword.dwData = 0xdeadbeef; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_AXISMODE, &prop_dword.diph ); + todo_wine + ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_AXISMODE returned %#x\n", hr ); + todo_wine + ok( prop_dword.dwData == DIPROPAXISMODE_ABS, "got %u expected %u\n", prop_dword.dwData, DIPROPAXISMODE_ABS ); + prop_dword.dwData = 0xdeadbeef; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); + ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_BUFFERSIZE returned %#x\n", hr ); + ok( prop_dword.dwData == 0, "got %#x expected %#x\n", prop_dword.dwData, 0 ); + prop_dword.dwData = 0xdeadbeef; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); + todo_wine + ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_FFGAIN returned %#x\n", hr ); + todo_wine + ok( prop_dword.dwData == 10000, "got %u expected %u\n", prop_dword.dwData, 10000 ); + + hr = IDirectInputDevice8_GetProperty( device, DIPROP_CALIBRATION, &prop_dword.diph ); + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetProperty DIPROP_CALIBRATION returned %#x\n", hr ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_AUTOCENTER, &prop_dword.diph ); + todo_wine + ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetProperty DIPROP_AUTOCENTER returned %#x\n", hr ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_DEADZONE, &prop_dword.diph ); + todo_wine + ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetProperty DIPROP_DEADZONE returned %#x\n", hr ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); + todo_wine + ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetProperty DIPROP_FFLOAD returned %#x\n", hr ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_GRANULARITY, &prop_dword.diph ); + todo_wine + ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetProperty DIPROP_GRANULARITY returned %#x\n", hr ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_SATURATION, &prop_dword.diph ); + todo_wine + ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetProperty DIPROP_SATURATION returned %#x\n", hr ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); + todo_wine + ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetProperty DIPROP_RANGE returned %#x\n", hr ); + + prop_dword.diph.dwHow = DIPH_BYUSAGE; + prop_dword.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); + prop_dword.dwData = 0xdeadbeef; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_DEADZONE, &prop_dword.diph ); + todo_wine + ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_DEADZONE returned %#x\n", hr ); + todo_wine + ok( prop_dword.dwData == 0, "got %u expected %u\n", prop_dword.dwData, 0 ); + prop_dword.dwData = 0xdeadbeef; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_GRANULARITY, &prop_dword.diph ); + todo_wine + ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_GRANULARITY returned %#x\n", hr ); + todo_wine + ok( prop_dword.dwData == 1, "got %u expected %u\n", prop_dword.dwData, 1 ); + prop_dword.dwData = 0xdeadbeef; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_SATURATION, &prop_dword.diph ); + todo_wine + ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_SATURATION returned %#x\n", hr ); + todo_wine + ok( prop_dword.dwData == 10000, "got %u expected %u\n", prop_dword.dwData, 10000 ); + + prop_range.diph.dwHow = DIPH_BYUSAGE; + prop_range.diph.dwObj = MAKELONG( 0, 0 ); + prop_range.lMin = 0xdeadbeef; + prop_range.lMax = 0xdeadbeef; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); + todo_wine + ok( hr == DIERR_NOTFOUND, "IDirectInputDevice8_GetProperty DIPROP_RANGE returned %#x\n", hr ); + prop_range.diph.dwObj = MAKELONG( 0, HID_USAGE_PAGE_GENERIC ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); + todo_wine + ok( hr == DIERR_NOTFOUND, "IDirectInputDevice8_GetProperty DIPROP_RANGE returned %#x\n", hr ); + prop_range.diph.dwObj = MAKELONG( HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_X ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); + todo_wine + ok( hr == DIERR_NOTFOUND, "IDirectInputDevice8_GetProperty DIPROP_RANGE returned %#x\n", hr ); + prop_range.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); + prop_range.lMin = 0xdeadbeef; + prop_range.lMax = 0xdeadbeef; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); + ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_RANGE returned %#x\n", hr ); + todo_wine + ok( prop_range.lMin == 0, "got %d expected %d\n", prop_range.lMin, 0 ); + todo_wine + ok( prop_range.lMax == 65535, "got %d expected %d\n", prop_range.lMax, 65535 ); + + prop_pointer.diph.dwHow = DIPH_BYUSAGE; + prop_pointer.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); + hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); + todo_wine + ok( hr == DIERR_NOTINITIALIZED, "IDirectInputDevice8_GetProperty DIPROP_APPDATA returned %#x\n", hr ); + ref = IDirectInputDevice8_Release( device ); ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref ); -- 2.33.0

1 5

[PATCH] riched20: Don't create custom heap.
by Dmitry Timoshkov 16 Sep '21

16 Sep '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/riched20/editor.c | 1 - dlls/riched20/editor.h | 1 - dlls/riched20/txthost.c | 2 -- 3 files changed, 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index cc02604767e..3bf499681ed 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -246,7 +246,6 @@ static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, ME_Cursor *start, int HINSTANCE dll_instance = NULL; BOOL me_debug = FALSE; -HANDLE me_heap = NULL; static ME_TextBuffer *ME_MakeText(void) { ME_TextBuffer *buf = heap_alloc(sizeof(*buf)); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index fdf3e068fe9..7bdd1bf5efe 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -23,7 +23,6 @@ struct _RTF_Info; extern HINSTANCE dll_instance DECLSPEC_HIDDEN; -extern HANDLE me_heap DECLSPEC_HIDDEN; #define RUN_IS_HIDDEN(run) ((run)->style->fmt.dwMask & CFM_HIDDEN \ && (run)->style->fmt.dwEffects & CFE_HIDDEN) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 6d2221e4d69..e18ec9490c0 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1639,7 +1639,6 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) case DLL_PROCESS_ATTACH: dll_instance = instance; DisableThreadLibraryCalls( instance ); - me_heap = HeapCreate( 0, 0x10000, 0 ); if (!register_classes( instance )) return FALSE; LookupInit(); break; @@ -1653,7 +1652,6 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) if (listbox_registered) UnregisterClassW( L"REListBox20W", 0 ); if (combobox_registered) UnregisterClassW( L"REComboBox20W", 0 ); LookupCleanup(); - HeapDestroy( me_heap ); release_typelib(); break; } -- 2.31.1

2 1

[PATCH v2 7/8] user32/tests: Fix some test failures on the w7u_2qxl TestBot.
by Zhiyi Zhang 16 Sep '21

16 Sep '21

The first adapter reported by EnumDisplayDevices() is not guaranteed to be primary. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 214469. Fix typos in the commit message. dlls/user32/tests/monitor.c | 44 ++++--------------------------------- 1 file changed, 4 insertions(+), 40 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index cee7b629cd7..bd348576726 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -105,21 +105,6 @@ static int get_bitmap_stride(int width, int bpp) return ((width * bpp + 15) >> 3) & ~1; } -static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, - LPARAM lparam) -{ - MONITORINFOEXA mi; - char *primary = (char *)lparam; - - mi.cbSize = sizeof(mi); - - ok(GetMonitorInfoA(hmon, (MONITORINFO*)&mi), "GetMonitorInfo failed\n"); - if (mi.dwFlags & MONITORINFOF_PRIMARY) - strcpy(primary, mi.szDevice); - - return TRUE; -} - static int adapter_count = 0; static int monitor_count = 0; @@ -150,11 +135,6 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de *device->DeviceString, "#%d: expect DeviceString not empty\n", index); /* StateFlags */ - if (index == 0) - ok(device->StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE, "#%d: adapter should be primary\n", index); - else - ok(!(device->StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE), "#%d: adapter should not be primary\n", index); - if (device->StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) { /* Test creating DC */ @@ -180,7 +160,7 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de } } -static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index, const char *adapter_name, +static void test_enumdisplaydevices_monitor(int monitor_index, const char *adapter_name, DISPLAY_DEVICEA *device, DWORD flags) { static const char device_key_prefix[] = "\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class" @@ -200,11 +180,8 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index ok(*device->DeviceString, "#%d: expect DeviceString not empty\n", monitor_index); /* StateFlags */ - if (adapter_index == 0 && monitor_index == 0) - ok(device->StateFlags & DISPLAY_DEVICE_ATTACHED, "#%d expect to have a primary monitor attached\n", monitor_index); - else - ok(device->StateFlags <= (DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE), "#%d wrong state %#x\n", monitor_index, - device->StateFlags); + ok(device->StateFlags <= (DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE), + "#%d wrong state %#x\n", monitor_index, device->StateFlags); /* DeviceID */ CharLowerA(device->DeviceID); @@ -236,8 +213,6 @@ static void test_enumdisplaydevices(void) { static const DWORD flags[] = {0, EDD_GET_DEVICE_INTERFACE_NAME}; DISPLAY_DEVICEA dd; - char primary_device_name[32]; - char primary_monitor_device_name[32]; char adapter_name[32]; int number; int flag_index; @@ -266,23 +241,12 @@ static void test_enumdisplaydevices(void) for (monitor_index = 0; EnumDisplayDevicesA(adapter_name, monitor_index, &dd, flags[flag_index]); monitor_index++) - test_enumdisplaydevices_monitor(adapter_index, monitor_index, adapter_name, &dd, flags[flag_index]); + test_enumdisplaydevices_monitor(monitor_index, adapter_name, &dd, flags[flag_index]); } ok(adapter_count > 0, "Expect at least one adapter found\n"); /* XP on Testbot doesn't report a monitor, whereas XP on real machine does */ ok(broken(monitor_count == 0) || monitor_count > 0, "Expect at least one monitor found\n"); - - ret = EnumDisplayDevicesA(NULL, 0, &dd, 0); - ok(ret, "Expect success\n"); - lstrcpyA(primary_device_name, dd.DeviceName); - - primary_monitor_device_name[0] = 0; - ret = EnumDisplayMonitors(NULL, NULL, monitor_enum_proc, (LPARAM)primary_monitor_device_name); - ok(ret, "EnumDisplayMonitors failed\n"); - ok(!strcmp(primary_monitor_device_name, primary_device_name), - "monitor device name %s, device name %s\n", primary_monitor_device_name, - primary_device_name); } struct vid_mode -- 2.30.2

1 0

[PATCH 7/8] user32/tests: Fix some test failures on the w7u_2qxl TestBot.
by Zhiyi Zhang 16 Sep '21

16 Sep '21

The first adapter reported by EnumDisplayDevices() is not guaranteed to to be primary. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 44 ++++--------------------------------- 1 file changed, 4 insertions(+), 40 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index cee7b629cd7..bd348576726 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -105,21 +105,6 @@ static int get_bitmap_stride(int width, int bpp) return ((width * bpp + 15) >> 3) & ~1; } -static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, - LPARAM lparam) -{ - MONITORINFOEXA mi; - char *primary = (char *)lparam; - - mi.cbSize = sizeof(mi); - - ok(GetMonitorInfoA(hmon, (MONITORINFO*)&mi), "GetMonitorInfo failed\n"); - if (mi.dwFlags & MONITORINFOF_PRIMARY) - strcpy(primary, mi.szDevice); - - return TRUE; -} - static int adapter_count = 0; static int monitor_count = 0; @@ -150,11 +135,6 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de *device->DeviceString, "#%d: expect DeviceString not empty\n", index); /* StateFlags */ - if (index == 0) - ok(device->StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE, "#%d: adapter should be primary\n", index); - else - ok(!(device->StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE), "#%d: adapter should not be primary\n", index); - if (device->StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) { /* Test creating DC */ @@ -180,7 +160,7 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de } } -static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index, const char *adapter_name, +static void test_enumdisplaydevices_monitor(int monitor_index, const char *adapter_name, DISPLAY_DEVICEA *device, DWORD flags) { static const char device_key_prefix[] = "\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class" @@ -200,11 +180,8 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index ok(*device->DeviceString, "#%d: expect DeviceString not empty\n", monitor_index); /* StateFlags */ - if (adapter_index == 0 && monitor_index == 0) - ok(device->StateFlags & DISPLAY_DEVICE_ATTACHED, "#%d expect to have a primary monitor attached\n", monitor_index); - else - ok(device->StateFlags <= (DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE), "#%d wrong state %#x\n", monitor_index, - device->StateFlags); + ok(device->StateFlags <= (DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE), + "#%d wrong state %#x\n", monitor_index, device->StateFlags); /* DeviceID */ CharLowerA(device->DeviceID); @@ -236,8 +213,6 @@ static void test_enumdisplaydevices(void) { static const DWORD flags[] = {0, EDD_GET_DEVICE_INTERFACE_NAME}; DISPLAY_DEVICEA dd; - char primary_device_name[32]; - char primary_monitor_device_name[32]; char adapter_name[32]; int number; int flag_index; @@ -266,23 +241,12 @@ static void test_enumdisplaydevices(void) for (monitor_index = 0; EnumDisplayDevicesA(adapter_name, monitor_index, &dd, flags[flag_index]); monitor_index++) - test_enumdisplaydevices_monitor(adapter_index, monitor_index, adapter_name, &dd, flags[flag_index]); + test_enumdisplaydevices_monitor(monitor_index, adapter_name, &dd, flags[flag_index]); } ok(adapter_count > 0, "Expect at least one adapter found\n"); /* XP on Testbot doesn't report a monitor, whereas XP on real machine does */ ok(broken(monitor_count == 0) || monitor_count > 0, "Expect at least one monitor found\n"); - - ret = EnumDisplayDevicesA(NULL, 0, &dd, 0); - ok(ret, "Expect success\n"); - lstrcpyA(primary_device_name, dd.DeviceName); - - primary_monitor_device_name[0] = 0; - ret = EnumDisplayMonitors(NULL, NULL, monitor_enum_proc, (LPARAM)primary_monitor_device_name); - ok(ret, "EnumDisplayMonitors failed\n"); - ok(!strcmp(primary_monitor_device_name, primary_device_name), - "monitor device name %s, device name %s\n", primary_monitor_device_name, - primary_device_name); } struct vid_mode -- 2.30.2

1 0

[PATCH 6/8] winemac.drv: Register GUID_DEVINTERFACE_MONITOR interface for monitors.
by Zhiyi Zhang 16 Sep '21

16 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 484f658981f..277a19155d8 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1715,6 +1715,13 @@ static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_monitor *m if (!SetupDiRegisterDeviceInfo(devinfo, &device_data, 0, NULL, NULL, NULL)) goto done; + /* Register GUID_DEVINTERFACE_MONITOR */ + if (!SetupDiCreateDeviceInterfaceW(devinfo, &device_data, &GUID_DEVINTERFACE_MONITOR, NULL, 0, NULL)) + goto done; + + if (!link_device(bufferW, &GUID_DEVINTERFACE_MONITOR)) + goto done; + /* Write HardwareID registry property */ if (!SetupDiSetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_HARDWAREID, (const BYTE *)monitor_hardware_idW, sizeof(monitor_hardware_idW))) -- 2.30.2

1 0

[PATCH 5/8] winemac.drv: Register GUID_DISPLAY_DEVICE_ARRIVAL interface for GPUs.
by Zhiyi Zhang 16 Sep '21

16 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 6cb53cb092f..484f658981f 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1540,6 +1540,13 @@ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int if (!link_device(instanceW, &GUID_DEVINTERFACE_DISPLAY_ADAPTER)) goto done; + /* Register GUID_DISPLAY_DEVICE_ARRIVAL */ + if (!SetupDiCreateDeviceInterfaceW(devinfo, &device_data, &GUID_DISPLAY_DEVICE_ARRIVAL, NULL, 0, NULL)) + goto done; + + if (!link_device(instanceW, &GUID_DISPLAY_DEVICE_ARRIVAL)) + goto done; + /* Write HardwareID registry property, REG_MULTI_SZ */ written = sprintfW(bufferW, gpu_hardware_id_fmtW, gpu->vendor_id, gpu->device_id); bufferW[written + 1] = 0; -- 2.30.2

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel