- 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

[PATCH 4/8] winemac.drv: Register GUID_DEVINTERFACE_DISPLAY_ADAPTER 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 | 66 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 5a87e2331be..6cb53cb092f 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -26,9 +26,11 @@ #include "winreg.h" #include "ddrawi.h" #include "rpc.h" +#include "cfgmgr32.h" #include "initguid.h" #include "devguid.h" #include "devpkey.h" +#include "ntddvdeo.h" #include "setupapi.h" #define WIN32_NO_STATUS #include "winternl.h" @@ -1440,6 +1442,63 @@ void macdrv_displays_changed(const macdrv_event *event) } } +/*********************************************************************** + * link_device + * + * Set device interface link state to enabled. The link state should be set via + * IoSetDeviceInterfaceState(). However, IoSetDeviceInterfaceState() requires a PnP driver, which + * currently doesn't exist for display devices. + * + * Return FALSE on failure and TRUE on success. + */ +static BOOL link_device(const WCHAR *instance, const GUID *guid) +{ + static const WCHAR device_instanceW[] = {'D','e','v','i','c','e','I','n','s','t','a','n','c','e',0}; + static const WCHAR hash_controlW[] = {'#','\\','C','o','n','t','r','o','l',0}; + static const WCHAR linkedW[] = {'L','i','n','k','e','d',0}; + static const DWORD enabled = 1; + WCHAR device_key_name[MAX_PATH], device_instance[MAX_PATH]; + HKEY iface_key, device_key, control_key; + DWORD length, index = 0; + BOOL ret = FALSE; + LSTATUS lr; + + iface_key = SetupDiOpenClassRegKeyExW(guid, KEY_ALL_ACCESS, DIOCR_INTERFACE, NULL, NULL); + while (1) + { + length = ARRAY_SIZE(device_key_name); + lr = RegEnumKeyExW(iface_key, index++, device_key_name, &length, NULL, NULL, NULL, NULL); + if (lr) + break; + + lr = RegOpenKeyExW(iface_key, device_key_name, 0, KEY_ALL_ACCESS, &device_key); + if (lr) + continue; + + length = ARRAY_SIZE(device_instance); + lr = RegQueryValueExW(device_key, device_instanceW, NULL, NULL, (BYTE *)device_instance, &length); + if (lr || lstrcmpiW(device_instance, instance)) + { + RegCloseKey(device_key); + continue; + } + + lr = RegCreateKeyExW(device_key, hash_controlW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &control_key, NULL); + RegCloseKey(device_key); + if (lr) + break; + + lr = RegSetValueExW(control_key, linkedW, 0, REG_DWORD, (const BYTE *)&enabled, sizeof(enabled)); + if (!lr) + ret = TRUE; + + RegCloseKey(control_key); + break; + } + RegCloseKey(iface_key); + return ret; +} + /*********************************************************************** * macdrv_init_gpu * @@ -1474,6 +1533,13 @@ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int goto done; } + /* Register GUID_DEVINTERFACE_DISPLAY_ADAPTER */ + if (!SetupDiCreateDeviceInterfaceW(devinfo, &device_data, &GUID_DEVINTERFACE_DISPLAY_ADAPTER, NULL, 0, NULL)) + goto done; + + if (!link_device(instanceW, &GUID_DEVINTERFACE_DISPLAY_ADAPTER)) + 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

[PATCH 3/8] winex11.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/winex11.drv/display.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 19c5d95a562..c8c216c8302 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -665,6 +665,13 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo 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 2/8] winex11.drv: Register GUID_DISPLAY_DEVICE_ARRIVAL interface for GPUs.
by Zhiyi Zhang 16 Sep '21

16 Sep '21

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 7 +++++++ include/ntddvdeo.h | 1 + 2 files changed, 8 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 1ef728791fa..19c5d95a562 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -494,6 +494,13 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g 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; diff --git a/include/ntddvdeo.h b/include/ntddvdeo.h index 9523e37f7b4..8736c6cc845 100644 --- a/include/ntddvdeo.h +++ b/include/ntddvdeo.h @@ -21,5 +21,6 @@ DEFINE_GUID(GUID_DEVINTERFACE_DISPLAY_ADAPTER, 0x5b45201d, 0xf2f2, 0x4f3b, 0x85, 0xbb, 0x30, 0xff, 0x1f, 0x95, 0x35, 0x99); DEFINE_GUID(GUID_DEVINTERFACE_MONITOR, 0xe6f07b5f, 0xee97, 0x4a90, 0xb0, 0x76, 0x33, 0xf5, 0x7b, 0xf4, 0xea, 0xa7); +DEFINE_GUID(GUID_DISPLAY_DEVICE_ARRIVAL, 0x1ca05180, 0xa699, 0x450a, 0x9a, 0x0c, 0xde, 0x4f, 0xbe, 0x3d, 0xdd, 0x89); #endif -- 2.30.2

1 0

[PATCH 1/8] winex11.drv: Register GUID_DEVINTERFACE_DISPLAY_ADAPTER interface for GPUs.
by Zhiyi Zhang 16 Sep '21

16 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 60 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index ca81f169f9f..1ef728791fa 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -27,9 +27,11 @@ #include "winuser.h" #include "rpc.h" #include "winreg.h" +#include "cfgmgr32.h" #include "initguid.h" #include "devguid.h" #include "devpkey.h" +#include "ntddvdeo.h" #include "setupapi.h" #define WIN32_NO_STATUS #include "winternl.h" @@ -405,6 +407,57 @@ void X11DRV_DisplayDevices_Update(BOOL send_display_change) } } +/* Set device interface link state to enabled. The link state should be set via + * IoSetDeviceInterfaceState(). However, IoSetDeviceInterfaceState() requires a PnP driver, which + * currently doesn't exist for display devices. */ +static BOOL link_device(const WCHAR *instance, const GUID *guid) +{ + static const WCHAR device_instanceW[] = {'D','e','v','i','c','e','I','n','s','t','a','n','c','e',0}; + static const WCHAR hash_controlW[] = {'#','\\','C','o','n','t','r','o','l',0}; + static const WCHAR linkedW[] = {'L','i','n','k','e','d',0}; + static const DWORD enabled = 1; + WCHAR device_key_name[MAX_PATH], device_instance[MAX_PATH]; + HKEY iface_key, device_key, control_key; + DWORD length, index = 0; + BOOL ret = FALSE; + LSTATUS lr; + + iface_key = SetupDiOpenClassRegKeyExW(guid, KEY_ALL_ACCESS, DIOCR_INTERFACE, NULL, NULL); + while (1) + { + length = ARRAY_SIZE(device_key_name); + lr = RegEnumKeyExW(iface_key, index++, device_key_name, &length, NULL, NULL, NULL, NULL); + if (lr) + break; + + lr = RegOpenKeyExW(iface_key, device_key_name, 0, KEY_ALL_ACCESS, &device_key); + if (lr) + continue; + + length = ARRAY_SIZE(device_instance); + lr = RegQueryValueExW(device_key, device_instanceW, NULL, NULL, (BYTE *)device_instance, &length); + if (lr || lstrcmpiW(device_instance, instance)) + { + RegCloseKey(device_key); + continue; + } + + lr = RegCreateKeyExW(device_key, hash_controlW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &control_key, NULL); + RegCloseKey(device_key); + if (lr) + break; + + lr = RegSetValueExW(control_key, linkedW, 0, REG_DWORD, (const BYTE *)&enabled, sizeof(enabled)); + if (!lr) + ret = TRUE; + + RegCloseKey(control_key); + break; + } + RegCloseKey(iface_key); + return ret; +} + /* Initialize a GPU instance. * Return its GUID string in guid_string, driver value in driver parameter and LUID in gpu_luid */ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index, WCHAR *guid_string, @@ -434,6 +487,13 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g goto done; } + /* Register GUID_DEVINTERFACE_DISPLAY_ADAPTER */ + if (!SetupDiCreateDeviceInterfaceW(devinfo, &device_data, &GUID_DEVINTERFACE_DISPLAY_ADAPTER, NULL, 0, NULL)) + goto done; + + if (!link_device(instanceW, &GUID_DEVINTERFACE_DISPLAY_ADAPTER)) + 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

[PATCH 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> --- dlls/user32/tests/msg.c | 48 ++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 4c9f1dc6913..3f602a91b6a 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 } @@ -18451,6 +18451,7 @@ START_TEST(msg) test_scrollwindowex(); test_messages(); test_setwindowpos(); + test_showwindow(); /* Fix message sequences before removing 4 lines below */ if (pUnhookWinEvent && hEvent_hook) @@ -18461,7 +18462,6 @@ START_TEST(msg) } hEvent_hook = 0; - test_showwindow(); invisible_parent_tests(); test_mdi_messages(); test_button_messages(); -- 2.25.1

2 9

[PATCH] programs/explorer: Add missing arg_n to parse_command_line() commandline.
by Chao Long 16 Sep '21

16 Sep '21

Signed-off-by: Chao Long <longchao(a)uniontech.com> --- programs/explorer/explorer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 43bd4ef13a8..617910a569c 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -789,7 +789,7 @@ static void copy_path_root(LPWSTR root, LPWSTR path) */ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) { - static const WCHAR arg_n[] = {'/','n'}; + static const WCHAR arg_n[] = {'/','n',','}; static const WCHAR arg_e[] = {'/','e',','}; static const WCHAR arg_cd[] = {'/','c','d',','}; static const WCHAR arg_root[] = {'/','r','o','o','t',','}; -- 2.20.1

1 0

[PATCH v4 1/3] msvcrt: Improve memset performance using overlapping stores.
by Rémi Bernon 15 Sep '21

15 Sep '21

For n larger than 16 we store 16 bytes on each end of the buffer, eventually overlapping, and then 16 additional bytes for n > 32. Then we can find a 32-byte aligned range overlapping the remaining part of the destination buffer, which is filled 32 bytes at a time in a loop. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/msvcrt/string.c | 60 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 4d09405094d..f2b1b4a5b11 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2855,13 +2855,67 @@ void * __cdecl memcpy(void *dst, const void *src, size_t n) return memmove(dst, src, n); } +static inline void memset_aligned_32(unsigned char *d, uint64_t v, size_t n) +{ + while (n >= 32) + { + *(uint64_t *)(d + n - 32) = v; + *(uint64_t *)(d + n - 24) = v; + *(uint64_t *)(d + n - 16) = v; + *(uint64_t *)(d + n - 8) = v; + n -= 32; + } +} + /********************************************************************* * memset (MSVCRT.@) */ -void* __cdecl memset(void *dst, int c, size_t n) +void *__cdecl memset(void *dst, int c, size_t n) { - volatile unsigned char *d = dst; /* avoid gcc optimizations */ - while (n--) *d++ = c; + uint64_t v = 0x101010101010101ull * (unsigned char)c; + unsigned char *d = (unsigned char *)dst; + size_t a = 0x20 - ((uintptr_t)d & 0x1f); + + 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; + 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; + if (n <= 64) return dst; + + n = (n - a) & ~0x1f; + memset_aligned_32(d + a, v, n); + return dst; + } + if (n >= 8) + { + *(uint64_t *)d = v; + *(uint64_t *)(d + n - 8) = v; + return dst; + } + if (n >= 4) + { + *(uint32_t *)d = v; + *(uint32_t *)(d + n - 4) = v; + return dst; + } + if (n >= 2) + { + *(uint16_t *)d = v; + *(uint16_t *)(d + n - 2) = v; + return dst; + } + if (n >= 1) + { + *(uint8_t *)d = v; + return dst; + } return dst; } -- 2.33.0

3 7

[PATCH v5 1/3] winegstreamer: Duplicate source shutdown path into constructor with leak fixes.
by Zebediah Figura 15 Sep '21

15 Sep '21

From: Derek Lesho <dlesho(a)codeweavers.com> Instead of having mixing together IMFMediaSource::Shutdown() and the constructors' failure paths, creating confusion about what should be released where, designate ::Shutdown/::Release to shutting down fully initialized objects without checks, and keep the partially-created object cleanup code in the constructor. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v5: Resent with a couple of spacing tweaks for consistency; also use UINT_MAX instead of UINT32_MAX to match the type. dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/media_source.c | 102 +++++++++++++++++++----------- 2 files changed, 66 insertions(+), 37 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index c6c99b1dd55..c29fc4a2437 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -22,6 +22,7 @@ #define __GST_PRIVATE_INCLUDED__ #include <assert.h> +#include <limits.h> #include <stdarg.h> #include <stdbool.h> #include <stdint.h> diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 01ab626254a..95bdb9b488e 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -733,6 +733,12 @@ static HRESULT new_media_stream(struct media_source *source, object->IMFMediaStream_iface.lpVtbl = &media_stream_vtbl; object->ref = 1; + if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) + { + free(object); + return hr; + } + IMFMediaSource_AddRef(&source->IMFMediaSource_iface); object->parent_source = source; object->stream_id = stream_id; @@ -741,20 +747,11 @@ static HRESULT new_media_stream(struct media_source *source, object->eos = FALSE; object->wg_stream = wg_stream; - if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) - goto fail; - TRACE("Created stream object %p.\n", object); *out_stream = object; return S_OK; - -fail: - WARN("Failed to construct media stream, hr %#x.\n", hr); - - IMFMediaStream_Release(&object->IMFMediaStream_iface); - return hr; } static HRESULT media_stream_init_desc(struct media_stream *stream) @@ -847,10 +844,16 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) goto done; if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler))) + { + IMFStreamDescriptor_Release(stream->descriptor); goto done; + } if (FAILED(hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_types[0]))) + { + IMFStreamDescriptor_Release(stream->descriptor); goto done; + } done: if (type_handler) @@ -1213,19 +1216,13 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) unix_funcs->wg_parser_disconnect(source->wg_parser); - if (source->read_thread) - { - source->read_thread_shutdown = true; - WaitForSingleObject(source->read_thread, INFINITE); - CloseHandle(source->read_thread); - } + source->read_thread_shutdown = true; + WaitForSingleObject(source->read_thread, INFINITE); + CloseHandle(source->read_thread); - if (source->pres_desc) - IMFPresentationDescriptor_Release(source->pres_desc); - if (source->event_queue) - IMFMediaEventQueue_Shutdown(source->event_queue); - if (source->byte_stream) - IMFByteStream_Release(source->byte_stream); + IMFPresentationDescriptor_Release(source->pres_desc); + IMFMediaEventQueue_Shutdown(source->event_queue); + IMFByteStream_Release(source->byte_stream); for (i = 0; i < source->stream_count; i++) { @@ -1233,23 +1230,18 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) stream->state = STREAM_SHUTDOWN; - if (stream->event_queue) - IMFMediaEventQueue_Shutdown(stream->event_queue); - if (stream->descriptor) - IMFStreamDescriptor_Release(stream->descriptor); - if (stream->parent_source) - IMFMediaSource_Release(&stream->parent_source->IMFMediaSource_iface); + IMFMediaEventQueue_Shutdown(stream->event_queue); + IMFStreamDescriptor_Release(stream->descriptor); + IMFMediaSource_Release(&stream->parent_source->IMFMediaSource_iface); IMFMediaStream_Release(&stream->IMFMediaStream_iface); } unix_funcs->wg_parser_destroy(source->wg_parser); - if (source->stream_count) - free(source->streams); + free(source->streams); - if (source->async_commands_queue) - MFUnlockWorkQueue(source->async_commands_queue); + MFUnlockWorkQueue(source->async_commands_queue); return S_OK; } @@ -1274,6 +1266,7 @@ static const IMFMediaSourceVtbl IMFMediaSource_vtbl = static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_source **out_media_source) { IMFStreamDescriptor **descriptors = NULL; + unsigned int stream_count = UINT_MAX; struct media_source *object; UINT64 total_pres_time = 0; struct wg_parser *parser; @@ -1337,15 +1330,15 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ * leak occurs with native. */ unix_funcs->wg_parser_set_unlimited_buffering(parser); - object->stream_count = unix_funcs->wg_parser_get_stream_count(parser); + stream_count = unix_funcs->wg_parser_get_stream_count(parser); - if (!(object->streams = calloc(object->stream_count, sizeof(*object->streams)))) + if (!(object->streams = calloc(stream_count, sizeof(*object->streams)))) { hr = E_OUTOFMEMORY; goto fail; } - for (i = 0; i < object->stream_count; ++i) + for (i = 0; i < stream_count; ++i) { if (FAILED(hr = new_media_stream(object, unix_funcs->wg_parser_get_stream(parser, i), i, &object->streams[i]))) goto fail; @@ -1353,9 +1346,13 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (FAILED(hr = media_stream_init_desc(object->streams[i]))) { ERR("Failed to finish initialization of media stream %p, hr %x.\n", object->streams[i], hr); - IMFMediaStream_Release(&object->streams[i]->IMFMediaStream_iface); + IMFMediaSource_Release(&object->streams[i]->parent_source->IMFMediaSource_iface); + IMFMediaEventQueue_Release(object->streams[i]->event_queue); + free(object->streams[i]); goto fail; } + + object->stream_count++; } /* init presentation descriptor */ @@ -1392,8 +1389,39 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ fail: WARN("Failed to construct MFMediaSource, hr %#x.\n", hr); - free(descriptors); - IMFMediaSource_Release(&object->IMFMediaSource_iface); + if (descriptors) + { + for (i = 0; i < object->stream_count; i++) + IMFStreamDescriptor_Release(descriptors[i]); + free(descriptors); + } + for (i = 0; i < object->stream_count; i++) + { + struct media_stream *stream = object->streams[i]; + + IMFMediaEventQueue_Release(stream->event_queue); + IMFStreamDescriptor_Release(stream->descriptor); + IMFMediaSource_Release(&stream->parent_source->IMFMediaSource_iface); + + free(stream); + } + free(object->streams); + if (stream_count != UINT_MAX) + unix_funcs->wg_parser_disconnect(object->wg_parser); + if (object->read_thread) + { + object->read_thread_shutdown = true; + WaitForSingleObject(object->read_thread, INFINITE); + CloseHandle(object->read_thread); + } + if (object->wg_parser) + unix_funcs->wg_parser_destroy(object->wg_parser); + if (object->async_commands_queue) + MFUnlockWorkQueue(object->async_commands_queue); + if (object->event_queue) + IMFMediaEventQueue_Release(object->event_queue); + IMFByteStream_Release(object->byte_stream); + free(object); return hr; } -- 2.33.0

2 4

[PATCH 1/4] winegstreamer: Wake up the read thread when wg_parser_connect fails.
by Derek Lesho 15 Sep '21

15 Sep '21

This bug causes read_thread never to shut down when wg_parser_connect fails, which we rely on in the next commit. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/wg_parser.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index cd12a23d0c8..2e409f5ae18 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1518,7 +1518,11 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s parser->next_pull_offset = 0; if (!parser->init_gst(parser)) + { + parser->sink_connected = false; + pthread_cond_signal(&parser->read_cond); return E_FAIL; + } pthread_mutex_lock(&parser->mutex); @@ -1559,6 +1563,8 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s if (parser->error) { pthread_mutex_unlock(&parser->mutex); + parser->sink_connected = false; + pthread_cond_signal(&parser->read_cond); return E_FAIL; } if (gst_pad_query_duration(stream->their_src, GST_FORMAT_TIME, &duration)) -- 2.33.0

1 3

[PATCH] sxs: Don't assign a COM object to the 3rd param of QueryInterface
by Michael Stefaniuc 15 Sep '21

15 Sep '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/sxs/cache.c | 10 ++++------ dlls/sxs/name.c | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index 0acf012032d..e4fdda8c860 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -57,19 +57,17 @@ static inline struct cache *impl_from_IAssemblyCache(IAssemblyCache *iface) static HRESULT WINAPI cache_QueryInterface( IAssemblyCache *iface, REFIID riid, - void **obj ) + void **ret_iface ) { - struct cache *cache = impl_from_IAssemblyCache(iface); - - TRACE("%p, %s, %p\n", cache, debugstr_guid(riid), obj); + TRACE("%p, %s, %p\n", iface, debugstr_guid(riid), ret_iface); - *obj = NULL; + *ret_iface = NULL; if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAssemblyCache)) { IAssemblyCache_AddRef( iface ); - *obj = cache; + *ret_iface = iface; return S_OK; } diff --git a/dlls/sxs/name.c b/dlls/sxs/name.c index 6b3ae5197ac..0fab45c5018 100644 --- a/dlls/sxs/name.c +++ b/dlls/sxs/name.c @@ -56,19 +56,17 @@ static inline struct name *impl_from_IAssemblyName( IAssemblyName *iface ) static HRESULT WINAPI name_QueryInterface( IAssemblyName *iface, REFIID riid, - void **obj ) + void **ret_iface ) { - struct name *name = impl_from_IAssemblyName( iface ); - - TRACE("%p, %s, %p\n", name, debugstr_guid(riid), obj); + TRACE("%p, %s, %p\n", iface, debugstr_guid(riid), ret_iface); - *obj = NULL; + *ret_iface = NULL; if (IsEqualIID( riid, &IID_IUnknown ) || IsEqualIID( riid, &IID_IAssemblyName )) { IAssemblyName_AddRef( iface ); - *obj = name; + *ret_iface = iface; return S_OK; } -- 2.31.1

2 2

[PATCH] mfplat/tests: Remove unnecessary check (Coverity).
by Nikolay Sivov 15 Sep '21

15 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 54af1ee151d..541459c715b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -877,8 +877,6 @@ todo_wine for (i = 0; i < sample_count; ++i) { hr = IMFMediaStream_RequestSample(video_stream, NULL); - if (i == sample_count) - break; ok(hr == S_OK, "Failed to request sample %u, hr %#x.\n", i + 1, hr); if (hr != S_OK) break; -- 2.33.0

1 0

[PATCH v3 1/2] ntdll: Use posix_fallocate(2/3) instead of fallocate(2).
by Chip Davis 15 Sep '21

15 Sep '21

From: Charles Davis <cdavis5x(a)gmail.com> The fallocate(2) call only exists on Linux. posix_fallocate() is more portable. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- v3: Fix typo. v2: Don't fall back to fallocate(2). --- configure.ac | 10 +--------- dlls/ntdll/unix/file.c | 9 +++++---- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index fec39b6f2ac..cc8a4b79aaf 100644 --- a/configure.ac +++ b/configure.ac @@ -2183,6 +2183,7 @@ AC_CHECK_FUNCS(\ poll \ port_create \ posix_fadvise \ + posix_fallocate \ prctl \ proc_pidinfo \ readlink \ @@ -2274,15 +2275,6 @@ then AC_DEFINE(HAVE_SCHED_SETAFFINITY, 1, [Define to 1 if you have the `sched_setaffinity' function.]) fi -AC_CACHE_CHECK([for fallocate],wine_cv_have_fallocate, - AC_LINK_IFELSE([AC_LANG_PROGRAM( -[[#define _GNU_SOURCE -#include <fcntl.h>]], [[fallocate(-1, 0, 0, 0);]])],[wine_cv_have_fallocate=yes],[wine_cv_have_fallocate=no])) -if test "$wine_cv_have_fallocate" = "yes" -then - AC_DEFINE(HAVE_FALLOCATE, 1, [Define to 1 if you have the `fallocate' function.]) -fi - dnl **** Check for types **** AC_C_INLINE diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 046338b2a82..c92cbd1db4a 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4574,11 +4574,12 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, status = STATUS_INVALID_PARAMETER; else { -#ifdef HAVE_FALLOCATE - if (fallocate( fd, 0, 0, (off_t)info->ValidDataLength.QuadPart ) == -1) +#ifdef HAVE_POSIX_FALLOCATE + int err; + if ((err = posix_fallocate( fd, 0, (off_t)info->ValidDataLength.QuadPart )) != 0) { - if (errno == EOPNOTSUPP) WARN( "fallocate not supported on this filesystem\n" ); - else status = errno_to_status( errno ); + if (err == EOPNOTSUPP) WARN( "posix_fallocate not supported on this filesystem\n" ); + else status = errno_to_status( err ); } #else FIXME( "setting valid data length not supported\n" ); -- 2.33.0

3 6

[PATCH vkd3d v=2 1/2] tests: Test the shape of the sum of two numeric values.
by Giovanni Mascellani 15 Sep '21

15 Sep '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- Makefile.am | 2 + tests/hlsl-shape.shader_test | 355 +++++++++++++++++++++++++++++++++++ 2 files changed, 357 insertions(+) create mode 100644 tests/hlsl-shape.shader_test diff --git a/Makefile.am b/Makefile.am index 05d9f00c..5decb3ef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -67,6 +67,7 @@ vkd3d_shader_tests = \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ + tests/hlsl-shape.shader_test \ tests/hlsl-static-initializer.shader_test \ tests/hlsl-storage-qualifiers.shader_test \ tests/hlsl-struct-assignment.shader_test \ @@ -278,6 +279,7 @@ XFAIL_TESTS = \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ + tests/hlsl-shape.shader_test \ tests/hlsl-static-initializer.shader_test \ tests/hlsl-storage-qualifiers.shader_test \ tests/hlsl-vector-indexing.shader_test \ diff --git a/tests/hlsl-shape.shader_test b/tests/hlsl-shape.shader_test new file mode 100644 index 00000000..b96f0fd2 --- /dev/null +++ b/tests/hlsl-shape.shader_test @@ -0,0 +1,355 @@ +[pixel shader] +float4 main() : sv_target +{ + float x = 1.0; + float y = 2.0; + return float4(x + y, 0.0, 0.0, 0.0); +} + +[test] +draw quad +probe all rgba (3.0, 0.0, 0.0, 0.0) + +[pixel shader] +float4 main() : sv_target +{ + float1 x = float1(1.0); + float2 y = float2(1.0, 2.0); + return float4(x + y, 0.0, 0.0); +} + +[test] +draw quad +probe all rgba (2.0, 3.0, 0.0, 0.0) + +[pixel shader] +float4 main() : sv_target +{ + float1 x = float1(1.0); + float4 y = float4(1.0, 2.0, 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 3.0, 4.0, 5.0) + +[pixel shader] +float4 main() : sv_target +{ + float2 x = float2(1.0, 2.0); + float4 y = float4(1.0, 2.0, 3.0, 4.0); + return float4(x + y, 0.0, 0.0); +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 0.0, 0.0) + +[pixel shader] +float4 main() : sv_target +{ + float x = 1.0; + float1 y = float1(1.0); + return float4(x + y, y + x, 0.0, 0.0); +} + +[test] +draw quad +probe all rgba (2.0, 2.0, 0.0, 0.0) + +[pixel shader] +float4 main() : sv_target +{ + float x = 1.0; + float4 y = float4(1.0, 2.0, 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 3.0, 4.0, 5.0) + +[pixel shader] +float4 main() : sv_target +{ + float4 x = float4(1.0, 2.0, 3.0, 4.0); + float y = 1.0; + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 3.0, 4.0, 5.0) + +[pixel shader] +float4 main() : sv_target +{ + float2x2 x = float2x2(1.0, 2.0, + 3.0, 4.0); + float2x3 y = float2x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 7.0, 9.0) + +[pixel shader] +float4 main() : sv_target +{ + float2x3 x = float2x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0); + float2x2 y = float2x2(1.0, 2.0, + 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 7.0, 9.0) + +[pixel shader] +float4 main() : sv_target +{ + float1x4 x = float1x4(1.0, 2.0, 3.0, 4.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 6.0, 8.0) + +[pixel shader] +float4 main() : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float1x4 y = float1x4(1.0, 2.0, 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 6.0, 8.0) + +[pixel shader] +float4 main() : sv_target +{ + float4x1 x = float4x1(1.0, 2.0, 3.0, 4.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 7.0, 12.0, 17.0) + +[pixel shader] +float4 main() : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float4x1 y = float4x1(1.0, 2.0, 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 7.0, 12.0, 17.0) + +[pixel shader] +float4 main() : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float2x3 y = float2x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0); + return float4((x + y)[0], 0.0); +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 6.0, 0.0) + +[pixel shader] +float4 main() : sv_target +{ + float2x3 x = float2x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + return float4((x + y)[1], 0.0); +} + +[test] +draw quad +probe all rgba (9.0, 11.0, 13.0, 0.0) + +[pixel shader] +float4 main() : sv_target +{ + float4 x = float4(1.0, 2.0, 3.0, 4.0); + float1x4 y = float1x4(1.0, 2.0, 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 6.0, 8.0) + +[pixel shader] +float4 main() : sv_target +{ + float1x4 x = float1x4(1.0, 2.0, 3.0, 4.0); + float4 y = float4(1.0, 2.0, 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 6.0, 8.0) + +[pixel shader] +float4 main() : sv_target +{ + float4 x = float4(1.0, 2.0, 3.0, 4.0); + float4x1 y = float4x1(1.0, 2.0, 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 6.0, 8.0) + +[pixel shader] +float4 main() : sv_target +{ + float4x1 x = float4x1(1.0, 2.0, 3.0, 4.0); + float4 y = float4(1.0, 2.0, 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 6.0, 8.0) + +[pixel shader] +float4 main() : sv_target +{ + float4 x = float4(1.0, 2.0, 3.0, 4.0); + float2x2 y = float2x2(1.0, 2.0, + 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 6.0, 8.0) + +[pixel shader] +float4 main() : sv_target +{ + float2x2 x = float2x2(1.0, 2.0, + 3.0, 4.0); + float4 y = float4(1.0, 2.0, 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 6.0, 8.0) + +[pixel shader] +float4 main() : sv_target +{ + float1 x = float1(1.0); + float1x4 y = float1x4(1.0, 2.0, 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 3.0, 4.0, 5.0) + +[pixel shader] +float4 main() : sv_target +{ + float1x4 x = float1x4(1.0, 2.0, 3.0, 4.0); + float1 y = float1(1.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 3.0, 4.0, 5.0) + +[pixel shader] +float4 main() : sv_target +{ + float2 x = float2(1.0, 2.0); + float4x1 y = float4x1(1.0, 2.0, 3.0, 4.0); + return float4(x + y, 0.0, 0.0); +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 0.0, 0.0) + +[pixel shader] +float4 main() : sv_target +{ + float4x1 x = float4x1(1.0, 2.0, 3.0, 4.0); + float2 y = float2(1.0, 2.0); + return float4(x + y, 0.0, 0.0); +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 0.0, 0.0) + +[pixel shader] +float4 main() : sv_target +{ + float x = 1.0; + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + return (x + y)[0]; +} + +[test] +draw quad +probe all rgba (2.0, 3.0, 4.0, 5.0) + +[pixel shader] +float4 main() : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float y = 1.0; + return (x + y)[1]; +} + +[test] +draw quad +probe all rgba (6.0, 7.0, 8.0, 9.0) -- 2.33.0

2 3

[PATCH vkd3d] vkd3d-shader/hlsl: Write dimension for constant buffer registers.
by Giovanni Mascellani 15 Sep '21

15 Sep '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 160da47f..beeecf85 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -613,6 +613,7 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r if (var->is_uniform) { reg->type = VKD3D_SM4_RT_CONSTBUFFER; + reg->dim = VKD3D_SM4_DIMENSION_VEC4; reg->idx[0] = var->buffer->reg.id; reg->idx[1] = var->buffer_offset / 4; reg->idx_count = 2; -- 2.33.0

2 1

[PATCH vkd3d] vkd3d-shader/hlsl: Write constant buffer offsets in bytes.
by Giovanni Mascellani 15 Sep '21

15 Sep '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 160da47f..8693f2f1 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -515,7 +515,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) flags |= D3D_SVF_USED; put_u32(&buffer, 0); /* name */ - put_u32(&buffer, var->buffer_offset); + put_u32(&buffer, var->buffer_offset * sizeof(float)); put_u32(&buffer, var->data_type->reg_size * sizeof(float)); put_u32(&buffer, flags); put_u32(&buffer, 0); /* type */ -- 2.33.0

2 1

[PATCH] msvcrt: Use free() on msvcrt_wstrdupa() results (Coverity).
by Nikolay Sivov 15 Sep '21

15 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msvcrt/process.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index cf1dcd3d279..a5f8f0bca3d 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -1165,14 +1165,14 @@ FILE* CDECL _popen(const char* command, const char* mode) if (!(cmdW = msvcrt_wstrdupa(command))) return NULL; if (!(modeW = msvcrt_wstrdupa(mode))) { - HeapFree(GetProcessHeap(), 0, cmdW); + free(cmdW); return NULL; } ret = _wpopen(cmdW, modeW); - HeapFree(GetProcessHeap(), 0, cmdW); - HeapFree(GetProcessHeap(), 0, modeW); + free(cmdW); + free(modeW); return ret; } @@ -1274,7 +1274,7 @@ int CDECL system(const char* cmd) if ((cmdW = msvcrt_wstrdupa(cmd))) { res = _wsystem(cmdW); - HeapFree(GetProcessHeap(), 0, cmdW); + free(cmdW); } return res; } -- 2.33.0

2 1

[PATCH v5] dsound: Commit next audio chunk between play cursor and write cursor to playing.
by Eduard Permyakov 15 Sep '21

15 Sep '21

This region of the audio buffer is forbidden to be written to by the DirectSound specification. The documentation states: "The write cursor is the point after which it is safe to write data into the buffer. The block between the play cursor and the write cursor is already committed to be played, and cannot be changed safely." However, some applications still do this, which has lead to audio glitches only when using the Wine DirectSound implementation. Experiments showed that the native DirctSound implementation will still play the old audio the first time around when the buffer region gets overwritten. Use an approach of copying the next forbidden region into a "committed buffer" to add the same behavior to the Wine implementation. Out of performance considerations, only copy data to the committed buffer when we detect that an overwrite is possible (i.e. the current mixing region of the buffer gets locked). Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/dsound/buffer.c | 48 +++++++++++++++++++++++++++++++++--- dlls/dsound/dsound_convert.c | 33 ++++++++++++------------- dlls/dsound/dsound_private.h | 11 ++++++--- dlls/dsound/mixer.c | 48 ++++++++++++++++++++++++++++-------- 4 files changed, 107 insertions(+), 33 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index dc3b54906ce..63468732e1d 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -101,6 +101,24 @@ static int __cdecl notify_compar(const void *l, const void *r) return 1; } +static void commit_next_chunk(IDirectSoundBufferImpl *dsb) +{ + void *dstbuff = dsb->committedbuff, *srcbuff = dsb->buffer->memory; + DWORD srcoff = dsb->sec_mixpos, srcsize = dsb->buflen, cpysize = dsb->writelead; + + if(cpysize > srcsize - srcoff) { + DWORD overflow = cpysize - (srcsize - srcoff); + memcpy(dstbuff, (BYTE*)srcbuff + srcoff, srcsize - srcoff); + memcpy((BYTE*)dstbuff + (srcsize - srcoff), srcbuff, overflow); + }else{ + memcpy(dstbuff, (BYTE*)srcbuff + srcoff, cpysize); + } + + dsb->use_committed = TRUE; + dsb->committed_mixpos = 0; + TRACE("committing %u bytes from offset %u\n", dsb->writelead, dsb->sec_mixpos); +} + static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(IDirectSoundNotify *iface, DWORD howmuch, const DSBPOSITIONNOTIFY *notify) { @@ -503,8 +521,10 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(IDirectSoundBuffer8 *iface, DW if (writecursor+writebytes <= This->buflen) { *(LPBYTE*)lplpaudioptr1 = This->buffer->memory+writecursor; - if (This->sec_mixpos >= writecursor && This->sec_mixpos < writecursor + writebytes && This->state == STATE_PLAYING) + if (This->sec_mixpos >= writecursor && This->sec_mixpos < writecursor + writebytes && This->state == STATE_PLAYING) { WARN("Overwriting mixing position, case 1\n"); + commit_next_chunk(This); + } *audiobytes1 = writebytes; if (lplpaudioptr2) *(LPBYTE*)lplpaudioptr2 = NULL; @@ -519,16 +539,20 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(IDirectSoundBuffer8 *iface, DW *(LPBYTE*)lplpaudioptr1 = This->buffer->memory+writecursor; *audiobytes1 = This->buflen-writecursor; This->buffer->lockedbytes += *audiobytes1; - if (This->sec_mixpos >= writecursor && This->sec_mixpos < writecursor + writebytes && This->state == STATE_PLAYING) + if (This->sec_mixpos >= writecursor && This->sec_mixpos < writecursor + writebytes && This->state == STATE_PLAYING) { WARN("Overwriting mixing position, case 2\n"); + commit_next_chunk(This); + } if (lplpaudioptr2) *(LPBYTE*)lplpaudioptr2 = This->buffer->memory; if (audiobytes2) { *audiobytes2 = writebytes-(This->buflen-writecursor); This->buffer->lockedbytes += *audiobytes2; } - if (audiobytes2 && This->sec_mixpos < remainder && This->state == STATE_PLAYING) + if (audiobytes2 && This->sec_mixpos < remainder && This->state == STATE_PLAYING) { WARN("Overwriting mixing position, case 3\n"); + commit_next_chunk(This); + } TRACE("Locked %p(%i bytes) and %p(%i bytes) writecursor=%d\n", *(LPBYTE*)lplpaudioptr1, *audiobytes1, lplpaudioptr2 ? *(LPBYTE*)lplpaudioptr2 : NULL, audiobytes2 ? *audiobytes2: 0, writecursor); } @@ -1081,6 +1105,12 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds /* calculate fragment size and write lead */ DSOUND_RecalcFormat(dsb); + dsb->committedbuff = HeapAlloc(GetProcessHeap(), 0, dsb->writelead); + if(!dsb->committedbuff) { + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); + return DSERR_OUTOFMEMORY; + } + if (dsb->dsbd.dwFlags & DSBCAPS_CTRL3D) { dsb->ds3db_ds3db.dwSize = sizeof(DS3DBUFFER); dsb->ds3db_ds3db.vPosition.x = 0.0; @@ -1135,6 +1165,7 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) HeapFree(GetProcessHeap(), 0, This->notifies); HeapFree(GetProcessHeap(), 0, This->pwfx); + HeapFree(GetProcessHeap(), 0, This->committedbuff); if (This->filters) { int i; @@ -1157,6 +1188,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( { IDirectSoundBufferImpl *dsb; HRESULT hres = DS_OK; + VOID *committedbuff; TRACE("(%p,%p,%p)\n", device, ppdsb, pdsb); dsb = HeapAlloc(GetProcessHeap(),0,sizeof(*dsb)); @@ -1166,6 +1198,13 @@ HRESULT IDirectSoundBufferImpl_Duplicate( return DSERR_OUTOFMEMORY; } + committedbuff = HeapAlloc(GetProcessHeap(),0,pdsb->writelead); + if (committedbuff == NULL) { + HeapFree(GetProcessHeap(),0,dsb); + *ppdsb = NULL; + return DSERR_OUTOFMEMORY; + } + AcquireSRWLockShared(&pdsb->lock); CopyMemory(dsb, pdsb, sizeof(*dsb)); @@ -1175,6 +1214,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( ReleaseSRWLockShared(&pdsb->lock); if (dsb->pwfx == NULL) { + HeapFree(GetProcessHeap(),0,committedbuff); HeapFree(GetProcessHeap(),0,dsb); *ppdsb = NULL; return DSERR_OUTOFMEMORY; @@ -1192,6 +1232,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( dsb->notifies = NULL; dsb->nrofnotifies = 0; dsb->device = device; + dsb->committedbuff = committedbuff; DSOUND_RecalcFormat(dsb); InitializeSRWLock(&dsb->lock); @@ -1202,6 +1243,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( list_remove(&dsb->entry); dsb->buffer->ref--; HeapFree(GetProcessHeap(),0,dsb->pwfx); + HeapFree(GetProcessHeap(),0,dsb->committedbuff); HeapFree(GetProcessHeap(),0,dsb); dsb = NULL; }else diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 4735178a9a8..67344565860 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -55,26 +55,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); #define le32(x) (x) #endif -static float get8(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) +static float get8(const IDirectSoundBufferImpl *dsb, BYTE *base, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - buf += pos + channel; + const BYTE *buf = base + channel; return (buf[0] - 0x80) / (float)0x80; } -static float get16(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) +static float get16(const IDirectSoundBufferImpl *dsb, BYTE *base, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const SHORT *sbuf = (const SHORT*)(buf + pos + 2 * channel); + const BYTE *buf = base + 2 * channel; + const SHORT *sbuf = (const SHORT*)(buf); SHORT sample = (SHORT)le16(*sbuf); return sample / (float)0x8000; } -static float get24(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) +static float get24(const IDirectSoundBufferImpl *dsb, BYTE *base, DWORD channel) { LONG sample; - const BYTE* buf = dsb->buffer->memory; - buf += pos + 3 * channel; + const BYTE *buf = base + 3 * channel; + /* The next expression deliberately has an overflow for buf[2] >= 0x80, this is how negative values are made. */ @@ -82,32 +81,32 @@ static float get24(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) return sample / (float)0x80000000U; } -static float get32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) +static float get32(const IDirectSoundBufferImpl *dsb, BYTE *base, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const LONG *sbuf = (const LONG*)(buf + pos + 4 * channel); + const BYTE *buf = base + 4 * channel; + const LONG *sbuf = (const LONG*)(buf); LONG sample = le32(*sbuf); return sample / (float)0x80000000U; } -static float getieee32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) +static float getieee32(const IDirectSoundBufferImpl *dsb, BYTE *base, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const float *sbuf = (const float*)(buf + pos + 4 * channel); + const BYTE *buf = base + 4 * channel; + const float *sbuf = (const float*)(buf); /* The value will be clipped later, when put into some non-float buffer */ return *sbuf; } const bitsgetfunc getbpp[5] = {get8, get16, get24, get32, getieee32}; -float get_mono(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) +float get_mono(const IDirectSoundBufferImpl *dsb, BYTE *base, DWORD channel) { DWORD channels = dsb->pwfx->nChannels; DWORD c; float val = 0; /* XXX: does Windows include LFE into the mix? */ for (c = 0; c < channels; c++) - val += dsb->get_aux(dsb, pos, c); + val += dsb->get_aux(dsb, base, c); val /= channels; return val; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index bdb9ebee544..9ec96504a50 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -43,7 +43,7 @@ typedef struct IDirectSoundBufferImpl IDirectSoundBufferImpl; typedef struct DirectSoundDevice DirectSoundDevice; /* dsound_convert.h */ -typedef float (*bitsgetfunc)(const IDirectSoundBufferImpl *, DWORD, DWORD); +typedef float (*bitsgetfunc)(const IDirectSoundBufferImpl *, BYTE *, DWORD); typedef void (*bitsputfunc)(const IDirectSoundBufferImpl *, DWORD, DWORD, float); extern const bitsgetfunc getbpp[5] DECLSPEC_HIDDEN; void putieee32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; @@ -153,7 +153,12 @@ struct IDirectSoundBufferImpl LONG64 freqAccNum; /* used for mixing */ DWORD sec_mixpos; - + /* Holds a copy of the next 'writelead' bytes, to be used for mixing. This makes it + * so that these bytes get played once even if this region of the buffer gets overwritten, + * which is more in-line with native DirectSound behavior. */ + BOOL use_committed; + LPVOID committedbuff; + DWORD committed_mixpos; /* IDirectSoundNotify fields */ LPDSBPOSITIONNOTIFY notifies; int nrofnotifies; @@ -171,7 +176,7 @@ struct IDirectSoundBufferImpl struct list entry; }; -float get_mono(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) DECLSPEC_HIDDEN; +float get_mono(const IDirectSoundBufferImpl *dsb, BYTE *base, DWORD channel) DECLSPEC_HIDDEN; void put_mono2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_mono2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_stereo2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 124d1e4fba1..e9d8a6e3cdd 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -276,22 +276,35 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len } static inline float get_current_sample(const IDirectSoundBufferImpl *dsb, - DWORD mixpos, DWORD channel) + BYTE *buffer, DWORD buflen, DWORD mixpos, DWORD channel) { - if (mixpos >= dsb->buflen && !(dsb->playflags & DSBPLAY_LOOPING)) + if (mixpos >= buflen && !(dsb->playflags & DSBPLAY_LOOPING)) return 0.0f; - return dsb->get(dsb, mixpos % dsb->buflen, channel); + return dsb->get(dsb, buffer + (mixpos % buflen), channel); } static UINT cp_fields_noresample(IDirectSoundBufferImpl *dsb, UINT count) { UINT istride = dsb->pwfx->nBlockAlign; UINT ostride = dsb->device->pwfx->nChannels * sizeof(float); + UINT committed_samples = 0; DWORD channel, i; - for (i = 0; i < count; i++) + + if(dsb->use_committed) { + committed_samples = (dsb->writelead - dsb->committed_mixpos) / istride; + committed_samples = committed_samples <= count ? committed_samples : count; + } + + for (i = 0; i < committed_samples; i++) + for (channel = 0; channel < dsb->mix_channels; channel++) + dsb->put(dsb, i * ostride, channel, get_current_sample(dsb, dsb->committedbuff, + dsb->writelead, dsb->committed_mixpos + i * istride, channel)); + + for (; i < count; i++) for (channel = 0; channel < dsb->mix_channels; channel++) - dsb->put(dsb, i * ostride, channel, get_current_sample(dsb, - dsb->sec_mixpos + i * istride, channel)); + dsb->put(dsb, i * ostride, channel, get_current_sample(dsb, dsb->buffer->memory, + dsb->buflen, dsb->sec_mixpos + i * istride, channel)); + return count; } @@ -300,6 +313,7 @@ static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, LONG64 * UINT i, channel; UINT istride = dsb->pwfx->nBlockAlign; UINT ostride = dsb->device->pwfx->nChannels * sizeof(float); + UINT committed_samples = 0; LONG64 freqAcc_start = *freqAccNum; LONG64 freqAcc_end = freqAcc_start + count * dsb->freqAdjustNum; @@ -326,16 +340,24 @@ static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, LONG64 * fir_copy = dsb->device->cp_buffer; intermediate = fir_copy + fir_cachesize; + if(dsb->use_committed) { + committed_samples = (dsb->writelead - dsb->committed_mixpos) / istride; + committed_samples = committed_samples <= required_input ? committed_samples : required_input; + } /* Important: this buffer MUST be non-interleaved * if you want -msse3 to have any effect. * This is good for CPU cache effects, too. */ itmp = intermediate; - for (channel = 0; channel < channels; channel++) - for (i = 0; i < required_input; i++) - *(itmp++) = get_current_sample(dsb, - dsb->sec_mixpos + i * istride, channel); + for (channel = 0; channel < channels; channel++) { + for (i = 0; i < committed_samples; i++) + *(itmp++) = get_current_sample(dsb, dsb->committedbuff, + dsb->writelead, dsb->committed_mixpos + i * istride, channel); + for (; i < required_input; i++) + *(itmp++) = get_current_sample(dsb, dsb->buffer->memory, + dsb->buflen, dsb->sec_mixpos + i * istride, channel); + } for(i = 0; i < count; ++i) { UINT int_fir_steps = (freqAcc_start + i * dsb->freqAdjustNum) * dsbfirstep / dsb->freqAdjustDen; @@ -389,6 +411,12 @@ static void cp_fields(IDirectSoundBufferImpl *dsb, UINT count, LONG64 *freqAccNu } dsb->sec_mixpos = ipos; + + if(dsb->use_committed) { + dsb->committed_mixpos += adv * dsb->pwfx->nBlockAlign; + if(dsb->committed_mixpos >= dsb->writelead) + dsb->use_committed = FALSE; + } } /** -- 2.25.1

2 6

[PATCH] gdi32: Fix a typo in failure path (Coverity).
by Nikolay Sivov 15 Sep '21

15 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdi32/dc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index f7b56b06f6f..2fa792372d7 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -125,7 +125,7 @@ DC *alloc_dc_ptr( DWORD magic ) if (!(dc = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dc) ))) return NULL; if (!(dc->attr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dc->attr)))) { - HeapFree( GetProcessHeap(), 0, dc->attr ); + HeapFree( GetProcessHeap(), 0, dc ); return NULL; } -- 2.33.0

2 1

[PATCH v2 1/7] wined3d: Make wined3d_texture_update_map_binding() backend-independent.
by Jan Sikorski 15 Sep '21

15 Sep '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/texture.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6663e788e9c..6ecec939964 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -859,6 +859,12 @@ static void wined3d_texture_remove_buffer_object(struct wined3d_texture *texture wined3d_texture_invalidate_location(texture, sub_resource_idx, WINED3D_LOCATION_BUFFER); } +static void wined3d_texture_unload_location(struct wined3d_texture *texture, + struct wined3d_context *context, unsigned int location) +{ + texture->texture_ops->texture_unload_location(texture, context, location); +} + static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) { unsigned int sub_count = texture->level_count * texture->layer_count; @@ -874,10 +880,11 @@ static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) if (texture->sub_resources[i].locations == texture->resource.map_binding && !wined3d_texture_load_location(texture, i, context, map_binding)) ERR("Failed to load location %s.\n", wined3d_debug_location(map_binding)); - if (texture->resource.map_binding == WINED3D_LOCATION_BUFFER) - wined3d_texture_remove_buffer_object(texture, i, wined3d_context_gl(context)); } + if (texture->resource.map_binding == WINED3D_LOCATION_BUFFER) + wined3d_texture_unload_location(texture, context, WINED3D_LOCATION_BUFFER); + context_release(context); texture->resource.map_binding = map_binding; @@ -2110,12 +2117,6 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, return texture->texture_ops->texture_prepare_location(texture, sub_resource_idx, context, location); } -static void wined3d_texture_unload_location(struct wined3d_texture *texture, - struct wined3d_context *context, unsigned int location) -{ - texture->texture_ops->texture_unload_location(texture, context, location); -} - static struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(struct wined3d_texture *texture, unsigned int sub_resource_idx) { -- 2.30.2

2 13

[PATCH v3 1/3] msi: Set dialog as parent in subsequent dialog
by Fabian Maurer 15 Sep '21

15 Sep '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51576 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msi/dialog.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 703f9d43957..6463c3062ac 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3904,7 +3904,7 @@ static void process_pending_messages( HWND hdlg ) static UINT dialog_run_message_loop( msi_dialog *dialog ) { DWORD style; - HWND hwnd; + HWND hwnd, parent; if( uiThreadId != GetCurrentThreadId() ) return SendMessageW( hMsiHiddenWindow, WM_MSI_DIALOG_CREATE, 0, (LPARAM) dialog ); @@ -3917,9 +3917,11 @@ static UINT dialog_run_message_loop( msi_dialog *dialog ) if (dialog->parent == NULL && (dialog->attributes & msidbDialogAttributesMinimize)) style |= WS_MINIMIZEBOX; + parent = dialog->parent ? dialog->parent->hwnd : 0; + hwnd = CreateWindowW( L"MsiDialogCloseClass", dialog->name, style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - NULL, NULL, NULL, dialog ); + parent, NULL, NULL, dialog ); if( !hwnd ) { ERR("Failed to create dialog %s\n", debugstr_w( dialog->name )); -- 2.33.0

2 9

[PATCH] sechost: Fix argument pointers array allocation size (Coverity).
by Nikolay Sivov 15 Sep '21

15 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/sechost/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index e4e152b0824..c447263bd0f 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -1020,7 +1020,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH StartServiceA( SC_HANDLE service, DWORD argc, cons BOOL r; if (argc) - argvW = heap_alloc( argc * sizeof(WCHAR) ); + argvW = heap_alloc( argc * sizeof(*argvW) ); for (i = 0; i < argc; i++) argvW[i] = heap_strdupAtoW( argv[i] ); -- 2.33.0

1 0

[PATCH vkd3d] vkd3d-shader/glsl: Explicitly initialise "buffer" in vkd3d_glsl_generator_create().
by Henri Verbeet 15 Sep '21

15 Sep '21

So that we don't get in trouble if vkd3d_string_buffer_init() were to start doing more than zeroing fields. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/glsl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index b304addc..7e028d23 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -38,6 +38,7 @@ struct vkd3d_glsl_generator *vkd3d_glsl_generator_create(const struct vkd3d_shad memset(generator, 0, sizeof(*generator)); generator->version = *version; + vkd3d_string_buffer_init(&generator->buffer); generator->location.source_name = compile_info->source_name; generator->location.line = 2; /* Line 1 is the version token. */ generator->message_context = message_context; -- 2.20.1

1 0

[PATCH vkd3d v2 1/7] tests: Test casts to float.
by Zebediah Figura 15 Sep '21

15 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 2 ++ tests/cast-to-float.shader_test | 29 +++++++++++++++++++++++++++++ tests/shader_runner_d3d12.c | 29 ++++++++++++++++++++++++++++- 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 tests/cast-to-float.shader_test diff --git a/Makefile.am b/Makefile.am index 05d9f00c6..d707a26b3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,6 +54,7 @@ vkd3d_shader_runners = \ tests/shader_runner_d3d12 vkd3d_shader_tests = \ + tests/cast-to-float.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ @@ -266,6 +267,7 @@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ + tests/cast-to-float.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ diff --git a/tests/cast-to-float.shader_test b/tests/cast-to-float.shader_test new file mode 100644 index 000000000..75822e527 --- /dev/null +++ b/tests/cast-to-float.shader_test @@ -0,0 +1,29 @@ +[pixel shader] + +float4 main(uniform int i, uniform uint u, uniform bool b, uniform half h) : sv_target +{ + return float4(((float)i) + 1.5, ((float)u) - 2.5, ((float)b) / 2, h); +} + +[test] +uniform 0 int -1 +uniform 1 uint 3 +uniform 2 int -2 +uniform 3 float 0.5 +draw quad +probe all rgba (0.5, 0.5, 0.5, 0.5) + +[pixel shader] + +float4 main() : sv_target +{ + int i = -1; + uint u = 3; + bool b = true; + half h = 0.5; + return float4(((float)i) + 1.5, ((float)u) - 2.5, ((float)b) / 2, h); +} + +[test] +draw quad +probe all rgba (0.5, 0.5, 0.5, 0.5) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 2221c0f87..d5c0380e8 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -242,11 +242,38 @@ static void parse_test_directive(struct shader_context *context, const char *lin } memcpy(context->uniforms + offset, &v, sizeof(v)); } + else if (match_string(line, "float", &line)) + { + float f; + + if (sscanf(line, "%f", &f) < 1) + goto err; + if (offset + 1 > context->uniform_count) + { + context->uniform_count = offset + 1; + context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); + } + memcpy(context->uniforms + offset, &f, sizeof(f)); + } + else if (match_string(line, "int", &line)) + { + int i; + + if (sscanf(line, "%i", &i) < 1) + goto err; + if (offset + 1 > context->uniform_count) + { + context->uniform_count = offset + 1; + context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); + } + memcpy(context->uniforms + offset, &i, sizeof(i)); + } else if (match_string(line, "uint", &line)) { unsigned int u; - sscanf(line, "%u", &u); + if (sscanf(line, "%u", &u) < 1) + goto err; if (offset + 1 > context->uniform_count) { context->uniform_count = offset + 1; -- 2.33.0

4 27

[PATCH] secur32: Fix allocation size (Coverity).
by Nikolay Sivov 15 Sep '21

15 Sep '21

Fixes copy-paste issue from fbd30fff038645bf2f7967ff63d4178309a14138. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/secur32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 08bac24686a..a20469a3ff3 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -365,7 +365,7 @@ SecureProvider *SECUR32_addProvider(const SecurityFunctionTableA *fnTableA, if (!providerTable) { - if (!(providerTable = malloc(sizeof(*ret)))) + if (!(providerTable = malloc(sizeof(*providerTable)))) { LeaveCriticalSection(&cs); return NULL; -- 2.33.0

1 0

[PATCH vkd3d v3 1/2] vkd3d-shader: Don't resize the buffer when there is enough free space.
by Matteo Bruni 15 Sep '21

15 Sep '21

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Handle rc < 0 case, use vkd3d_array_reserve(). v3: Fully make use of vkd3d_array_reserve() (thanks Henri). libs/vkd3d-shader/vkd3d_shader_main.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 5d7cdf01..e7afbdfc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -41,20 +41,14 @@ static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) { - unsigned int new_buffer_size = buffer->buffer_size * 2; - char *new_buffer; + unsigned int new_buffer_size = rc >= 0 ? buffer->content_size + rc + 1 : max(buffer->buffer_size * 2, 32); - new_buffer_size = max(new_buffer_size, 32); - while (rc > 0 && (unsigned int)rc >= new_buffer_size - buffer->content_size) - new_buffer_size *= 2; - if (!(new_buffer = vkd3d_realloc(buffer->buffer, new_buffer_size))) + if (!vkd3d_array_reserve((void **)&buffer->buffer, &buffer->buffer_size, new_buffer_size, 1)) { ERR("Failed to grow buffer.\n"); buffer->buffer[buffer->content_size] = '\0'; return false; } - buffer->buffer = new_buffer; - buffer->buffer_size = new_buffer_size; return true; } -- 2.26.3

2 2

[PATCH] inetcpl: Fix incorrect expression (Coverity).
by Nikolay Sivov 15 Sep '21

15 Sep '21

This is a regression from a65616cf1fcf404090199b82e6d01e0f08e0d4ea, search-replace gone wrong because global literal constant had the same name as the helper argument. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/inetcpl.cpl/connections.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/inetcpl.cpl/connections.c b/dlls/inetcpl.cpl/connections.c index 4327c33b420..d33c0bf3a19 100644 --- a/dlls/inetcpl.cpl/connections.c +++ b/dlls/inetcpl.cpl/connections.c @@ -62,7 +62,7 @@ static DWORD create_connection_settings(BOOL manual_proxy, const WCHAR *proxy_se DWORD pac_url_len; size += sizeof(DWORD); - if(L"ProxyServer") + if(proxy_server) { proxy_server_len = WideCharToMultiByte(CP_UTF8, 0, proxy_server, -1, NULL, 0, NULL, NULL); -- 2.33.0

1 0

[PATCH] tools: Update to Unicode 14.0.0.
by Nikolay Sivov 15 Sep '21

15 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/bracket.c | 4 +- dlls/dwrite/direction.c | 380 ++++++----- dlls/dwrite/linebreak.c | 983 ++++++++++++++------------- dlls/dwrite/mirror.c | 38 +- dlls/dwrite/scripts.c | 898 ++++++++++++------------ dlls/dwrite/scripts.h | 2 +- dlls/dwrite/shapers/arabic_table.c | 282 ++++---- dlls/gdi32/uniscribe/bracket.c | 4 +- dlls/gdi32/uniscribe/direction.c | 380 ++++++----- dlls/gdi32/uniscribe/indicsyllable.c | 232 +++---- dlls/gdi32/uniscribe/linebreak.c | 983 ++++++++++++++------------- dlls/gdi32/uniscribe/mirror.c | 38 +- dlls/gdi32/uniscribe/shaping.c | 282 ++++---- dlls/gdi32/vertical.c | 2 +- dlls/kernelbase/digitmap.c | 2 +- dlls/wineps.drv/vertical.c | 2 +- nls/l_intl.nls | Bin 5512 -> 5546 bytes nls/normidna.nls | Bin 82658 -> 83820 bytes nls/normnfc.nls | Bin 58166 -> 58422 bytes nls/normnfd.nls | Bin 51466 -> 51722 bytes nls/normnfkc.nls | Bin 79762 -> 80626 bytes nls/normnfkd.nls | Bin 73382 -> 74246 bytes nls/sortdefault.nls | Bin 3354708 -> 3354836 bytes tools/make_unicode | 2 +- 24 files changed, 2266 insertions(+), 2248 deletions(-) diff --git a/dlls/dwrite/bracket.c b/dlls/dwrite/bracket.c index a4ca55bafba..9170a7ceeb9 100644 --- a/dlls/dwrite/bracket.c +++ b/dlls/dwrite/bracket.c @@ -1,5 +1,5 @@ /* Unicode Bidirectional Bracket table */ -/* generated from https://www.unicode.org/Public/13.0.0/ucd/UCD.zip:BidiBrackets.txt */ +/* generated from https://www.unicode.org/Public/14.0.0/ucd/UCD.zip:BidiBrackets.txt */ /* DO NOT EDIT!! */ #include "windef.h" @@ -52,7 +52,7 @@ const unsigned short DECLSPEC_HIDDEN bidi_bracket_table[572] = 0x01ca, 0x01d4, 0x019c, 0x019c, 0x019c, 0x019c, 0x01a7, 0x019c, 0x01de, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x01e1, 0x01f1, 0x019c, 0x019c, 0x019c, 0x01be, 0x019c, - 0x01a0, 0x019c, 0x019c, 0x01d0, 0x019c, 0x019c, 0x019c, 0x019c, + 0x01a0, 0x019c, 0x019c, 0x01d0, 0x019c, 0x019c, 0x01cd, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x01ca, 0x0201, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, diff --git a/dlls/dwrite/direction.c b/dlls/dwrite/direction.c index 4c5c400762e..d7001c4997c 100644 --- a/dlls/dwrite/direction.c +++ b/dlls/dwrite/direction.c @@ -3,7 +3,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN bidi_direction_table[3313] = +const unsigned short DECLSPEC_HIDDEN bidi_direction_table[3351] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0115, 0x0125, 0x0135, 0x013e, 0x014e, 0x015e, @@ -49,50 +49,50 @@ const unsigned short DECLSPEC_HIDDEN bidi_direction_table[3313] = 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0559, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0563, 0x0573, 0x052d, 0x0575, 0x0583, 0x0593, 0x0598, 0x05a7, 0x05b7, 0x05c7, - 0x05d5, 0x05d5, 0x05da, 0x052d, 0x05ea, 0x05fa, 0x05d5, 0x05d5, - 0x05d5, 0x05d5, 0x05d5, 0x0604, 0x0613, 0x0623, 0x062d, 0x05f9, - 0x05d5, 0x052d, 0x063d, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, - 0x064a, 0x0659, 0x0593, 0x0593, 0x0669, 0x0675, 0x0593, 0x0683, - 0x068f, 0x0594, 0x0593, 0x069f, 0x06af, 0x04df, 0x04df, 0x04df, - 0x05d5, 0x06bf, 0x06c7, 0x06d4, 0x06e2, 0x052d, 0x06ef, 0x04df, - 0x04df, 0x06f5, 0x0704, 0x055b, 0x0712, 0x04df, 0x0721, 0x04df, - 0x04df, 0x0716, 0x0730, 0x04df, 0x0712, 0x073e, 0x074d, 0x04df, - 0x04df, 0x0716, 0x075c, 0x0721, 0x04df, 0x0768, 0x074d, 0x04df, - 0x04df, 0x0716, 0x0777, 0x04df, 0x0712, 0x0786, 0x0721, 0x04df, - 0x04df, 0x0796, 0x0730, 0x07a6, 0x0712, 0x04df, 0x0720, 0x04df, - 0x04df, 0x04df, 0x0715, 0x04df, 0x04df, 0x07b3, 0x07c3, 0x04df, - 0x04df, 0x0723, 0x07d3, 0x07a6, 0x0712, 0x07e1, 0x0721, 0x04df, - 0x04df, 0x0716, 0x0751, 0x04df, 0x0712, 0x04df, 0x07f1, 0x04df, - 0x04df, 0x0752, 0x0730, 0x04df, 0x0712, 0x04df, 0x0721, 0x04df, - 0x04df, 0x04df, 0x0718, 0x07ff, 0x04df, 0x04df, 0x04df, 0x080e, - 0x081e, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x082d, - 0x0788, 0x04df, 0x04df, 0x04df, 0x083a, 0x04df, 0x0845, 0x04df, - 0x04df, 0x04df, 0x0854, 0x085e, 0x086b, 0x052d, 0x0530, 0x071c, - 0x04df, 0x04df, 0x04df, 0x0724, 0x087a, 0x04df, 0x0755, 0x0888, - 0x0897, 0x08a5, 0x08b3, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04df, 0x0724, 0x04df, 0x04df, 0x04df, 0x08c3, 0x04df, 0x04df, + 0x05d2, 0x05d2, 0x05d7, 0x052d, 0x05e7, 0x05d1, 0x05d2, 0x05d2, + 0x05d2, 0x05d2, 0x05d2, 0x05f4, 0x0603, 0x0613, 0x061d, 0x062c, + 0x05d2, 0x052d, 0x063c, 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x05d2, + 0x0636, 0x064c, 0x0593, 0x0593, 0x065c, 0x0668, 0x0593, 0x0676, + 0x0682, 0x0594, 0x0593, 0x0692, 0x06a2, 0x05d2, 0x06b2, 0x06c2, + 0x05d2, 0x05d2, 0x0632, 0x052d, 0x06d0, 0x052d, 0x06dd, 0x04df, + 0x04df, 0x06e3, 0x06f2, 0x055b, 0x0700, 0x04df, 0x070f, 0x04df, + 0x04df, 0x0704, 0x071e, 0x04df, 0x0700, 0x072c, 0x073b, 0x04df, + 0x04df, 0x0704, 0x074a, 0x070f, 0x04df, 0x0756, 0x073b, 0x04df, + 0x04df, 0x0704, 0x0765, 0x04df, 0x0700, 0x0774, 0x070f, 0x04df, + 0x04df, 0x0784, 0x071e, 0x0794, 0x0700, 0x04df, 0x070e, 0x04df, + 0x04df, 0x04df, 0x0703, 0x04df, 0x04df, 0x07a1, 0x07b1, 0x04df, + 0x04df, 0x07b6, 0x07c5, 0x0794, 0x0700, 0x07d3, 0x070f, 0x04df, + 0x04df, 0x0704, 0x073f, 0x04df, 0x0700, 0x04df, 0x07e3, 0x04df, + 0x04df, 0x0740, 0x071e, 0x04df, 0x0700, 0x04df, 0x070f, 0x04df, + 0x04df, 0x04df, 0x0706, 0x07f1, 0x04df, 0x04df, 0x04df, 0x0800, + 0x0810, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x081f, + 0x0776, 0x04df, 0x04df, 0x04df, 0x082c, 0x04df, 0x0837, 0x04df, + 0x04df, 0x04df, 0x0846, 0x0850, 0x085d, 0x052d, 0x0530, 0x070a, + 0x04df, 0x04df, 0x04df, 0x0712, 0x086c, 0x04df, 0x0743, 0x087a, + 0x0889, 0x0897, 0x08a5, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, + 0x04df, 0x0712, 0x04df, 0x04df, 0x04df, 0x08b5, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0485, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x08d3, 0x08d8, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x08e6, 0x04df, 0x08e6, 0x04df, - 0x0712, 0x04df, 0x0712, 0x04df, 0x04df, 0x04df, 0x08f2, 0x0809, - 0x08fc, 0x04df, 0x08c3, 0x090c, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x07a6, 0x04df, 0x0719, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x091c, 0x092a, 0x093a, 0x04df, 0x04df, + 0x04df, 0x04df, 0x04df, 0x04df, 0x08c5, 0x08ca, 0x04df, 0x04df, + 0x04df, 0x04df, 0x04df, 0x04df, 0x08d8, 0x04df, 0x0700, 0x04df, + 0x0700, 0x04df, 0x0700, 0x04df, 0x04df, 0x04df, 0x08e4, 0x07fb, + 0x08ee, 0x04df, 0x08b5, 0x08fe, 0x04df, 0x04df, 0x04df, 0x04df, + 0x04df, 0x04df, 0x04df, 0x0794, 0x04df, 0x0707, 0x04df, 0x04df, + 0x04df, 0x04df, 0x04df, 0x090d, 0x091b, 0x092b, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0487, 0x051d, - 0x051d, 0x04df, 0x0943, 0x04df, 0x04df, 0x04df, 0x094f, 0x095d, - 0x096a, 0x04df, 0x04df, 0x04df, 0x052d, 0x0888, 0x04df, 0x04df, - 0x04df, 0x06ee, 0x04df, 0x04df, 0x097a, 0x0720, 0x04df, 0x0987, - 0x06ee, 0x07f1, 0x04df, 0x0997, 0x04df, 0x04df, 0x04df, 0x09a5, - 0x07f1, 0x04df, 0x04df, 0x0725, 0x09b4, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x09c4, 0x09d3, - 0x09dc, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, + 0x051d, 0x04df, 0x0934, 0x04df, 0x04df, 0x04df, 0x0940, 0x094e, + 0x095b, 0x04df, 0x04df, 0x04df, 0x052d, 0x052e, 0x04df, 0x04df, + 0x04df, 0x06dc, 0x04df, 0x04df, 0x096b, 0x070e, 0x04df, 0x0978, + 0x06dc, 0x07e3, 0x04df, 0x0988, 0x04df, 0x04df, 0x04df, 0x0996, + 0x07e3, 0x04df, 0x04df, 0x0713, 0x09a5, 0x04df, 0x04df, 0x04df, + 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x09b5, 0x09c4, + 0x09cd, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x052d, 0x052d, 0x052d, - 0x09ca, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x09e6, 0x0498, 0x0488, 0x0488, - 0x08d6, 0x09f6, 0x051d, 0x0a06, 0x0a16, 0x0a22, 0x0a27, 0x0a37, - 0x0a47, 0x0a57, 0x04df, 0x0a67, 0x0a67, 0x04df, 0x052d, 0x052d, - 0x0888, 0x0a77, 0x0a83, 0x0a91, 0x0aa0, 0x0ab0, 0x051d, 0x04df, + 0x052d, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, + 0x04df, 0x04df, 0x04df, 0x04df, 0x09d7, 0x0498, 0x0488, 0x0488, + 0x08c8, 0x09e7, 0x051d, 0x09f7, 0x0a07, 0x0a13, 0x0a18, 0x0a28, + 0x0a38, 0x0a48, 0x04df, 0x0a58, 0x0a58, 0x0a67, 0x052d, 0x052d, + 0x087a, 0x0a77, 0x0a83, 0x0a91, 0x0aa0, 0x0ab0, 0x051d, 0x04df, 0x04df, 0x0abe, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x0ace, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, @@ -106,16 +106,16 @@ const unsigned short DECLSPEC_HIDDEN bidi_direction_table[3313] = 0x051d, 0x051d, 0x051d, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0b1d, 0x0b2c, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x0889, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, + 0x04df, 0x04df, 0x087b, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x052d, 0x052d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, - 0x0483, 0x04df, 0x04df, 0x051d, 0x0b35, 0x051d, 0x051d, 0x051d, + 0x0500, 0x04df, 0x04df, 0x051d, 0x0b35, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x0482, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x0ad8, 0x04df, 0x0502, 0x0b45, 0x051d, 0x0b54, 0x0b64, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0b74, 0x0485, 0x04df, 0x04df, 0x04df, 0x04df, 0x04e4, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x051d, - 0x051d, 0x0482, 0x04df, 0x08d6, 0x04df, 0x04df, 0x04df, 0x051d, + 0x051d, 0x0482, 0x04df, 0x08c8, 0x04df, 0x04df, 0x04df, 0x051d, 0x04df, 0x0b81, 0x04df, 0x04df, 0x04df, 0x051c, 0x0489, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0b90, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0487, 0x04df, 0x0486, 0x04df, @@ -123,27 +123,27 @@ const unsigned short DECLSPEC_HIDDEN bidi_direction_table[3313] = 0x04df, 0x04df, 0x04df, 0x051d, 0x051d, 0x051d, 0x051d, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x051d, 0x051d, 0x051d, 0x0ad7, 0x04df, 0x04df, 0x04df, 0x0488, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0889, 0x0ba0, 0x04df, - 0x0723, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x07f1, 0x051d, + 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x087b, 0x0ba0, 0x04df, + 0x0711, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x07e3, 0x051d, 0x051d, 0x0484, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04e7, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0bb0, 0x04df, 0x0bbc, 0x0bc9, 0x04df, 0x04df, 0x04df, 0x0ab6, 0x04df, - 0x04df, 0x04df, 0x04df, 0x0bd5, 0x04df, 0x052d, 0x06f0, 0x04df, - 0x04df, 0x0bdf, 0x04df, 0x06d0, 0x07f1, 0x04df, 0x04df, 0x06ef, - 0x04df, 0x04df, 0x0bed, 0x04df, 0x04df, 0x071d, 0x04df, 0x04df, - 0x0bfb, 0x0882, 0x0c0a, 0x04df, 0x04df, 0x0716, 0x04df, 0x04df, - 0x04df, 0x0c1a, 0x0721, 0x04df, 0x0751, 0x071c, 0x04df, 0x04df, + 0x04df, 0x04df, 0x04df, 0x0bd5, 0x04df, 0x052d, 0x06de, 0x04df, + 0x04df, 0x0bdf, 0x04df, 0x0bed, 0x07e3, 0x04df, 0x04df, 0x06dd, + 0x04df, 0x04df, 0x0bfd, 0x04df, 0x04df, 0x070b, 0x04df, 0x04df, + 0x0c0b, 0x0874, 0x0c1a, 0x04df, 0x04df, 0x0704, 0x04df, 0x04df, + 0x04df, 0x0c2a, 0x070f, 0x04df, 0x073f, 0x070a, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0aa0, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x0c2a, 0x04df, 0x0c38, 0x0c47, - 0x0c51, 0x0c61, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, - 0x05d5, 0x0c71, 0x0c7e, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, - 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, - 0x05d5, 0x05d5, 0x05d5, 0x0c81, 0x04df, 0x05d5, 0x05d5, 0x05d5, - 0x05d5, 0x0c7f, 0x05d5, 0x05d5, 0x06c7, 0x04df, 0x04df, 0x0c91, - 0x052d, 0x08c3, 0x052d, 0x051d, 0x051d, 0x0ca1, 0x0cb1, 0x06bf, - 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x0cc1, - 0x0cd1, 0x0476, 0x0485, 0x048a, 0x0485, 0x048a, 0x0ad8, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0ce1, 0x048c, + 0x04df, 0x04df, 0x04df, 0x04df, 0x0c3a, 0x04df, 0x0c48, 0x0c57, + 0x0c61, 0x0c71, 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x05d2, + 0x05d2, 0x0c81, 0x06af, 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x05d2, + 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x05d2, + 0x05d2, 0x05d2, 0x05d2, 0x0c91, 0x051d, 0x05d2, 0x05d2, 0x05d2, + 0x05d2, 0x06b0, 0x05d2, 0x05d2, 0x0ca1, 0x04df, 0x04df, 0x0cb1, + 0x052d, 0x08b5, 0x052d, 0x051d, 0x051d, 0x0cc1, 0x0cd1, 0x0ce1, + 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x0ce7, + 0x0cf7, 0x0476, 0x0485, 0x048a, 0x0485, 0x048a, 0x0ad8, 0x04df, + 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0d07, 0x048c, /* values */ 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000b, 0x000d, 0x000b, 0x000c, 0x000d, 0x000a, 0x000a, @@ -194,155 +194,155 @@ const unsigned short DECLSPEC_HIDDEN bidi_direction_table[3313] = 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0000, 0x0000, 0x0005, 0x0009, 0x0009, 0x0005, 0x0007, 0x0005, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0005, 0x0005, 0x0001, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, - 0x0003, 0x0003, 0x0003, 0x0003, 0x0009, 0x0003, 0x0003, 0x0005, - 0x0005, 0x0005, 0x0006, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0006, 0x0006, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0003, + 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0009, 0x0003, 0x0003, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0003, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0005, 0x0005, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0005, 0x0005, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0001, 0x0005, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0001, 0x0001, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0005, 0x0005, 0x0005, 0x0001, 0x0005, 0x0006, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, + 0x0001, 0x0005, 0x0005, 0x0005, 0x0006, 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 0x0002, 0x0002, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0002, 0x0002, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0002, 0x0001, 0x0001, 0x0006, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0002, 0x0002, 0x0000, 0x0000, 0x0000, 0x0000, 0x0002, - 0x0001, 0x0001, 0x0006, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, - 0x0002, 0x0006, 0x0006, 0x0006, 0x0006, 0x0002, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0002, 0x0006, 0x0006, 0x0006, 0x0002, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0002, - 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, - 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0002, 0x0001, 0x0005, + 0x0002, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0002, 0x0006, + 0x0006, 0x0006, 0x0002, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0001, 0x0001, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0002, 0x0001, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0005, 0x0001, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0003, 0x0006, 0x0006, 0x0006, + 0x0005, 0x0001, 0x0003, 0x0003, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0003, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, - 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, - 0x0009, 0x0009, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0009, 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0006, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, - 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0009, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, + 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0009, 0x0009, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0009, + 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0009, 0x0000, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0009, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0006, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0009, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, - 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0009, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0001, - 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0001, 0x0006, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, - 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0009, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, - 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, + 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0001, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0001, + 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0006, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x000c, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, - 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, - 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0009, - 0x0001, 0x0006, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, - 0x0006, 0x0006, 0x000a, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, - 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, - 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x000c, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, - 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, - 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0006, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0009, 0x0001, 0x0006, 0x0001, 0x0001, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0006, 0x0006, 0x0006, 0x000a, 0x0006, 0x0006, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, + 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, + 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, + 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, + 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0000, 0x000c, 0x000c, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0000, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, - 0x000c, 0x000a, 0x000a, 0x000a, 0x0001, 0x0002, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000c, 0x000d, - 0x0011, 0x000f, 0x0012, 0x0010, 0x000e, 0x0007, 0x0009, 0x0009, - 0x0009, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0007, 0x0000, + 0x000c, 0x000c, 0x000a, 0x000a, 0x000a, 0x0001, 0x0002, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000c, + 0x000d, 0x0011, 0x000f, 0x0012, 0x0010, 0x000e, 0x0007, 0x0009, + 0x0009, 0x0009, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0007, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000c, 0x000a, - 0x000a, 0x000a, 0x000a, 0x000a, 0x0001, 0x0013, 0x0014, 0x0015, - 0x0016, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0004, - 0x0001, 0x0001, 0x0001, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0008, 0x0008, 0x0000, 0x0000, 0x0000, 0x0001, 0x0004, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000c, + 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0001, 0x0013, 0x0014, + 0x0015, 0x0016, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, + 0x0004, 0x0001, 0x0001, 0x0001, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0008, 0x0008, 0x0000, 0x0000, 0x0000, 0x0001, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0008, 0x0008, 0x0000, 0x0000, 0x0000, 0x0001, 0x0009, + 0x0004, 0x0004, 0x0008, 0x0008, 0x0000, 0x0000, 0x0000, 0x0001, + 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, - 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0000, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, @@ -390,6 +390,8 @@ const unsigned short DECLSPEC_HIDDEN bidi_direction_table[3313] = 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, @@ -406,21 +408,23 @@ const unsigned short DECLSPEC_HIDDEN bidi_direction_table[3313] = 0x0001, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0001, 0x0002, 0x0001, 0x0002, 0x0002, 0x0001, 0x0002, 0x0002, 0x0001, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, - 0x0002, 0x0005, 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0002, 0x0005, 0x0005, 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0000, 0x0000, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0000, 0x0001, - 0x0001, 0x0007, 0x0000, 0x0007, 0x0001, 0x0000, 0x0007, 0x0000, + 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0000, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0000, 0x0000, + 0x0000, 0x0007, 0x0000, 0x0007, 0x0001, 0x0000, 0x0007, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0009, 0x0000, 0x0000, 0x0008, 0x0008, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0009, 0x0009, 0x0000, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0001, 0x0001, - 0x000a, 0x0001, 0x0000, 0x0000, 0x0009, 0x0009, 0x0009, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0008, 0x0007, 0x0008, 0x0007, - 0x0007, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, 0x0009, 0x0009, - 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0001 + 0x0001, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0001, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0001, 0x0001, 0x000a, 0x0001, + 0x0000, 0x0000, 0x0009, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0008, 0x0007, 0x0008, 0x0007, 0x0007, 0x0009, + 0x0009, 0x0000, 0x0000, 0x0000, 0x0009, 0x0009, 0x0001, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001 }; diff --git a/dlls/dwrite/linebreak.c b/dlls/dwrite/linebreak.c index be971c65217..ad9ec19438c 100644 --- a/dlls/dwrite/linebreak.c +++ b/dlls/dwrite/linebreak.c @@ -1,10 +1,10 @@ /* Unicode Line Break Properties */ -/* generated from https://www.unicode.org/Public/13.0.0/ucd/UCD.zip:LineBreak.txt */ +/* generated from https://www.unicode.org/Public/14.0.0/ucd/UCD.zip:LineBreak.txt */ /* DO NOT EDIT!! */ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[5672] = +const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[5710] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0114, 0x0124, 0x012f, 0x013c, 0x014c, 0x015c, @@ -12,156 +12,156 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[5672] = 0x01ec, 0x01fc, 0x020c, 0x021b, 0x022b, 0x0110, 0x0233, 0x0243, 0x0253, 0x0263, 0x0272, 0x0282, 0x0292, 0x02a2, 0x0110, 0x02b2, 0x02c2, 0x02d2, 0x02e2, 0x02f2, 0x0302, 0x0312, 0x0322, 0x0332, - 0x0110, 0x0341, 0x0110, 0x0351, 0x035f, 0x036f, 0x037f, 0x038f, - 0x039f, 0x03af, 0x03bf, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c8, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03d8, 0x03c4, 0x03c4, 0x03c4, 0x03e0, 0x0110, 0x03f0, 0x0400, - 0x0410, 0x0420, 0x0430, 0x0440, 0x0450, 0x0452, 0x0454, 0x0456, - 0x0451, 0x0453, 0x0455, 0x0450, 0x0452, 0x0454, 0x0456, 0x0451, - 0x0453, 0x0455, 0x0450, 0x0452, 0x0454, 0x0456, 0x0451, 0x0453, - 0x0455, 0x0450, 0x0452, 0x0454, 0x0456, 0x0451, 0x0453, 0x0455, - 0x0450, 0x0452, 0x0454, 0x0456, 0x0451, 0x0453, 0x0455, 0x0450, - 0x0452, 0x0454, 0x0456, 0x0451, 0x0453, 0x0455, 0x0450, 0x0460, - 0x0470, 0x0470, 0x0470, 0x0470, 0x0470, 0x0470, 0x0470, 0x0470, - 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, - 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, - 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, - 0x0480, 0x03c4, 0x03c4, 0x0490, 0x0110, 0x049e, 0x04ae, 0x04be, + 0x0110, 0x0341, 0x0110, 0x0351, 0x035b, 0x036b, 0x037b, 0x038b, + 0x039b, 0x03ab, 0x03bb, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c4, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03d4, 0x03c0, 0x03c0, 0x03c0, 0x03dc, 0x0110, 0x03ec, 0x03fc, + 0x040c, 0x041c, 0x042c, 0x043c, 0x044c, 0x044e, 0x0450, 0x0452, + 0x044d, 0x044f, 0x0451, 0x044c, 0x044e, 0x0450, 0x0452, 0x044d, + 0x044f, 0x0451, 0x044c, 0x044e, 0x0450, 0x0452, 0x044d, 0x044f, + 0x0451, 0x044c, 0x044e, 0x0450, 0x0452, 0x044d, 0x044f, 0x0451, + 0x044c, 0x044e, 0x0450, 0x0452, 0x044d, 0x044f, 0x0451, 0x044c, + 0x044e, 0x0450, 0x0452, 0x044d, 0x044f, 0x0451, 0x044c, 0x045c, + 0x046c, 0x046c, 0x046c, 0x046c, 0x046c, 0x046c, 0x046c, 0x046c, + 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, + 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, + 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, + 0x047c, 0x03c0, 0x03c0, 0x048c, 0x0110, 0x049a, 0x04aa, 0x04ba, /* level 2 offsets */ - 0x04ce, 0x04dc, 0x04ec, 0x04fc, 0x050c, 0x0511, 0x050c, 0x051f, - 0x052e, 0x04dc, 0x053e, 0x054e, 0x050c, 0x055e, 0x050c, 0x055e, - 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, - 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, - 0x0567, 0x0574, 0x050c, 0x050c, 0x04dc, 0x04dc, 0x04dc, 0x04dc, - 0x0584, 0x0587, 0x0594, 0x05a4, 0x05b4, 0x050c, 0x05c2, 0x050c, - 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x05cf, - 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x05df, - 0x050c, 0x05e8, 0x050c, 0x050c, 0x05f1, 0x0601, 0x04dc, 0x0603, - 0x0613, 0x0623, 0x0628, 0x0637, 0x0647, 0x0657, 0x050c, 0x050c, - 0x05c7, 0x04dc, 0x0667, 0x0677, 0x050c, 0x050c, 0x050c, 0x050c, - 0x050c, 0x0683, 0x068b, 0x069b, 0x06a5, 0x0676, 0x050c, 0x04dc, - 0x06b5, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x06c2, 0x06d1, - 0x069b, 0x050c, 0x05c7, 0x06e1, 0x050c, 0x06f1, 0x06fd, 0x05e0, - 0x050c, 0x070d, 0x071d, 0x0728, 0x0728, 0x0728, 0x050c, 0x05da, - 0x0720, 0x0735, 0x0743, 0x04dc, 0x074f, 0x050c, 0x050c, 0x0755, - 0x04dc, 0x0762, 0x0770, 0x050c, 0x0780, 0x078c, 0x0793, 0x07a2, - 0x07b0, 0x07bf, 0x07ce, 0x07de, 0x07ed, 0x078c, 0x0793, 0x07fc, - 0x080a, 0x0819, 0x0828, 0x0838, 0x0847, 0x05c2, 0x0793, 0x0854, - 0x0862, 0x0727, 0x07ce, 0x0872, 0x0882, 0x078c, 0x0793, 0x0854, - 0x0892, 0x08a0, 0x07ce, 0x0720, 0x08b0, 0x08bf, 0x08cf, 0x08dd, - 0x08eb, 0x08fb, 0x0828, 0x090b, 0x091b, 0x05de, 0x0793, 0x0929, - 0x0937, 0x0945, 0x07ce, 0x0950, 0x095f, 0x05de, 0x0793, 0x0968, - 0x0937, 0x0978, 0x07ce, 0x0987, 0x0997, 0x05de, 0x050c, 0x09a5, - 0x09b3, 0x09c3, 0x07ce, 0x09cb, 0x09db, 0x09e4, 0x050c, 0x09f2, - 0x0a02, 0x0a11, 0x0828, 0x0a21, 0x0a30, 0x0a31, 0x0a31, 0x0a36, - 0x0a46, 0x0a56, 0x0728, 0x0728, 0x0a65, 0x0a31, 0x0a71, 0x0a33, - 0x0a7c, 0x0a8c, 0x0728, 0x0728, 0x0a9c, 0x0aaa, 0x069b, 0x0ab6, - 0x0920, 0x050c, 0x0ac6, 0x0ad5, 0x0adf, 0x0aec, 0x04dc, 0x0af5, - 0x0b05, 0x0b15, 0x0728, 0x0728, 0x0a31, 0x0a31, 0x0a31, 0x0a31, - 0x0b25, 0x0a31, 0x0a31, 0x0a31, 0x0a31, 0x0b35, 0x050c, 0x050c, - 0x0b45, 0x050c, 0x050c, 0x050c, 0x0b55, 0x0b55, 0x0b55, 0x0b55, - 0x0b55, 0x0b55, 0x0b65, 0x0b65, 0x0b65, 0x0b65, 0x0b6d, 0x0b75, - 0x0b75, 0x0b75, 0x0b75, 0x0b75, 0x050c, 0x050c, 0x050c, 0x050c, - 0x0b85, 0x0b95, 0x050c, 0x050c, 0x0b85, 0x050c, 0x050c, 0x0b8d, - 0x0b9d, 0x0921, 0x050c, 0x050c, 0x0b9d, 0x050c, 0x050c, 0x050c, - 0x0ba5, 0x0bb5, 0x0ac6, 0x050c, 0x071e, 0x050c, 0x050c, 0x050c, - 0x050c, 0x050c, 0x0bbf, 0x0bcf, 0x050c, 0x050c, 0x050c, 0x050c, - 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, - 0x050c, 0x050c, 0x050c, 0x0bcf, 0x0bd4, 0x050c, 0x050c, 0x050c, - 0x050c, 0x0be4, 0x071f, 0x078f, 0x0bf2, 0x050c, 0x0c02, 0x050c, - 0x0c12, 0x078f, 0x0c22, 0x0a31, 0x0a31, 0x0a31, 0x0a31, 0x0a31, - 0x0c32, 0x0c42, 0x071e, 0x0c52, 0x0c42, 0x050c, 0x050c, 0x050c, - 0x050c, 0x050c, 0x071f, 0x0c62, 0x050c, 0x0c69, 0x050c, 0x050c, - 0x050c, 0x050c, 0x0722, 0x050c, 0x05e0, 0x0c79, 0x0c79, 0x0c89, - 0x0a31, 0x0a33, 0x0c99, 0x0a31, 0x0a31, 0x0a35, 0x0a31, 0x0ca9, - 0x0cb9, 0x050c, 0x050c, 0x0cc9, 0x0a31, 0x0a31, 0x0a31, 0x0a32, - 0x0a31, 0x0cd9, 0x0c42, 0x0c42, 0x0a33, 0x04dc, 0x0ce8, 0x0728, - 0x0728, 0x0728, 0x074e, 0x050c, 0x050c, 0x0cf8, 0x0d03, 0x0d13, - 0x0d22, 0x0d2e, 0x0d3e, 0x050c, 0x0745, 0x069b, 0x050c, 0x050c, - 0x06c2, 0x0d4e, 0x050c, 0x050c, 0x0cf8, 0x0d5e, 0x0d6e, 0x069b, - 0x050c, 0x0d7b, 0x071f, 0x050c, 0x050c, 0x05e4, 0x0720, 0x0742, - 0x0d8b, 0x0d94, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, - 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x04dc, 0x04dc, - 0x04dc, 0x0da4, 0x050c, 0x0bbf, 0x050c, 0x050c, 0x0bbf, 0x0db4, - 0x050c, 0x05e1, 0x050c, 0x050c, 0x050c, 0x05da, 0x05da, 0x0dc3, - 0x050c, 0x0dd3, 0x0de3, 0x0df3, 0x0e03, 0x0e13, 0x0e21, 0x0e2b, - 0x0e3b, 0x0e4b, 0x0e5b, 0x0ac6, 0x0e6b, 0x0e75, 0x0e84, 0x04dc, - 0x04dc, 0x0ce8, 0x0e94, 0x0ea1, 0x0eb0, 0x050c, 0x050c, 0x0ebc, - 0x0ecc, 0x0ece, 0x0ed8, 0x0ece, 0x050c, 0x050c, 0x050c, 0x0ee8, - 0x050c, 0x050c, 0x0ef8, 0x0f06, 0x0f15, 0x0f24, 0x0f32, 0x0f3c, - 0x0f4c, 0x050c, 0x0f54, 0x0f35, 0x0f5f, 0x0f65, 0x050c, 0x050c, - 0x0f75, 0x050c, 0x0f85, 0x0f93, 0x0f9f, 0x050c, 0x050c, 0x050c, - 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, - 0x050c, 0x0faf, 0x050c, 0x050c, 0x0721, 0x0728, 0x071d, 0x0728, - 0x0fbf, 0x0fbf, 0x0fbf, 0x0fbf, 0x0fbf, 0x0fbf, 0x0fbf, 0x0fbf, - 0x0fbf, 0x0fc0, 0x0fbf, 0x0fbf, 0x0fbf, 0x0fbf, 0x0ecc, 0x0fbf, - 0x0fbf, 0x0fca, 0x0fbf, 0x0fd8, 0x0fe8, 0x0ff6, 0x1002, 0x1010, - 0x101e, 0x050c, 0x102e, 0x103e, 0x050c, 0x104e, 0x105e, 0x050c, - 0x106e, 0x107e, 0x050c, 0x1012, 0x050c, 0x1080, 0x108d, 0x109c, - 0x10ab, 0x10ba, 0x10c7, 0x050c, 0x050c, 0x050c, 0x050c, 0x10d5, - 0x10e4, 0x10ee, 0x0fbf, 0x10fa, 0x050c, 0x050c, 0x1105, 0x050c, - 0x110f, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, - 0x050c, 0x1112, 0x111a, 0x050c, 0x050c, 0x050c, 0x0f85, 0x050c, - 0x10fe, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x1125, 0x050c, - 0x0789, 0x050c, 0x05d9, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, - 0x050c, 0x05e0, 0x050c, 0x050c, 0x05e0, 0x050c, 0x050c, 0x050c, - 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x112f, 0x113e, 0x050c, - 0x050c, 0x0b45, 0x050c, 0x050c, 0x050c, 0x114e, 0x115e, 0x050c, - 0x0721, 0x116e, 0x116e, 0x116e, 0x116e, 0x04dc, 0x04dc, 0x117e, - 0x118c, 0x119c, 0x11ac, 0x11bc, 0x0725, 0x0728, 0x0728, 0x11cc, - 0x11d2, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11de, 0x11cc, - 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, - 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11ee, 0x0728, 0x11fe, 0x120e, - 0x121c, 0x122c, 0x123c, 0x124c, 0x11cc, 0x1259, 0x11cc, 0x1266, - 0x1275, 0x1285, 0x11cc, 0x1259, 0x11cc, 0x1266, 0x1290, 0x11f9, - 0x11cc, 0x11cc, 0x12a0, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cd, - 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11de, 0x12b0, 0x11cc, - 0x11cd, 0x11cc, 0x11cc, 0x12c0, 0x11cc, 0x11cc, 0x11cc, 0x11cc, - 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, - 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x050c, 0x050c, 0x050c, 0x050c, - 0x11cc, 0x12d0, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, - 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, - 0x12d6, 0x11cc, 0x11cc, 0x11cc, 0x12dc, 0x050c, 0x050c, 0x0d7b, - 0x12ec, 0x050c, 0x12fc, 0x0728, 0x050c, 0x050c, 0x112f, 0x130c, - 0x050c, 0x1130, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x131c, - 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, - 0x050c, 0x050c, 0x050c, 0x050c, 0x132a, 0x0728, 0x0728, 0x12e7, - 0x133a, 0x050c, 0x1347, 0x1357, 0x050c, 0x050c, 0x050c, 0x1367, - 0x1377, 0x050c, 0x050c, 0x0cf8, 0x1387, 0x0c42, 0x04dc, 0x1397, - 0x069b, 0x050c, 0x13a7, 0x050c, 0x13b7, 0x13c3, 0x0b55, 0x13d3, - 0x074f, 0x050c, 0x050c, 0x13e3, 0x13f2, 0x1402, 0x0a31, 0x0c8f, - 0x050c, 0x050c, 0x05c9, 0x13c0, 0x1410, 0x1420, 0x0a31, 0x0a31, - 0x0a31, 0x0a31, 0x0a31, 0x0a31, 0x1430, 0x0a26, 0x05c7, 0x1440, - 0x144f, 0x1457, 0x116e, 0x050c, 0x050c, 0x050c, 0x1467, 0x050c, - 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x1477, 0x0c42, - 0x1487, 0x148b, 0x1498, 0x148f, 0x1498, 0x1493, 0x1498, 0x1487, - 0x148b, 0x1498, 0x148f, 0x1498, 0x1493, 0x1498, 0x1487, 0x148b, - 0x1498, 0x148f, 0x1498, 0x1493, 0x1498, 0x1487, 0x148b, 0x1498, - 0x148f, 0x1498, 0x14a4, 0x0b65, 0x14b4, 0x0b75, 0x0b75, 0x14bf, - 0x14cf, 0x14cf, 0x14cf, 0x14cf, 0x14cf, 0x14cf, 0x14cf, 0x14cf, - 0x14cf, 0x14cf, 0x14cf, 0x14cf, 0x14cf, 0x14cf, 0x14cf, 0x14cf, - 0x0728, 0x0728, 0x0728, 0x0728, 0x0728, 0x0728, 0x0728, 0x0728, - 0x0728, 0x0728, 0x0728, 0x0728, 0x0728, 0x0728, 0x0728, 0x0728, - 0x0721, 0x14df, 0x14ee, 0x14f8, 0x1508, 0x050c, 0x050c, 0x050c, - 0x050c, 0x050c, 0x050c, 0x050c, 0x0726, 0x0d78, 0x050c, 0x050c, - 0x050c, 0x1518, 0x0728, 0x050c, 0x050c, 0x050c, 0x050c, 0x0d79, - 0x050c, 0x050c, 0x0720, 0x0728, 0x0728, 0x1528, 0x04dc, 0x1538, - 0x04dc, 0x1548, 0x1554, 0x1564, 0x1573, 0x05da, 0x050c, 0x050c, - 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x1583, 0x1593, 0x15a2, - 0x11cc, 0x15b2, 0x11cc, 0x15c0, 0x15d0, 0x15df, 0x11cc, 0x15e1, - 0x11cc, 0x11cd, 0x15f1, 0x15f9, 0x1609, 0x1618, + 0x04ca, 0x04d8, 0x04e8, 0x04f8, 0x0508, 0x050d, 0x0508, 0x051b, + 0x052a, 0x04d8, 0x053a, 0x054a, 0x0508, 0x055a, 0x0508, 0x055a, + 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0563, 0x0570, 0x0508, 0x0508, 0x04d8, 0x04d8, 0x04d8, 0x04d8, + 0x0580, 0x0583, 0x0590, 0x05a0, 0x05b0, 0x0508, 0x05be, 0x0508, + 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x05cb, + 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x05db, + 0x0508, 0x05e4, 0x0508, 0x0508, 0x05ed, 0x05fd, 0x04d8, 0x05ff, + 0x060f, 0x061f, 0x0624, 0x0633, 0x0643, 0x0653, 0x0508, 0x0508, + 0x05c3, 0x04d8, 0x0663, 0x0673, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x067f, 0x0687, 0x0697, 0x06a1, 0x0672, 0x0508, 0x04d8, + 0x06b1, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x06be, 0x06cd, + 0x0697, 0x0508, 0x05c3, 0x06dd, 0x0508, 0x06ed, 0x06f9, 0x05dc, + 0x0508, 0x0709, 0x0719, 0x0508, 0x05dc, 0x0722, 0x0508, 0x0508, + 0x05c4, 0x04d8, 0x0730, 0x04d8, 0x073c, 0x0508, 0x0508, 0x0742, + 0x04d8, 0x074f, 0x075d, 0x0508, 0x076d, 0x0779, 0x0780, 0x078f, + 0x079d, 0x07ac, 0x07bb, 0x07cb, 0x07da, 0x0779, 0x0780, 0x07e9, + 0x07f7, 0x0806, 0x0815, 0x0825, 0x0834, 0x05be, 0x0780, 0x0841, + 0x084f, 0x085f, 0x07bb, 0x086f, 0x087f, 0x0779, 0x0780, 0x0841, + 0x088f, 0x089d, 0x07bb, 0x08ac, 0x08ba, 0x08c9, 0x08d9, 0x08e7, + 0x08f5, 0x0905, 0x0815, 0x0915, 0x0925, 0x05da, 0x0780, 0x0933, + 0x0941, 0x094f, 0x07bb, 0x095d, 0x096c, 0x05da, 0x0780, 0x0975, + 0x0941, 0x0985, 0x07bb, 0x0991, 0x09a1, 0x05da, 0x0508, 0x09af, + 0x09bd, 0x09cd, 0x07bb, 0x09d5, 0x09e5, 0x09ee, 0x0508, 0x09fc, + 0x0a0c, 0x0a1b, 0x0815, 0x0a2b, 0x0a3a, 0x0a3b, 0x0a3b, 0x0a40, + 0x0a50, 0x0a60, 0x0a6c, 0x0a6c, 0x0a7b, 0x0a3b, 0x0a87, 0x0a3d, + 0x0a92, 0x0aa2, 0x0a6c, 0x0a6c, 0x0ab2, 0x0ac0, 0x0697, 0x0acc, + 0x092a, 0x0508, 0x0adc, 0x0aeb, 0x0af5, 0x0b02, 0x04d8, 0x0b0b, + 0x0b1b, 0x0b2b, 0x0a6c, 0x0a6c, 0x0a3b, 0x0a3b, 0x0a3b, 0x0a3b, + 0x0b3b, 0x0a3b, 0x0a3b, 0x0a3b, 0x0a3b, 0x0b4b, 0x0508, 0x0508, + 0x0b5b, 0x0508, 0x0508, 0x0508, 0x0b6b, 0x0b6b, 0x0b6b, 0x0b6b, + 0x0b6b, 0x0b6b, 0x0b7b, 0x0b7b, 0x0b7b, 0x0b7b, 0x0b83, 0x0b8b, + 0x0b8b, 0x0b8b, 0x0b8b, 0x0b8b, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0b9b, 0x0bab, 0x0508, 0x0508, 0x0b9b, 0x0508, 0x0508, 0x0ba3, + 0x0bb3, 0x092b, 0x0508, 0x0508, 0x0bb3, 0x0508, 0x0508, 0x0508, + 0x0bbb, 0x0bcb, 0x0adc, 0x0508, 0x071a, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0bd5, 0x0be5, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0508, 0x0be5, 0x0bea, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0bfa, 0x0c08, 0x0508, 0x0c18, 0x0508, 0x0c27, 0x0508, + 0x0c37, 0x077c, 0x0c47, 0x0a3b, 0x0a3b, 0x0a3b, 0x0a3b, 0x0a3b, + 0x0c57, 0x0c67, 0x071a, 0x0c77, 0x0c67, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0c08, 0x0c87, 0x0508, 0x0c8e, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0c9e, 0x0508, 0x05dc, 0x0cae, 0x0cae, 0x0cbe, + 0x0a3b, 0x0a3d, 0x0cce, 0x0a3b, 0x0a3b, 0x0a3f, 0x0a3b, 0x0cde, + 0x0cee, 0x0508, 0x0508, 0x0cfe, 0x0a3b, 0x0a3b, 0x0a3b, 0x0a3c, + 0x0a3b, 0x0d0e, 0x0c67, 0x0c67, 0x0a3d, 0x04d8, 0x0d1d, 0x0a6c, + 0x0a6c, 0x0a6c, 0x073b, 0x0508, 0x0508, 0x0d2d, 0x0d38, 0x0d48, + 0x0d57, 0x0d63, 0x0d73, 0x0508, 0x0732, 0x0697, 0x0508, 0x0508, + 0x06be, 0x0d83, 0x0508, 0x0508, 0x0d2d, 0x0d93, 0x0da3, 0x0697, + 0x0508, 0x0db0, 0x0c08, 0x0508, 0x0508, 0x05e0, 0x08ac, 0x072f, + 0x0dc0, 0x0dc9, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x04d8, 0x04d8, + 0x04d8, 0x04d8, 0x0508, 0x0bd5, 0x0508, 0x0508, 0x0bd5, 0x0dd9, + 0x0508, 0x05dd, 0x0508, 0x0508, 0x0508, 0x05d6, 0x05d6, 0x0de8, + 0x0508, 0x0df8, 0x0e08, 0x0e18, 0x0e28, 0x0e38, 0x0e46, 0x0e50, + 0x0e60, 0x0e70, 0x0e80, 0x0adc, 0x0e90, 0x0e9a, 0x0ea8, 0x04d8, + 0x04d8, 0x0eb8, 0x0ec8, 0x0ed5, 0x0ee4, 0x0508, 0x0508, 0x0ef0, + 0x0f00, 0x0f02, 0x0f0c, 0x0f02, 0x0508, 0x0508, 0x0508, 0x0f1c, + 0x0508, 0x0508, 0x0f2c, 0x0f3a, 0x0f49, 0x0f58, 0x0f66, 0x0f70, + 0x0f80, 0x0508, 0x0f88, 0x0f69, 0x0f93, 0x0f99, 0x0508, 0x0508, + 0x0fa9, 0x0508, 0x0fb9, 0x0fc7, 0x0fd3, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0fe3, 0x0508, 0x0508, 0x0fec, 0x0a6c, 0x0719, 0x0a6c, + 0x0ffc, 0x0ffc, 0x0ffc, 0x0ffc, 0x0ffc, 0x0ffc, 0x0ffc, 0x0ffc, + 0x0ffc, 0x0ffd, 0x0ffc, 0x0ffc, 0x0ffc, 0x0ffc, 0x0f00, 0x0ffc, + 0x0ffc, 0x1007, 0x0ffc, 0x1015, 0x1025, 0x1033, 0x103f, 0x104d, + 0x105b, 0x0508, 0x106b, 0x107b, 0x0508, 0x108b, 0x109b, 0x0508, + 0x10ab, 0x10bb, 0x0508, 0x104f, 0x0508, 0x10bd, 0x10ca, 0x10d9, + 0x10e8, 0x10f7, 0x1104, 0x0508, 0x0508, 0x0508, 0x0508, 0x1112, + 0x1121, 0x112b, 0x0ffc, 0x1137, 0x0508, 0x0508, 0x1142, 0x0508, + 0x114c, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x114f, 0x1157, 0x0508, 0x0508, 0x0508, 0x0fb9, 0x0508, + 0x113b, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x1162, 0x0508, + 0x0776, 0x0508, 0x05d5, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x116c, 0x117b, 0x0508, 0x0508, 0x0b5b, 0x0508, 0x0508, + 0x0508, 0x0c09, 0x118a, 0x0508, 0x0fec, 0x119a, 0x119a, 0x119a, + 0x119a, 0x04d8, 0x04d8, 0x11aa, 0x11b8, 0x11c8, 0x11d8, 0x11e8, + 0x11f8, 0x0a6c, 0x0a6c, 0x1208, 0x120e, 0x1208, 0x1208, 0x1208, + 0x1208, 0x1208, 0x121a, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, + 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, + 0x122a, 0x0a6c, 0x123a, 0x124a, 0x1258, 0x1268, 0x1278, 0x1288, + 0x1208, 0x1295, 0x1208, 0x12a2, 0x12b1, 0x12c1, 0x1208, 0x1295, + 0x1208, 0x12a2, 0x12cc, 0x1235, 0x1208, 0x1208, 0x1207, 0x1208, + 0x1208, 0x1208, 0x1208, 0x1209, 0x1208, 0x1208, 0x1208, 0x1208, + 0x1208, 0x121a, 0x12dc, 0x1208, 0x1209, 0x1208, 0x1208, 0x12ec, + 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, + 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, + 0x0508, 0x0508, 0x0508, 0x0508, 0x1208, 0x12fc, 0x1208, 0x1208, + 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, + 0x1208, 0x1208, 0x1208, 0x1208, 0x1302, 0x1208, 0x1208, 0x1208, + 0x1308, 0x0508, 0x0508, 0x0db0, 0x1318, 0x0508, 0x1328, 0x0a6c, + 0x0508, 0x0508, 0x116c, 0x1338, 0x0508, 0x116d, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0508, 0x1348, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0719, 0x1358, 0x0a6c, 0x0dae, 0x1368, 0x0508, 0x1375, 0x1385, + 0x0508, 0x0508, 0x0508, 0x1395, 0x13a5, 0x0508, 0x0508, 0x0d2d, + 0x13b5, 0x0c67, 0x04d8, 0x13c5, 0x0697, 0x0508, 0x13d5, 0x0508, + 0x13e5, 0x13f1, 0x0b6b, 0x1401, 0x073c, 0x0508, 0x0508, 0x1411, + 0x1420, 0x1430, 0x0a3b, 0x0cc4, 0x0508, 0x0508, 0x05c5, 0x13ee, + 0x143e, 0x144e, 0x0a3b, 0x0a3b, 0x0a3b, 0x0a3b, 0x0a3b, 0x0a3b, + 0x145e, 0x0a30, 0x05c3, 0x146e, 0x147d, 0x0c9d, 0x119a, 0x0508, + 0x0508, 0x0508, 0x0fe7, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0508, 0x148d, 0x0c67, 0x149d, 0x14a1, 0x14ae, 0x14a5, + 0x14ae, 0x14a9, 0x14ae, 0x149d, 0x14a1, 0x14ae, 0x14a5, 0x14ae, + 0x14a9, 0x14ae, 0x149d, 0x14a1, 0x14ae, 0x14a5, 0x14ae, 0x14a9, + 0x14ae, 0x149d, 0x14a1, 0x14ae, 0x14a5, 0x14ae, 0x14ba, 0x0b7b, + 0x14ca, 0x0b8b, 0x0b8b, 0x14d5, 0x14e5, 0x14e5, 0x14e5, 0x14e5, + 0x14e5, 0x14e5, 0x14e5, 0x14e5, 0x14e5, 0x14e5, 0x14e5, 0x14e5, + 0x14e5, 0x14e5, 0x14e5, 0x14e5, 0x0a6c, 0x0a6c, 0x0a6c, 0x0a6c, + 0x0a6c, 0x0a6c, 0x0a6c, 0x0a6c, 0x0a6c, 0x0a6c, 0x0a6c, 0x0a6c, + 0x0a6c, 0x0a6c, 0x0a6c, 0x0a6c, 0x0fec, 0x14f5, 0x1504, 0x150e, + 0x151e, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x152e, 0x0dad, 0x0508, 0x0508, 0x0508, 0x153e, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0508, 0x0dae, 0x0508, 0x0508, 0x0c09, 0x0a6c, + 0x0a6c, 0x154e, 0x04d8, 0x155e, 0x04d8, 0x156e, 0x157a, 0x158a, + 0x1599, 0x05d6, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x15a9, 0x15b9, 0x15c8, 0x1208, 0x15d8, 0x1208, 0x15e6, + 0x15f6, 0x1605, 0x1208, 0x1607, 0x1208, 0x1209, 0x1617, 0x161f, + 0x162f, 0x163e, /* values */ 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0022, 0x0003, 0x0001, 0x0001, 0x0002, 0x0004, 0x0004, @@ -213,7 +213,7 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[5672] = 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001b, 0x001b, 0x001b, 0x0019, 0x0019, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0017, 0x0004, 0x0011, 0x0017, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0017, 0x0004, 0x0017, 0x0017, 0x0017, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001b, 0x001c, 0x001c, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, @@ -239,243 +239,250 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[5672] = 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0022, + 0x0022, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, + 0x001c, 0x001c, 0x001c, 0x001d, 0x0004, 0x0004, 0x0004, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0004, 0x0004, 0x0004, 0x001d, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0022, 0x0022, - 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001c, 0x001c, 0x001d, 0x0004, 0x0004, 0x0004, 0x0011, 0x001d, + 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, - 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x0011, - 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, - 0x0004, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, - 0x0011, 0x0004, 0x0004, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, - 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x0011, - 0x001d, 0x001d, 0x0004, 0x0004, 0x0011, 0x0011, 0x001c, 0x001c, + 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, + 0x0011, 0x0004, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0011, 0x0011, 0x0004, 0x0004, 0x0011, 0x0011, 0x0004, 0x0004, + 0x0004, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, + 0x0011, 0x001d, 0x001d, 0x0004, 0x0004, 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001d, 0x001d, 0x001b, 0x001b, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001b, 0x001d, 0x001a, 0x001d, 0x001d, 0x0004, 0x0011, - 0x0004, 0x0004, 0x0004, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0011, - 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, - 0x0011, 0x0011, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0011, 0x0011, 0x0004, - 0x0004, 0x0004, 0x0011, 0x0011, 0x0004, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0011, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001c, 0x001c, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x0004, - 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x001d, 0x001d, + 0x001c, 0x001d, 0x001d, 0x001b, 0x001b, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001b, 0x001d, 0x001a, 0x001d, 0x001d, 0x0004, + 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, + 0x0011, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x0011, 0x001d, + 0x001d, 0x0011, 0x0011, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0011, 0x0011, + 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0004, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, + 0x001d, 0x0011, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, + 0x001c, 0x001c, 0x001c, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, + 0x0004, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x0011, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x0011, 0x0011, 0x0004, 0x001d, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, + 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x001d, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001a, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, + 0x0004, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0011, 0x0011, 0x001d, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0011, 0x0011, 0x0004, 0x0004, 0x0011, 0x0011, + 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, + 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0004, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, + 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, + 0x001d, 0x001d, 0x0011, 0x001d, 0x0011, 0x001d, 0x001d, 0x0011, + 0x0011, 0x0011, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x001d, + 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, - 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0011, 0x0011, 0x0004, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, - 0x0004, 0x0004, 0x0011, 0x0011, 0x001d, 0x001a, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, - 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0011, 0x0011, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0011, 0x0011, 0x0004, 0x0004, 0x0011, 0x0011, 0x0004, - 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, - 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, - 0x0011, 0x001d, 0x0011, 0x0011, 0x0004, 0x001d, 0x0011, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, - 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, - 0x0011, 0x0011, 0x001d, 0x001d, 0x0011, 0x001d, 0x0011, 0x001d, - 0x001d, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x0011, 0x0011, - 0x0011, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x001d, + 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, + 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0011, 0x0011, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001a, 0x001d, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, - 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x001d, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001a, 0x001d, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, - 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, - 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0011, 0x001d, + 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0004, 0x001d, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, + 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0004, 0x0004, 0x0011, 0x001d, 0x001d, 0x001d, + 0x0011, 0x0011, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0021, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0021, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0004, + 0x001d, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0021, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0021, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0004, 0x001d, - 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, - 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x001d, 0x0011, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, + 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0004, 0x0004, 0x001d, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, - 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, - 0x0011, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001b, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0004, 0x0004, - 0x0004, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, + 0x0004, 0x0004, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, + 0x0004, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, + 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001b, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0011, 0x001d, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0004, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0011, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0004, 0x0004, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, + 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x0011, 0x0011, 0x0011, 0x0004, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, + 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0011, 0x0011, 0x0004, 0x0004, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, + 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, 0x0011, 0x0011, 0x001a, + 0x0023, 0x0011, 0x0011, 0x0011, 0x0011, 0x001a, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x001d, + 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x001d, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001c, 0x001c, 0x0022, 0x0022, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0023, 0x0023, 0x0011, 0x0023, 0x0011, 0x0023, 0x0023, 0x0023, - 0x0023, 0x0023, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, - 0x0023, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0023, 0x0023, 0x0023, 0x0011, 0x0023, 0x0011, 0x0023, 0x0023, - 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, 0x001c, 0x001c, + 0x0022, 0x0022, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0023, 0x0023, 0x0011, 0x0023, 0x0011, 0x0023, + 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0023, 0x0023, 0x0023, + 0x0023, 0x0011, 0x0023, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, + 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0023, 0x0011, + 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x0011, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x001d, 0x0021, - 0x0021, 0x0021, 0x0021, 0x001d, 0x0021, 0x0021, 0x0006, 0x0021, - 0x0021, 0x0022, 0x0006, 0x0017, 0x0017, 0x0017, 0x0006, 0x001d, - 0x0017, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0022, 0x0004, 0x001d, 0x0004, - 0x001d, 0x0004, 0x0012, 0x0013, 0x0012, 0x0013, 0x0004, 0x0004, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, + 0x001c, 0x001c, 0x0011, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, + 0x001d, 0x0021, 0x0021, 0x0021, 0x0021, 0x001d, 0x0021, 0x0021, + 0x0006, 0x0021, 0x0021, 0x0022, 0x0006, 0x0017, 0x0017, 0x0017, + 0x0006, 0x001d, 0x0017, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0022, 0x0004, + 0x001d, 0x0004, 0x001d, 0x0004, 0x0012, 0x0013, 0x0012, 0x0013, + 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, + 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0022, 0x0004, - 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, + 0x0022, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0022, 0x0022, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x0021, - 0x0021, 0x0022, 0x0021, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0006, 0x0006, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001c, - 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001c, 0x0022, 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001c, - 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001c, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0011, 0x0011, 0x000c, + 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0022, + 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, + 0x001d, 0x0021, 0x0021, 0x0022, 0x0021, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0006, 0x0006, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, + 0x001c, 0x001c, 0x001c, 0x0022, 0x0022, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, + 0x001c, 0x001c, 0x001c, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, + 0x0023, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, + 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0011, + 0x0011, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, - 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000d, + 0x000c, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, - 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000e, + 0x000d, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, - 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, - 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x001d, + 0x000e, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, + 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x0011, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, + 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0004, 0x0004, + 0x0004, 0x001d, 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x001d, - 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, - 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, - 0x0011, 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x0011, 0x0011, 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0012, 0x0013, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0012, 0x0013, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0022, 0x0022, 0x0022, 0x001d, 0x001d, 0x0004, 0x0004, + 0x001d, 0x001d, 0x001d, 0x0022, 0x0022, 0x0022, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x0004, + 0x0004, 0x0004, 0x0022, 0x0022, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x0004, 0x0004, - 0x0004, 0x0022, 0x0022, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x0004, 0x0004, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0011, 0x0004, 0x0004, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0011, 0x0004, + 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0023, 0x0023, 0x0023, + 0x0023, 0x0022, 0x0022, 0x0016, 0x0023, 0x0022, 0x001d, 0x0022, + 0x001a, 0x0023, 0x0023, 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, + 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x0017, + 0x0017, 0x0022, 0x0022, 0x0021, 0x001d, 0x0017, 0x0017, 0x001d, + 0x0004, 0x0004, 0x0004, 0x0006, 0x0004, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0011, 0x0011, 0x0011, + 0x0017, 0x0017, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, + 0x001c, 0x001c, 0x001c, 0x001c, 0x0023, 0x0023, 0x0023, 0x0023, + 0x0023, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0022, 0x0022, 0x0016, 0x0023, 0x0022, 0x001d, 0x0022, 0x001a, - 0x0023, 0x0023, 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x0017, 0x0017, - 0x0022, 0x0022, 0x0021, 0x001d, 0x0017, 0x0017, 0x001d, 0x0004, - 0x0004, 0x0004, 0x0006, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, - 0x0011, 0x0011, 0x0011, 0x001d, 0x0011, 0x0011, 0x0011, 0x0017, - 0x0017, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001c, 0x001c, 0x001c, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x0023, 0x0011, 0x0011, - 0x0011, 0x0023, 0x0023, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, - 0x0011, 0x001d, 0x001d, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, + 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, + 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x0023, 0x0011, + 0x0011, 0x0011, 0x0023, 0x0023, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0011, 0x0011, 0x001d, 0x001d, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0011, 0x0011, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, + 0x0023, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, - 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x0022, - 0x0022, 0x001d, 0x0022, 0x0022, 0x0022, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, - 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, + 0x0004, 0x0004, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0011, 0x0011, 0x0011, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, + 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001c, 0x001c, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, + 0x0022, 0x0022, 0x001d, 0x0022, 0x0022, 0x0022, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0022, 0x0022, + 0x0011, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x0022, 0x0022, 0x0004, 0x0004, 0x0004, + 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, + 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0011, 0x0011, 0x0011, 0x0022, 0x0022, 0x0022, 0x0022, + 0x0022, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, + 0x001c, 0x001c, 0x001c, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x0022, 0x0022, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x0004, 0x0004, + 0x0004, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, + 0x001d, 0x0011, 0x001d, 0x0011, 0x001d, 0x0011, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, + 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0021, 0x001d, 0x0011, 0x0022, 0x0022, + 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0006, 0x0022, 0x0022, + 0x0022, 0x0009, 0x0004, 0x002b, 0x0004, 0x0004, 0x0022, 0x0006, + 0x0022, 0x0022, 0x0025, 0x0024, 0x0024, 0x001d, 0x0015, 0x0015, + 0x0012, 0x0015, 0x0015, 0x0015, 0x0012, 0x0015, 0x0024, 0x0024, + 0x001d, 0x001d, 0x001f, 0x001f, 0x001f, 0x0022, 0x0001, 0x0001, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0006, 0x001b, 0x001b, + 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001d, 0x0015, + 0x0015, 0x0024, 0x0016, 0x0016, 0x001d, 0x001d, 0x001d, 0x001d, + 0x0019, 0x0012, 0x0013, 0x0016, 0x0016, 0x0016, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x0022, 0x001d, 0x0022, 0x0022, + 0x0022, 0x0022, 0x001d, 0x0022, 0x0022, 0x0022, 0x000b, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, - 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, - 0x0011, 0x001d, 0x0011, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x001d, - 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0021, 0x001d, 0x0011, 0x0022, 0x0022, 0x0022, - 0x0022, 0x0022, 0x0022, 0x0022, 0x0006, 0x0022, 0x0022, 0x0022, - 0x0009, 0x0004, 0x002b, 0x0004, 0x0004, 0x0022, 0x0006, 0x0022, - 0x0022, 0x0025, 0x0024, 0x0024, 0x001d, 0x0015, 0x0015, 0x0012, - 0x0015, 0x0015, 0x0015, 0x0012, 0x0015, 0x0024, 0x0024, 0x001d, - 0x001d, 0x001f, 0x001f, 0x001f, 0x0022, 0x0001, 0x0001, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0006, 0x001b, 0x001b, 0x001b, - 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001d, 0x0015, 0x0015, - 0x0024, 0x0016, 0x0016, 0x001d, 0x001d, 0x001d, 0x001d, 0x0019, - 0x0012, 0x0013, 0x0016, 0x0016, 0x0016, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x0022, 0x001d, 0x0022, 0x0022, 0x0022, - 0x0022, 0x001d, 0x0022, 0x0022, 0x0022, 0x000b, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x0011, - 0x0011, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0012, 0x0013, 0x0024, 0x001d, 0x0024, 0x0024, - 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0012, 0x0013, 0x0011, 0x001a, 0x001a, 0x001a, - 0x001a, 0x001a, 0x001a, 0x001a, 0x001b, 0x001a, 0x001a, 0x001a, + 0x0011, 0x0011, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0012, 0x0013, 0x0024, 0x001d, 0x0024, + 0x0024, 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0012, 0x0013, 0x0011, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001b, 0x001a, 0x001a, - 0x001a, 0x001a, 0x001b, 0x001a, 0x001a, 0x001b, 0x001a, 0x001a, + 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001b, 0x001a, + 0x001a, 0x001a, 0x001a, 0x001b, 0x001a, 0x001a, 0x001b, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, - 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001d, 0x001d, + 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x0004, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001b, 0x001d, 0x0024, 0x001d, 0x001d, 0x001d, 0x001b, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x001d, 0x001d, 0x001a, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, @@ -513,58 +520,57 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[5672] = 0x001d, 0x001d, 0x0012, 0x0013, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001e, 0x001e, 0x001e, 0x001e, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, + 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, + 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x0024, 0x0024, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0024, 0x0024, 0x001d, 0x0024, 0x0024, 0x0024, - 0x0024, 0x0024, 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0024, 0x0024, 0x001d, 0x001d, 0x0024, 0x0024, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0024, 0x0024, 0x0024, 0x001d, 0x001d, 0x0024, - 0x001d, 0x001d, 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0024, 0x0024, 0x0024, 0x0024, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, - 0x001e, 0x001e, 0x001e, 0x001e, 0x001d, 0x0024, 0x0024, 0x001d, - 0x001d, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001e, 0x001e, 0x0024, 0x0024, - 0x001e, 0x001d, 0x001e, 0x001e, 0x001e, 0x0029, 0x001e, 0x001e, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001e, 0x001e, 0x001e, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0024, 0x001d, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x001d, 0x0024, 0x0024, + 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x001d, 0x001d, 0x0024, + 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x0024, 0x001d, 0x001d, + 0x0024, 0x001d, 0x001d, 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x0024, 0x0024, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x0024, 0x001e, 0x001e, 0x001e, 0x001e, 0x001d, 0x0024, 0x0024, + 0x001d, 0x001d, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, + 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001e, 0x001e, 0x0024, + 0x0024, 0x001e, 0x001d, 0x001e, 0x001e, 0x001e, 0x0029, 0x001e, + 0x001e, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001e, 0x001e, 0x001e, 0x001d, 0x001d, 0x001d, + 0x001d, 0x0024, 0x001d, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0024, 0x0024, 0x001d, 0x0024, 0x0024, 0x0024, 0x001d, 0x0024, - 0x001e, 0x0024, 0x0024, 0x001d, 0x0024, 0x0024, 0x001d, 0x0024, + 0x001d, 0x0024, 0x0024, 0x001d, 0x0024, 0x0024, 0x0024, 0x001d, + 0x0024, 0x001e, 0x0024, 0x0024, 0x001d, 0x0024, 0x0024, 0x001d, + 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, - 0x0024, 0x0024, 0x0024, 0x0024, 0x001e, 0x001d, 0x001e, 0x001e, - 0x0024, 0x001e, 0x001e, 0x0024, 0x0024, 0x0024, 0x001e, 0x001e, - 0x0024, 0x0024, 0x001e, 0x0024, 0x0024, 0x001e, 0x001e, 0x001d, - 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x001e, - 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x0024, 0x001e, 0x001e, 0x0029, 0x001e, 0x0024, - 0x0024, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001d, 0x001d, - 0x001d, 0x001e, 0x001e, 0x0029, 0x0029, 0x0029, 0x0029, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x001d, - 0x001d, 0x001d, 0x0015, 0x0015, 0x0015, 0x0015, 0x0015, 0x001d, - 0x0017, 0x0017, 0x001e, 0x001d, 0x001d, 0x001d, 0x0012, 0x0013, - 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0024, 0x0024, + 0x001e, 0x0024, 0x0024, 0x0024, 0x0024, 0x001e, 0x001d, 0x001e, + 0x001e, 0x0024, 0x001e, 0x001e, 0x0024, 0x0024, 0x0024, 0x001e, + 0x001e, 0x0024, 0x0024, 0x001e, 0x0024, 0x0024, 0x001e, 0x001e, + 0x001d, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, + 0x001e, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x001e, 0x001e, + 0x001e, 0x001e, 0x001e, 0x0024, 0x001e, 0x001e, 0x0029, 0x001e, + 0x0024, 0x0024, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001d, + 0x001d, 0x001d, 0x001e, 0x001e, 0x0029, 0x0029, 0x0029, 0x0029, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, + 0x001d, 0x001d, 0x001d, 0x0015, 0x0015, 0x0015, 0x0015, 0x0015, + 0x001d, 0x0017, 0x0017, 0x001e, 0x001d, 0x001d, 0x001d, 0x0012, + 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0012, 0x0013, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0012, - 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, - 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0012, 0x0013, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0004, 0x0004, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0017, 0x0022, 0x0022, 0x0022, 0x001d, 0x0017, 0x0022, + 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, + 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x0024, + 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, + 0x001d, 0x0004, 0x0004, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0017, 0x0022, 0x0022, 0x0022, 0x001d, 0x0017, 0x0022, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, @@ -578,7 +584,9 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[5672] = 0x001d, 0x0022, 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0025, 0x0025, 0x0022, 0x0022, 0x0022, 0x001d, 0x0022, 0x0022, 0x0012, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, - 0x0022, 0x001d, 0x0022, 0x001d, 0x0022, 0x0022, 0x001e, 0x001e, + 0x0022, 0x001d, 0x0022, 0x001d, 0x0022, 0x0022, 0x001d, 0x001d, + 0x001d, 0x0017, 0x0017, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, + 0x0013, 0x0012, 0x0013, 0x0022, 0x0011, 0x0011, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x0011, 0x0011, 0x0011, @@ -605,9 +613,7 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[5672] = 0x0027, 0x001e, 0x0027, 0x001e, 0x0027, 0x001e, 0x0027, 0x001e, 0x0027, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0027, 0x0027, 0x001e, 0x001e, 0x001e, 0x001e, 0x0016, 0x0027, 0x0016, - 0x0016, 0x001e, 0x0011, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, + 0x0016, 0x001e, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, @@ -623,100 +629,99 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[5672] = 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x0004, 0x0004, 0x001d, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x0004, 0x001d, - 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0011, 0x0011, - 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001b, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0021, 0x0021, 0x0017, - 0x0017, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0022, - 0x0022, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0021, 0x001d, 0x001d, - 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0022, - 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0011, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, + 0x0004, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x001d, + 0x001d, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, + 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001b, 0x001d, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0021, + 0x0021, 0x0017, 0x0017, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x000c, 0x000c, 0x000c, + 0x0011, 0x0022, 0x0022, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0021, + 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0022, 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, - 0x000c, 0x000c, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x0022, 0x0022, 0x0022, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0011, 0x001d, 0x001c, 0x001c, 0x001c, 0x001c, + 0x000c, 0x000c, 0x000c, 0x000c, 0x0011, 0x0011, 0x0011, 0x001d, + 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0022, 0x0022, 0x0022, + 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x001c, 0x001c, + 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, + 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x0004, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x0004, 0x0004, 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x0011, 0x0011, - 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, - 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001c, 0x001c, 0x001c, 0x001c, 0x0011, 0x0011, 0x001d, 0x0022, - 0x0022, 0x0022, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0022, 0x0022, 0x001d, 0x001d, 0x001d, 0x0004, - 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x0022, 0x0022, 0x0022, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, - 0x0011, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0022, 0x0004, 0x0004, 0x0011, - 0x0011, 0x000f, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0022, 0x0022, 0x001d, 0x001d, + 0x001d, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0022, 0x0004, + 0x0004, 0x0011, 0x0011, 0x000f, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, - 0x0010, 0x000f, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, + 0x0010, 0x0010, 0x0010, 0x000f, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, - 0x0010, 0x0010, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x000d, 0x000d, - 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x0011, 0x0011, 0x0011, - 0x0011, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, - 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0010, 0x0010, 0x0010, 0x0010, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x0011, + 0x0011, 0x0011, 0x0011, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, + 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0026, 0x0004, - 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, - 0x0026, 0x001d, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, - 0x0026, 0x0011, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0011, - 0x0026, 0x0011, 0x0026, 0x0026, 0x0011, 0x0026, 0x0026, 0x0011, - 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, - 0x0026, 0x0026, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0013, 0x0012, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001b, 0x001d, - 0x0011, 0x0011, 0x0019, 0x0013, 0x0013, 0x0019, 0x0019, 0x0017, - 0x0017, 0x0012, 0x0013, 0x001f, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0012, - 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, - 0x0013, 0x0012, 0x0013, 0x001e, 0x001e, 0x0012, 0x0013, 0x001e, - 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0013, 0x001e, - 0x0013, 0x0011, 0x0016, 0x0016, 0x0017, 0x0017, 0x001e, 0x0012, - 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x001e, 0x001a, 0x001b, - 0x001e, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0011, 0x0011, 0x000b, 0x0011, 0x0017, 0x001e, - 0x001e, 0x001a, 0x001b, 0x001e, 0x001e, 0x0012, 0x0013, 0x001e, - 0x001e, 0x0013, 0x001e, 0x0013, 0x001e, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0016, 0x0016, - 0x001e, 0x001e, 0x001e, 0x0017, 0x001e, 0x001e, 0x001e, 0x001e, + 0x0005, 0x0005, 0x0005, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0026, 0x0004, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, + 0x0026, 0x0026, 0x0026, 0x001d, 0x0026, 0x0026, 0x0026, 0x0026, + 0x0026, 0x0026, 0x0026, 0x0011, 0x0026, 0x0026, 0x0026, 0x0026, + 0x0026, 0x0011, 0x0026, 0x0011, 0x0026, 0x0026, 0x0011, 0x0026, + 0x0026, 0x0011, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, + 0x0026, 0x0026, 0x0026, 0x0026, 0x001d, 0x001d, 0x001d, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0013, 0x0012, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001b, 0x001d, 0x001d, 0x001d, 0x0019, 0x0013, 0x0013, 0x0019, + 0x0019, 0x0017, 0x0017, 0x0012, 0x0013, 0x001f, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x001e, 0x001e, 0x001e, 0x001e, + 0x001e, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, + 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x001e, 0x001e, 0x0012, + 0x0013, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, + 0x0013, 0x001e, 0x0013, 0x0011, 0x0016, 0x0016, 0x0017, 0x0017, + 0x001e, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x001e, + 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x001e, + 0x001a, 0x001b, 0x001e, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x000b, 0x0011, + 0x0017, 0x001e, 0x001e, 0x001a, 0x001b, 0x001e, 0x001e, 0x0012, + 0x0013, 0x001e, 0x001e, 0x0013, 0x001e, 0x0013, 0x001e, 0x001e, + 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, + 0x0016, 0x0016, 0x001e, 0x001e, 0x001e, 0x0017, 0x001e, 0x001e, + 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, + 0x001e, 0x0012, 0x001e, 0x0013, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0012, - 0x001e, 0x0013, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0012, 0x001e, 0x0013, - 0x001e, 0x0012, 0x0013, 0x0013, 0x0012, 0x0013, 0x0013, 0x0016, - 0x001e, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, - 0x0027, 0x0027, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, + 0x001e, 0x0013, 0x001e, 0x0012, 0x0013, 0x0013, 0x0012, 0x0013, + 0x0013, 0x0016, 0x001e, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, + 0x0027, 0x0027, 0x0027, 0x0027, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, - 0x001e, 0x0016, 0x0016, 0x0011, 0x0011, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x0011, 0x0011, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x0011, 0x0011, 0x001e, 0x001e, 0x001e, - 0x0011, 0x0011, 0x0011, 0x001b, 0x001a, 0x001e, 0x001e, 0x001e, - 0x001a, 0x001a, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0007, 0x0024, - 0x0011, 0x0011 + 0x001e, 0x001e, 0x001e, 0x0016, 0x0016, 0x0011, 0x0011, 0x001e, + 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x0011, 0x001e, + 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x0011, 0x001e, + 0x001e, 0x001e, 0x0011, 0x0011, 0x0011, 0x001b, 0x001a, 0x001e, + 0x001e, 0x001e, 0x001a, 0x001a, 0x0011, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, + 0x0007, 0x0024, 0x0011, 0x0011 }; diff --git a/dlls/dwrite/mirror.c b/dlls/dwrite/mirror.c index 6409f222e39..44d63ebdb99 100644 --- a/dlls/dwrite/mirror.c +++ b/dlls/dwrite/mirror.c @@ -1,10 +1,10 @@ /* Unicode BiDi mirroring */ -/* generated from https://www.unicode.org/Public/13.0.0/ucd/UCD.zip:BidiMirroring.txt */ +/* generated from https://www.unicode.org/Public/14.0.0/ucd/UCD.zip:BidiMirroring.txt */ /* DO NOT EDIT!! */ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN wine_mirror_map[1414] = +const unsigned short DECLSPEC_HIDDEN wine_mirror_map[1428] = { /* level 1 offsets */ 0x0100, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, @@ -59,12 +59,12 @@ const unsigned short DECLSPEC_HIDDEN wine_mirror_map[1414] = 0x047c, 0x048c, 0x049c, 0x04ac, 0x04bb, 0x04ca, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x04d5, 0x04e4, 0x04f2, - 0x0502, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, - 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x050c, 0x051c, + 0x0502, 0x01d1, 0x01d1, 0x050d, 0x01d1, 0x01d1, 0x01d1, 0x01d1, + 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x051a, 0x052a, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, - 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x0528, 0x0537, + 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x0536, 0x0545, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, - 0x01d1, 0x053f, 0x0549, 0x01d1, 0x0558, 0x01d1, 0x0566, 0x0576, + 0x01d1, 0x054d, 0x0557, 0x01d1, 0x0566, 0x01d1, 0x0574, 0x0584, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, /* values */ @@ -172,19 +172,21 @@ const unsigned short DECLSPEC_HIDDEN wine_mirror_map[1414] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2e1d, 0x2e1c, 0x0000, 0x0000, 0x2e21, 0x2e20, 0x2e23, 0x2e22, 0x2e25, 0x2e24, 0x2e27, 0x2e26, 0x2e29, 0x2e28, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x3009, 0x3008, 0x300b, 0x300a, 0x300d, - 0x300c, 0x300f, 0x300e, 0x3011, 0x3010, 0x0000, 0x0000, 0x3015, - 0x3014, 0x3017, 0x3016, 0x3019, 0x3018, 0x301b, 0x301a, 0x0000, + 0x0000, 0x2e56, 0x2e55, 0x2e58, 0x2e57, 0x2e5a, 0x2e59, 0x2e5c, + 0x2e5b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x3009, 0x3008, 0x300b, 0x300a, 0x300d, 0x300c, 0x300f, + 0x300e, 0x3011, 0x3010, 0x0000, 0x0000, 0x3015, 0x3014, 0x3017, + 0x3016, 0x3019, 0x3018, 0x301b, 0x301a, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xfe5a, 0xfe59, + 0xfe5c, 0xfe5b, 0xfe5e, 0xfe5d, 0x0000, 0x0000, 0x0000, 0x0000, + 0xfe65, 0xfe64, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0xff09, 0xff08, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0xfe5a, 0xfe59, 0xfe5c, 0xfe5b, 0xfe5e, 0xfe5d, 0x0000, 0x0000, - 0x0000, 0x0000, 0xfe65, 0xfe64, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xff09, 0xff08, + 0x0000, 0x0000, 0xff1e, 0x0000, 0xff1c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0xff1e, 0x0000, 0xff1c, 0x0000, + 0xff3d, 0x0000, 0xff3b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xff5d, 0x0000, + 0xff5b, 0x0000, 0xff60, 0xff5f, 0x0000, 0xff63, 0xff62, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0xff3d, 0x0000, 0xff3b, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0xff5d, 0x0000, 0xff5b, 0x0000, 0xff60, 0xff5f, 0x0000, 0xff63, - 0xff62, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + 0x0000, 0x0000, 0x0000 }; diff --git a/dlls/dwrite/scripts.c b/dlls/dwrite/scripts.c index 9a75f9daaf0..e5f1c14d4f1 100644 --- a/dlls/dwrite/scripts.c +++ b/dlls/dwrite/scripts.c @@ -1,10 +1,10 @@ /* Unicode Script IDs */ -/* generated from https://www.unicode.org/Public/13.0.0/ucd/UCD.zip:Scripts.txt */ +/* generated from https://www.unicode.org/Public/14.0.0/ucd/UCD.zip:Scripts.txt */ /* DO NOT EDIT!! */ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN wine_scripts_table[5131] = +const unsigned short DECLSPEC_HIDDEN wine_scripts_table[5083] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0115, 0x0125, 0x0135, 0x0142, 0x0152, 0x0162, @@ -26,141 +26,139 @@ const unsigned short DECLSPEC_HIDDEN wine_scripts_table[5131] = 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, - 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03b4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03cc, 0x03dc, 0x03ea, 0x03fa, - 0x040a, 0x041a, 0x042a, 0x043a, 0x0202, 0x0202, 0x0202, 0x0202, + 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, 0x03a0, + 0x03b4, 0x03b4, 0x03b4, 0x03b4, 0x03bc, 0x03cc, 0x03da, 0x03ea, + 0x03fa, 0x040a, 0x041a, 0x042a, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, - 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x044a, - 0x045a, 0x045a, 0x045a, 0x045a, 0x045a, 0x045a, 0x045a, 0x045a, - 0x045a, 0x045a, 0x045a, 0x045a, 0x045a, 0x045a, 0x045a, 0x045a, - 0x045a, 0x045a, 0x045a, 0x045a, 0x045a, 0x045a, 0x045a, 0x045a, - 0x045a, 0x045a, 0x045a, 0x045a, 0x045a, 0x045a, 0x045a, 0x045a, - 0x045a, 0x03a0, 0x046a, 0x047a, 0x0488, 0x0495, 0x04a5, 0x04b5, + 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x0202, 0x043a, + 0x044a, 0x044a, 0x044a, 0x044a, 0x044a, 0x044a, 0x044a, 0x044a, + 0x044a, 0x044a, 0x044a, 0x044a, 0x044a, 0x044a, 0x044a, 0x044a, + 0x044a, 0x044a, 0x044a, 0x044a, 0x044a, 0x044a, 0x044a, 0x044a, + 0x044a, 0x044a, 0x044a, 0x044a, 0x044a, 0x044a, 0x044a, 0x044a, + 0x044a, 0x03a0, 0x045a, 0x046a, 0x0478, 0x0485, 0x0495, 0x04a5, /* level 2 offsets */ - 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04d4, 0x04d9, 0x04d4, 0x04d9, - 0x04c5, 0x04c5, 0x04e4, 0x04e4, 0x04f4, 0x04fd, 0x04f4, 0x04fd, - 0x04f4, 0x04f4, 0x04f4, 0x04f4, 0x04f4, 0x04f4, 0x04f4, 0x04f4, - 0x04f4, 0x04f4, 0x04f4, 0x04f4, 0x04f4, 0x04f4, 0x04f4, 0x04f4, - 0x04db, 0x04c5, 0x04c5, 0x0508, 0x04c5, 0x0518, 0x0518, 0x0518, - 0x0518, 0x0518, 0x0518, 0x0518, 0x0528, 0x0538, 0x0546, 0x0554, - 0x0546, 0x0546, 0x0546, 0x0562, 0x0546, 0x0572, 0x0572, 0x0572, - 0x0572, 0x0572, 0x0572, 0x0572, 0x0572, 0x057d, 0x0572, 0x0572, - 0x0572, 0x0572, 0x0572, 0x0572, 0x0572, 0x058d, 0x058e, 0x0597, - 0x058e, 0x058e, 0x0593, 0x05a7, 0x05a8, 0x05a8, 0x05b0, 0x05a8, - 0x05c0, 0x05cf, 0x05df, 0x05ec, 0x05fc, 0x05fc, 0x060c, 0x0617, - 0x05fc, 0x061c, 0x05fc, 0x05fc, 0x05fc, 0x05fc, 0x05fc, 0x05ff, - 0x05fc, 0x05fc, 0x062c, 0x063b, 0x063b, 0x063b, 0x0640, 0x05fc, - 0x05fc, 0x05fc, 0x0650, 0x0650, 0x0650, 0x065e, 0x066e, 0x066e, - 0x066e, 0x0673, 0x0683, 0x0683, 0x0685, 0x0684, 0x0695, 0x0699, - 0x06a9, 0x06b4, 0x06b4, 0x06b4, 0x05fc, 0x06c4, 0x06cc, 0x06d9, - 0x06e7, 0x05fc, 0x06f7, 0x06f7, 0x06f7, 0x06f7, 0x06f7, 0x0706, - 0x0712, 0x06f7, 0x0722, 0x072e, 0x0735, 0x0744, 0x0750, 0x075f, - 0x072b, 0x076e, 0x077d, 0x078c, 0x0793, 0x07a2, 0x07b0, 0x07bf, - 0x07ce, 0x07d7, 0x07e6, 0x07f2, 0x07eb, 0x0801, 0x080d, 0x081a, - 0x082a, 0x0838, 0x0848, 0x0854, 0x085b, 0x086a, 0x0876, 0x0884, - 0x0851, 0x0893, 0x08a1, 0x08b0, 0x08c0, 0x08ce, 0x08dc, 0x08e9, - 0x08f3, 0x08f9, 0x0909, 0x0915, 0x090d, 0x091b, 0x0928, 0x0936, - 0x0946, 0x0956, 0x0966, 0x0972, 0x096a, 0x097e, 0x098a, 0x0998, - 0x09a8, 0x09b8, 0x09c8, 0x09d4, 0x09d6, 0x09d6, 0x09e1, 0x09c4, - 0x09ed, 0x09d6, 0x09fd, 0x0a06, 0x0a10, 0x0a1e, 0x0a2e, 0x0a3d, - 0x0a4d, 0x0a5d, 0x0a6c, 0x0a6d, 0x0a6d, 0x0a72, 0x0a6d, 0x0a71, - 0x06b4, 0x06b4, 0x0a82, 0x0a8e, 0x0a9a, 0x0aa1, 0x0ab1, 0x0aa5, - 0x06b4, 0x06b4, 0x0ac1, 0x0ac1, 0x0ac1, 0x0ac1, 0x0ac9, 0x0ac1, - 0x0ad2, 0x0ac0, 0x0ac1, 0x0ac9, 0x0ac1, 0x0ac4, 0x0ac4, 0x0ae2, - 0x06b4, 0x06b4, 0x0af2, 0x0af2, 0x0af2, 0x0af2, 0x0af2, 0x0af2, - 0x0af2, 0x0af2, 0x0af2, 0x0af2, 0x0b02, 0x0b02, 0x0b0c, 0x0b02, - 0x0b02, 0x0b1c, 0x0b2c, 0x0b2c, 0x0b2c, 0x0b2c, 0x0b2c, 0x0b2c, - 0x0b2c, 0x0b2c, 0x0b2c, 0x0b2c, 0x0b2c, 0x0b2c, 0x0b2c, 0x0b2c, - 0x0b2c, 0x0b2c, 0x0b3c, 0x0b3c, 0x0b3c, 0x0b3c, 0x0b43, 0x0b53, - 0x0b3c, 0x0b3c, 0x0b43, 0x0b3c, 0x0b3c, 0x0b4b, 0x0b5b, 0x0b64, - 0x0b3c, 0x0b3c, 0x0b5b, 0x0b3c, 0x0b3c, 0x0b3c, 0x0b6c, 0x0b3c, - 0x0b79, 0x0b3c, 0x0b7c, 0x0b8c, 0x0b8c, 0x0b8c, 0x0b8c, 0x0b8c, - 0x0b96, 0x0ba6, 0x0ba6, 0x0ba6, 0x0ba6, 0x0ba6, 0x0ba6, 0x0ba6, - 0x0ba6, 0x0ba6, 0x0ba6, 0x0ba6, 0x0ba6, 0x0ba6, 0x0ba6, 0x0ba6, - 0x0ba6, 0x0bb6, 0x0bb9, 0x0bc9, 0x0bc9, 0x0bc9, 0x0bc9, 0x0bce, - 0x0bdc, 0x0bec, 0x0bfa, 0x0c0a, 0x0c15, 0x0c25, 0x0c31, 0x0c41, - 0x0c4d, 0x0c5d, 0x0c5d, 0x0c5d, 0x0c5d, 0x0c5d, 0x0c5f, 0x0c63, - 0x0c63, 0x0c73, 0x0c83, 0x0c93, 0x0c93, 0x0c93, 0x0c93, 0x0c93, - 0x0c9a, 0x0c93, 0x0c93, 0x0c98, 0x0ba6, 0x0ba6, 0x0ba6, 0x0ba6, - 0x0caa, 0x0cba, 0x0cbb, 0x0cbe, 0x0cbe, 0x0cce, 0x0cde, 0x0ce0, - 0x0ce9, 0x0cf9, 0x0cf9, 0x0cfd, 0x0cf9, 0x0cff, 0x0d0f, 0x0c5d, - 0x0c5d, 0x0d1f, 0x0d23, 0x0d33, 0x0d33, 0x0d33, 0x0d34, 0x0d33, - 0x0d36, 0x0d45, 0x0d45, 0x0d35, 0x0518, 0x0d55, 0x06b4, 0x06b4, - 0x06b4, 0x0d65, 0x0d65, 0x0d65, 0x0d65, 0x0d69, 0x0d65, 0x0d65, - 0x0d68, 0x0d79, 0x0d79, 0x0d79, 0x0d79, 0x0d89, 0x0d89, 0x0d89, - 0x0d95, 0x0da5, 0x0da5, 0x0da5, 0x0dad, 0x0dab, 0x0dbd, 0x0dbd, - 0x0dbd, 0x0dcd, 0x0b02, 0x0b02, 0x0ddd, 0x0ded, 0x0dfd, 0x0e0c, - 0x0e15, 0x04f4, 0x04f4, 0x0e25, 0x04f4, 0x04f4, 0x0e31, 0x0e3f, - 0x0e4a, 0x04f4, 0x04f4, 0x04f4, 0x0e53, 0x0518, 0x0518, 0x0518, - 0x0e63, 0x0546, 0x0e73, 0x0546, 0x0546, 0x0e73, 0x0e83, 0x0546, - 0x0e92, 0x0546, 0x0546, 0x0546, 0x0551, 0x0551, 0x0e9c, 0x0546, - 0x0eac, 0x0ebc, 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x0eca, - 0x0ed9, 0x0ee9, 0x0ef9, 0x04c5, 0x04c5, 0x06b4, 0x0518, 0x0518, - 0x0d55, 0x04c5, 0x04c5, 0x0f09, 0x0ee6, 0x0f15, 0x04c5, 0x04f4, - 0x04f4, 0x0f25, 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04c5, - 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04c5, - 0x04c5, 0x04c5, 0x0f35, 0x06b4, 0x0f45, 0x06b4, 0x04c5, 0x04c5, - 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04c5, - 0x0f55, 0x0f55, 0x0f55, 0x0f55, 0x0f55, 0x0f55, 0x0f55, 0x0f55, - 0x0f55, 0x0f55, 0x0f55, 0x0f55, 0x0f55, 0x0f55, 0x0f55, 0x0f55, - 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x0f65, - 0x04c5, 0x0f6f, 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04c5, - 0x0f7f, 0x0f7f, 0x0f80, 0x0f7f, 0x0f7f, 0x0f80, 0x04f4, 0x04f4, - 0x0f90, 0x0f90, 0x0f90, 0x0f90, 0x0f90, 0x0f90, 0x0f90, 0x0f9c, - 0x0b02, 0x0b02, 0x0b0c, 0x0fac, 0x0fac, 0x0fac, 0x0fb4, 0x0fc3, - 0x0b3c, 0x0fd3, 0x0fe3, 0x0fe3, 0x0fe3, 0x0fe3, 0x0572, 0x0572, - 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x0ff3, 0x06b4, 0x06b4, - 0x1003, 0x1009, 0x1003, 0x1003, 0x1003, 0x1003, 0x1003, 0x1015, - 0x1003, 0x1003, 0x1003, 0x1003, 0x1003, 0x1003, 0x1003, 0x1003, - 0x1003, 0x1003, 0x1003, 0x1003, 0x1003, 0x1025, 0x06b4, 0x1035, - 0x1045, 0x04c5, 0x1054, 0x1064, 0x1074, 0x1075, 0x1075, 0x1075, - 0x1075, 0x107e, 0x108e, 0x108f, 0x108f, 0x108f, 0x108f, 0x1094, - 0x10a4, 0x10a9, 0x10a9, 0x10b9, 0x0b2c, 0x0b2c, 0x0b2c, 0x0b2c, - 0x10ba, 0x04c5, 0x10a9, 0x10a9, 0x04c5, 0x04c5, 0x10ca, 0x108f, - 0x0b2c, 0x10ba, 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x0b2c, 0x10da, - 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x108f, 0x108f, 0x1090, - 0x108f, 0x108f, 0x108f, 0x108f, 0x108f, 0x10ea, 0x04c5, 0x04c5, - 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x04c5, - 0x1003, 0x1003, 0x1003, 0x1003, 0x1003, 0x1003, 0x1003, 0x1003, - 0x1003, 0x1003, 0x1003, 0x1003, 0x1003, 0x1003, 0x1003, 0x1003, - 0x04c5, 0x04c5, 0x04c5, 0x04c5, 0x1003, 0x1003, 0x1003, 0x1003, - 0x1003, 0x1003, 0x1003, 0x1003, 0x1003, 0x1003, 0x1003, 0x1003, - 0x1003, 0x1003, 0x1003, 0x10fa, 0x110a, 0x110a, 0x110a, 0x110a, - 0x110a, 0x110a, 0x110a, 0x110a, 0x110a, 0x110a, 0x110a, 0x110a, - 0x110a, 0x110a, 0x110a, 0x110a, 0x110d, 0x110a, 0x110a, 0x110a, - 0x1113, 0x1123, 0x1123, 0x1123, 0x1133, 0x1133, 0x1133, 0x1133, - 0x1133, 0x1133, 0x1133, 0x1133, 0x1133, 0x1133, 0x1133, 0x1133, - 0x1133, 0x1133, 0x1133, 0x1133, 0x1137, 0x06b4, 0x0572, 0x0572, - 0x0572, 0x0572, 0x0572, 0x0572, 0x1147, 0x1147, 0x1147, 0x1147, - 0x1147, 0x114f, 0x04c5, 0x04c5, 0x04d3, 0x04f4, 0x04f4, 0x04f4, - 0x04f4, 0x04f4, 0x115f, 0x04f4, 0x04f4, 0x04f4, 0x116f, 0x06b4, - 0x06b4, 0x117a, 0x118a, 0x118a, 0x118d, 0x119d, 0x11ad, 0x11ad, - 0x11ad, 0x11b5, 0x11c5, 0x11c5, 0x11c5, 0x11c5, 0x11cf, 0x11cb, - 0x06f7, 0x06f7, 0x11df, 0x11df, 0x11e1, 0x11f1, 0x11f1, 0x11fd, - 0x0b2c, 0x120d, 0x121d, 0x121d, 0x121d, 0x121d, 0x121f, 0x122f, - 0x0af2, 0x123f, 0x124f, 0x124f, 0x124f, 0x1258, 0x1251, 0x1268, - 0x0af2, 0x0af2, 0x1278, 0x1278, 0x1278, 0x1278, 0x1285, 0x128a, - 0x129a, 0x12a3, 0x12b2, 0x12ba, 0x0fe3, 0x04f4, 0x04f4, 0x04f9, - 0x12ca, 0x0b8c, 0x0b8c, 0x0b8c, 0x0b8c, 0x0b8c, 0x129a, 0x129a, - 0x129c, 0x12a0, 0x0b2c, 0x0b2c, 0x0b2c, 0x0b2c, 0x0b2c, 0x0b2c, - 0x0b2c, 0x0b2c, 0x0b2c, 0x0b2c, 0x12da, 0x0b2c, 0x12ea, 0x0b2c, - 0x0b2c, 0x12f5, 0x06b4, 0x06b4, 0x06b4, 0x06b4, 0x06b4, 0x06b4, - 0x06b4, 0x06b4, 0x06b4, 0x06b4, 0x06b4, 0x06b4, 0x06b4, 0x06b4, - 0x06b4, 0x06b4, 0x1003, 0x1003, 0x1003, 0x1003, 0x1003, 0x1003, - 0x1305, 0x1003, 0x1003, 0x1003, 0x1003, 0x1003, 0x1003, 0x1309, - 0x06b4, 0x06b4, 0x1319, 0x1326, 0x05a8, 0x1333, 0x1343, 0x05fc, - 0x05fc, 0x05fc, 0x05fc, 0x05fc, 0x05fc, 0x05fc, 0x1353, 0x06d9, - 0x05fc, 0x05fc, 0x05fc, 0x05fc, 0x05fc, 0x05fc, 0x05fc, 0x05fc, - 0x05fc, 0x05fc, 0x05fc, 0x05fc, 0x05fc, 0x05fc, 0x05fc, 0x05fc, - 0x1363, 0x06b4, 0x05fc, 0x05fc, 0x05fc, 0x05fc, 0x1361, 0x05fc, - 0x05fc, 0x06cc, 0x06b4, 0x06b4, 0x1373, 0x0518, 0x119d, 0x1383, - 0x04c5, 0x04c5, 0x1393, 0x139c, 0x06c4, 0x05fc, 0x05fc, 0x05fc, - 0x05fc, 0x05fc, 0x05fc, 0x05fc, 0x13ac, 0x13ba, 0x04c5, 0x04d4, - 0x04d9, 0x04d4, 0x04d9, 0x13c4, 0x108e, 0x108f, 0x1091, 0x0b2c, - 0x10ba, 0x13d4, 0x13dc, 0x13ec, 0x13fb, + 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04c4, 0x04c9, 0x04c4, 0x04c9, + 0x04b5, 0x04b5, 0x04d4, 0x04d4, 0x04e4, 0x04ed, 0x04e4, 0x04ed, + 0x04e4, 0x04e4, 0x04e4, 0x04e4, 0x04e4, 0x04e4, 0x04e4, 0x04e4, + 0x04e4, 0x04e4, 0x04e4, 0x04e4, 0x04e4, 0x04e4, 0x04e4, 0x04e4, + 0x04cb, 0x04b5, 0x04b5, 0x04f8, 0x04b5, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0508, 0x0508, 0x0518, 0x0528, 0x0536, 0x0544, + 0x0536, 0x0536, 0x0536, 0x0552, 0x0536, 0x0562, 0x0562, 0x0562, + 0x0562, 0x0562, 0x0562, 0x0562, 0x0562, 0x056d, 0x0562, 0x0562, + 0x0562, 0x0562, 0x0562, 0x0562, 0x0562, 0x057d, 0x057e, 0x0587, + 0x057e, 0x057e, 0x0583, 0x0597, 0x0598, 0x0598, 0x05a0, 0x0598, + 0x05b0, 0x05bf, 0x05cf, 0x05dc, 0x05ec, 0x05ec, 0x05fc, 0x0607, + 0x05ec, 0x060c, 0x05ec, 0x05ec, 0x05ec, 0x05ec, 0x05ec, 0x05ef, + 0x05ec, 0x05ec, 0x061c, 0x062b, 0x062b, 0x062b, 0x0630, 0x05ec, + 0x05ec, 0x05ec, 0x0640, 0x0640, 0x0640, 0x064e, 0x065e, 0x065e, + 0x065e, 0x0663, 0x0673, 0x0673, 0x0675, 0x0674, 0x0685, 0x0689, + 0x0699, 0x05ec, 0x06a9, 0x06b6, 0x05ec, 0x05ec, 0x05ec, 0x05ec, + 0x05e9, 0x05ec, 0x06c6, 0x06c6, 0x06c6, 0x06c6, 0x06c6, 0x06d5, + 0x06e1, 0x06c6, 0x06f1, 0x06fd, 0x0704, 0x0713, 0x071f, 0x072e, + 0x06fa, 0x073d, 0x074c, 0x075b, 0x0762, 0x0771, 0x077f, 0x078e, + 0x079d, 0x07a6, 0x07b5, 0x07c1, 0x07ba, 0x07d0, 0x07dc, 0x07e9, + 0x07f9, 0x0807, 0x0817, 0x0823, 0x082a, 0x0839, 0x0845, 0x0853, + 0x0820, 0x0862, 0x0870, 0x087f, 0x088f, 0x089d, 0x08ab, 0x08b8, + 0x08c2, 0x08c8, 0x08d8, 0x08e4, 0x08dc, 0x08ea, 0x08f6, 0x0904, + 0x0914, 0x0924, 0x0934, 0x0940, 0x0938, 0x094c, 0x0958, 0x0966, + 0x0976, 0x0986, 0x0996, 0x09a2, 0x09a4, 0x09a4, 0x09af, 0x0992, + 0x09bb, 0x09a4, 0x09cb, 0x09d4, 0x09de, 0x09ec, 0x09fc, 0x0a0b, + 0x0a1b, 0x0a2b, 0x0a3a, 0x0a3b, 0x0a3b, 0x0a40, 0x0a3b, 0x0a3f, + 0x0a50, 0x0a50, 0x0a5f, 0x0a6b, 0x0a77, 0x0a7e, 0x0a8e, 0x0a82, + 0x0a50, 0x0a50, 0x0a9e, 0x0a9e, 0x0a9e, 0x0a9e, 0x0aa6, 0x0a9e, + 0x0aaf, 0x0a9d, 0x0a9e, 0x0aa6, 0x0a9e, 0x0aa1, 0x0aa1, 0x0abf, + 0x0a50, 0x0a50, 0x0acf, 0x0acf, 0x0acf, 0x0acf, 0x0acf, 0x0acf, + 0x0acf, 0x0acf, 0x0acf, 0x0acf, 0x0adf, 0x0adf, 0x0ae9, 0x0adf, + 0x0adf, 0x0af9, 0x0b09, 0x0b09, 0x0b09, 0x0b09, 0x0b09, 0x0b09, + 0x0b09, 0x0b09, 0x0b09, 0x0b09, 0x0b09, 0x0b09, 0x0b09, 0x0b09, + 0x0b09, 0x0b09, 0x0b19, 0x0b19, 0x0b19, 0x0b19, 0x0b20, 0x0b30, + 0x0b19, 0x0b19, 0x0b20, 0x0b19, 0x0b19, 0x0b28, 0x0b38, 0x0b41, + 0x0b19, 0x0b19, 0x0b38, 0x0b19, 0x0b19, 0x0b19, 0x0b49, 0x0b19, + 0x0b56, 0x0b19, 0x0b59, 0x0b69, 0x0b69, 0x0b69, 0x0b69, 0x0b69, + 0x0b73, 0x0b83, 0x0b83, 0x0b83, 0x0b83, 0x0b83, 0x0b83, 0x0b83, + 0x0b83, 0x0b83, 0x0b83, 0x0b83, 0x0b83, 0x0b83, 0x0b83, 0x0b83, + 0x0b83, 0x0b93, 0x0b96, 0x0ba6, 0x0ba6, 0x0ba6, 0x0ba6, 0x0bab, + 0x0bb9, 0x0bc9, 0x0bd3, 0x0be3, 0x0bee, 0x0bfe, 0x0c0a, 0x0c1a, + 0x0c26, 0x0c36, 0x0c36, 0x0c36, 0x0c36, 0x0c36, 0x0c38, 0x0c3c, + 0x0c3c, 0x0c4c, 0x0c52, 0x0c62, 0x0c62, 0x0c62, 0x0c62, 0x0c62, + 0x0c69, 0x0c62, 0x0c62, 0x0c67, 0x0b83, 0x0b83, 0x0b83, 0x0b83, + 0x0c79, 0x0c89, 0x0c8a, 0x0c8d, 0x0c8d, 0x0c9d, 0x0cad, 0x0caf, + 0x0cb8, 0x0cc8, 0x0cc8, 0x0ccc, 0x0cc8, 0x0cce, 0x0cde, 0x0c36, + 0x0c36, 0x0cee, 0x0cf2, 0x0d02, 0x0d02, 0x0d02, 0x0d03, 0x0d02, + 0x0d05, 0x0d14, 0x0d14, 0x0d04, 0x0508, 0x0d24, 0x0a50, 0x0a50, + 0x0a50, 0x0d34, 0x0d34, 0x0d34, 0x0d34, 0x0d37, 0x0d34, 0x0d34, + 0x0d35, 0x0d47, 0x0d47, 0x0d47, 0x0d47, 0x0d57, 0x0d57, 0x0d57, + 0x0d63, 0x0d73, 0x0d73, 0x0d73, 0x0d7b, 0x0d79, 0x0d8b, 0x0d8b, + 0x0d8b, 0x0d9b, 0x0adf, 0x0adf, 0x0dab, 0x0dbb, 0x0dcb, 0x0dda, + 0x0de3, 0x04e4, 0x04e4, 0x0df3, 0x04e4, 0x04e4, 0x0dff, 0x0e0d, + 0x0e18, 0x04e4, 0x04e4, 0x04e4, 0x0e21, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0536, 0x0e30, 0x0536, 0x0536, 0x0e30, 0x0e40, 0x0536, + 0x0e4f, 0x0536, 0x0536, 0x0536, 0x0541, 0x0541, 0x0e59, 0x0536, + 0x0e69, 0x0e79, 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x0e87, + 0x0e96, 0x0ea6, 0x0eb6, 0x04b5, 0x04b5, 0x0a4f, 0x0508, 0x0508, + 0x0ec6, 0x04b5, 0x04b5, 0x0ed6, 0x0ea3, 0x0ee2, 0x04b5, 0x04e4, + 0x04e4, 0x0ef2, 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04b5, + 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04b5, + 0x04b5, 0x04b5, 0x0f02, 0x0a50, 0x0f12, 0x0a50, 0x04b5, 0x04b5, + 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04b5, + 0x0f22, 0x0f22, 0x0f22, 0x0f22, 0x0f22, 0x0f22, 0x0f22, 0x0f22, + 0x0f22, 0x0f22, 0x0f22, 0x0f22, 0x0f22, 0x0f22, 0x0f22, 0x0f22, + 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x0f32, + 0x04b5, 0x0f3c, 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04b5, + 0x0f4c, 0x0f4c, 0x0f4c, 0x0f4c, 0x0f4c, 0x0f4c, 0x04e4, 0x04e4, + 0x0f5c, 0x0f5c, 0x0f5c, 0x0f5c, 0x0f5c, 0x0f5c, 0x0f5c, 0x0f68, + 0x0adf, 0x0adf, 0x0ae9, 0x0f78, 0x0f78, 0x0f78, 0x0f80, 0x0f8f, + 0x0b19, 0x0f9f, 0x0faf, 0x0faf, 0x0faf, 0x0faf, 0x0562, 0x0562, + 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x0fbf, 0x0a50, 0x0a50, + 0x0fcf, 0x0fd5, 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, 0x0fe1, + 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, + 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, 0x0ff1, 0x0a50, 0x1001, + 0x1011, 0x04b5, 0x1020, 0x1030, 0x1040, 0x1041, 0x1041, 0x1041, + 0x1041, 0x104a, 0x105a, 0x105b, 0x105b, 0x105b, 0x105b, 0x1060, + 0x1070, 0x1075, 0x1075, 0x1085, 0x0b09, 0x0b09, 0x0b09, 0x0b09, + 0x1086, 0x04b5, 0x1075, 0x1075, 0x04b5, 0x04b5, 0x1096, 0x105b, + 0x0b09, 0x1086, 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x0b09, 0x10a6, + 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x105b, 0x105b, 0x105c, + 0x105b, 0x105b, 0x105b, 0x105b, 0x105b, 0x10b6, 0x04b5, 0x04b5, + 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x04b5, + 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, + 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, + 0x04b5, 0x04b5, 0x04b5, 0x04b5, 0x10c6, 0x10c6, 0x10c6, 0x10c6, + 0x10c6, 0x10c6, 0x10c6, 0x10c6, 0x10c6, 0x10c6, 0x10c6, 0x10c6, + 0x10c6, 0x10c6, 0x10c6, 0x10c6, 0x10c9, 0x10c6, 0x10c6, 0x10c6, + 0x10cf, 0x10df, 0x10df, 0x10df, 0x10ef, 0x10ef, 0x10ef, 0x10ef, + 0x10ef, 0x10ef, 0x10ef, 0x10ef, 0x10ef, 0x10ef, 0x10ef, 0x10ef, + 0x10ef, 0x10ef, 0x10ef, 0x10ef, 0x10f3, 0x0a50, 0x0562, 0x0562, + 0x0562, 0x0562, 0x0562, 0x0562, 0x1103, 0x1103, 0x1103, 0x1103, + 0x1103, 0x110b, 0x04b5, 0x04b5, 0x04c3, 0x04e4, 0x04e4, 0x04e4, + 0x04e4, 0x04e4, 0x111b, 0x04e4, 0x04e4, 0x04e4, 0x1126, 0x1136, + 0x0a50, 0x1144, 0x1154, 0x1154, 0x1157, 0x1167, 0x1177, 0x1177, + 0x1177, 0x117f, 0x118f, 0x118f, 0x118f, 0x118f, 0x1199, 0x1195, + 0x06c6, 0x06c6, 0x11a9, 0x11a9, 0x11ab, 0x11bb, 0x11bb, 0x11c7, + 0x0b09, 0x11d7, 0x11e7, 0x11e7, 0x11e7, 0x11e7, 0x11e9, 0x11f9, + 0x0acf, 0x1209, 0x1219, 0x1219, 0x1219, 0x1222, 0x121b, 0x1232, + 0x0acf, 0x0acf, 0x1242, 0x1242, 0x1242, 0x1242, 0x124f, 0x1254, + 0x1264, 0x126d, 0x127c, 0x1284, 0x0faf, 0x04e4, 0x04e4, 0x04e9, + 0x1294, 0x0b69, 0x0b69, 0x0b69, 0x0b69, 0x0b69, 0x1264, 0x1264, + 0x1266, 0x126a, 0x0b09, 0x0b09, 0x0b09, 0x0b09, 0x0b09, 0x0b09, + 0x0b09, 0x0b09, 0x0b09, 0x0b09, 0x12a4, 0x0b09, 0x12b4, 0x0b09, + 0x0b09, 0x12bf, 0x0a50, 0x0a50, 0x0a50, 0x0a50, 0x0a50, 0x0a50, + 0x0a50, 0x0a50, 0x0a50, 0x0a50, 0x0a50, 0x0a50, 0x0a50, 0x0a50, + 0x0a50, 0x0a50, 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, + 0x12cf, 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, 0x0fcf, 0x12d3, + 0x0a50, 0x0a50, 0x12e3, 0x12f0, 0x0598, 0x12fd, 0x130d, 0x05ec, + 0x05ec, 0x05ec, 0x05ec, 0x05ec, 0x05ec, 0x05ec, 0x131d, 0x06a6, + 0x05ec, 0x05ec, 0x05ec, 0x05ec, 0x05ec, 0x05ec, 0x05ec, 0x05ec, + 0x05ec, 0x05ec, 0x05ec, 0x05ec, 0x05ec, 0x05ec, 0x05ec, 0x05ec, + 0x132d, 0x05ec, 0x05ec, 0x05ec, 0x05ec, 0x05ec, 0x06a7, 0x05ec, + 0x05ec, 0x133d, 0x0a50, 0x0a50, 0x05ec, 0x0508, 0x1167, 0x134d, + 0x04b5, 0x04b5, 0x135d, 0x1366, 0x1376, 0x05ec, 0x05ec, 0x05ec, + 0x05ec, 0x05ec, 0x05ec, 0x05ec, 0x137c, 0x138a, 0x04b5, 0x04c4, + 0x04c9, 0x04c4, 0x04c9, 0x1394, 0x105a, 0x105b, 0x105d, 0x0b09, + 0x1086, 0x13a4, 0x13ac, 0x13bc, 0x13cb, /* values */ 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, @@ -200,7 +198,7 @@ const unsigned short DECLSPEC_HIDDEN wine_scripts_table[5131] = 0x0000, 0x0000, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0001, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0001, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, - 0x0003, 0x0003, 0x0001, 0x0003, 0x0000, 0x0003, 0x0001, 0x0003, + 0x0003, 0x0003, 0x0001, 0x0003, 0x0003, 0x0003, 0x0001, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0001, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, @@ -224,421 +222,417 @@ const unsigned short DECLSPEC_HIDDEN wine_scripts_table[5131] = 0x0039, 0x0039, 0x0039, 0x0039, 0x0039, 0x0039, 0x0039, 0x0039, 0x0000, 0x0000, 0x0039, 0x0000, 0x0051, 0x0051, 0x0051, 0x0051, 0x0051, 0x0051, 0x0051, 0x0051, 0x0051, 0x0051, 0x0051, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, - 0x0003, 0x0003, 0x0003, 0x0003, 0x0000, 0x0003, 0x0003, 0x0003, - 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, - 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, - 0x0003, 0x0003, 0x0003, 0x0003, 0x0001, 0x0003, 0x0003, 0x0003, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, - 0x0003, 0x0003, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, + 0x0003, 0x0003, 0x0003, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, - 0x0018, 0x0018, 0x0002, 0x0002, 0x0002, 0x0002, 0x0018, 0x0018, + 0x0018, 0x0002, 0x0002, 0x0002, 0x0002, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, - 0x0018, 0x0001, 0x0001, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, - 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0009, 0x0009, 0x0009, - 0x0009, 0x0000, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, - 0x0009, 0x0009, 0x0000, 0x0000, 0x0009, 0x0009, 0x0009, 0x0009, - 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, - 0x0009, 0x0000, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, - 0x0000, 0x0009, 0x0000, 0x0000, 0x0000, 0x0009, 0x0009, 0x0009, - 0x0009, 0x0000, 0x0000, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, - 0x0000, 0x0000, 0x0009, 0x0009, 0x0000, 0x0000, 0x0009, 0x0009, - 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0009, 0x0009, + 0x0001, 0x0001, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, + 0x0018, 0x0018, 0x0018, 0x0018, 0x0009, 0x0009, 0x0009, 0x0009, 0x0000, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, + 0x0009, 0x0000, 0x0000, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, + 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, + 0x0000, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0000, + 0x0009, 0x0000, 0x0000, 0x0000, 0x0009, 0x0009, 0x0009, 0x0009, + 0x0000, 0x0000, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0000, + 0x0000, 0x0009, 0x0009, 0x0000, 0x0000, 0x0009, 0x0009, 0x0009, + 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0009, 0x0009, 0x0000, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, - 0x0000, 0x0020, 0x0020, 0x0020, 0x0000, 0x0020, 0x0020, 0x0020, - 0x0020, 0x0020, 0x0020, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, - 0x0000, 0x0000, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, - 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0000, + 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0000, + 0x0020, 0x0020, 0x0020, 0x0000, 0x0020, 0x0020, 0x0020, 0x0020, + 0x0020, 0x0020, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, 0x0000, + 0x0000, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0000, 0x0020, - 0x0020, 0x0000, 0x0020, 0x0020, 0x0000, 0x0020, 0x0020, 0x0000, - 0x0000, 0x0020, 0x0000, 0x0020, 0x0020, 0x0020, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0020, 0x0020, 0x0000, 0x0000, 0x0020, 0x0020, - 0x0020, 0x0000, 0x0000, 0x0020, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0020, 0x0020, 0x0020, 0x0020, 0x0000, - 0x0020, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0000, 0x0020, 0x0020, + 0x0000, 0x0020, 0x0020, 0x0000, 0x0020, 0x0020, 0x0000, 0x0000, + 0x0020, 0x0000, 0x0020, 0x0020, 0x0020, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0020, 0x0020, 0x0000, 0x0000, 0x0020, 0x0020, 0x0020, + 0x0000, 0x0000, 0x0020, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0020, 0x0020, 0x0020, 0x0020, 0x0000, 0x0020, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, - 0x0020, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x001f, 0x001f, 0x001f, 0x0000, 0x001f, 0x001f, - 0x001f, 0x001f, 0x001f, 0x001f, 0x001f, 0x001f, 0x001f, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x001f, 0x001f, 0x001f, 0x0000, 0x001f, 0x001f, 0x001f, + 0x001f, 0x001f, 0x001f, 0x001f, 0x001f, 0x001f, 0x0000, 0x001f, 0x001f, 0x001f, 0x001f, 0x001f, 0x001f, 0x001f, 0x001f, 0x001f, + 0x001f, 0x001f, 0x001f, 0x001f, 0x0000, 0x001f, 0x001f, 0x0000, + 0x001f, 0x001f, 0x001f, 0x001f, 0x001f, 0x0000, 0x0000, 0x001f, 0x001f, 0x001f, 0x001f, 0x001f, 0x001f, 0x0000, 0x001f, 0x001f, - 0x0000, 0x001f, 0x001f, 0x001f, 0x001f, 0x001f, 0x0000, 0x0000, - 0x001f, 0x001f, 0x001f, 0x001f, 0x001f, 0x001f, 0x0000, 0x001f, - 0x001f, 0x001f, 0x0000, 0x001f, 0x001f, 0x001f, 0x0000, 0x0000, + 0x001f, 0x0000, 0x001f, 0x001f, 0x001f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x001f, 0x001f, 0x001f, - 0x001f, 0x0000, 0x0000, 0x001f, 0x001f, 0x001f, 0x001f, 0x001f, - 0x001f, 0x001f, 0x001f, 0x001f, 0x001f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x001f, 0x001f, 0x001f, 0x001f, - 0x001f, 0x001f, 0x001f, 0x0000, 0x0045, 0x0045, 0x0045, 0x0000, - 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, - 0x0000, 0x0000, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, + 0x0000, 0x0000, 0x001f, 0x001f, 0x001f, 0x001f, 0x001f, 0x001f, + 0x001f, 0x001f, 0x001f, 0x001f, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x001f, 0x001f, 0x001f, 0x001f, 0x001f, + 0x001f, 0x001f, 0x0000, 0x0045, 0x0045, 0x0045, 0x0000, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0000, + 0x0000, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0000, 0x0045, - 0x0045, 0x0000, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0000, + 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0000, 0x0045, 0x0045, 0x0000, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0000, 0x0000, - 0x0045, 0x0045, 0x0000, 0x0000, 0x0045, 0x0045, 0x0045, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0045, 0x0045, 0x0045, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0045, 0x0045, 0x0000, 0x0045, 0x0045, - 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0057, 0x0057, - 0x0000, 0x0057, 0x0057, 0x0057, 0x0057, 0x0057, 0x0057, 0x0000, - 0x0000, 0x0000, 0x0057, 0x0057, 0x0000, 0x0057, 0x0057, 0x0057, - 0x0057, 0x0000, 0x0000, 0x0000, 0x0057, 0x0057, 0x0000, 0x0057, - 0x0000, 0x0057, 0x0057, 0x0000, 0x0000, 0x0000, 0x0057, 0x0057, - 0x0000, 0x0000, 0x0000, 0x0057, 0x0057, 0x0057, 0x0000, 0x0000, - 0x0000, 0x0057, 0x0057, 0x0057, 0x0057, 0x0057, 0x0057, 0x0057, - 0x0057, 0x0057, 0x0057, 0x0000, 0x0000, 0x0000, 0x0000, 0x0057, - 0x0057, 0x0057, 0x0000, 0x0000, 0x0000, 0x0057, 0x0057, 0x0057, - 0x0000, 0x0057, 0x0057, 0x0057, 0x0057, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0057, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0057, 0x0057, 0x0057, 0x0057, - 0x0057, 0x0057, 0x0057, 0x0057, 0x0057, 0x0057, 0x0057, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0058, 0x0058, 0x0058, 0x0058, - 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, - 0x0058, 0x0000, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, - 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, + 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0000, 0x0000, 0x0045, + 0x0045, 0x0000, 0x0000, 0x0045, 0x0045, 0x0045, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0045, 0x0045, 0x0045, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0045, 0x0045, 0x0000, 0x0045, 0x0045, 0x0045, + 0x0045, 0x0045, 0x0045, 0x0045, 0x0045, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0057, 0x0057, 0x0000, + 0x0057, 0x0057, 0x0057, 0x0057, 0x0057, 0x0057, 0x0000, 0x0000, + 0x0000, 0x0057, 0x0057, 0x0000, 0x0057, 0x0057, 0x0057, 0x0057, + 0x0000, 0x0000, 0x0000, 0x0057, 0x0057, 0x0000, 0x0057, 0x0000, + 0x0057, 0x0057, 0x0000, 0x0000, 0x0000, 0x0057, 0x0057, 0x0000, + 0x0000, 0x0000, 0x0057, 0x0057, 0x0057, 0x0000, 0x0000, 0x0000, + 0x0057, 0x0057, 0x0057, 0x0057, 0x0057, 0x0057, 0x0057, 0x0057, + 0x0057, 0x0057, 0x0000, 0x0000, 0x0000, 0x0000, 0x0057, 0x0057, + 0x0057, 0x0000, 0x0000, 0x0000, 0x0057, 0x0057, 0x0057, 0x0000, + 0x0057, 0x0057, 0x0057, 0x0057, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0057, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0057, 0x0057, 0x0057, 0x0057, 0x0057, + 0x0057, 0x0057, 0x0057, 0x0057, 0x0057, 0x0057, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, - 0x0000, 0x0058, 0x0058, 0x0058, 0x0000, 0x0058, 0x0058, 0x0058, - 0x0058, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0058, 0x0058, - 0x0000, 0x0058, 0x0058, 0x0058, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0058, 0x0058, 0x0058, 0x0058, 0x0000, 0x0000, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, - 0x0058, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, - 0x0058, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, - 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x0000, 0x002b, + 0x0000, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, + 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0000, + 0x0000, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0000, 0x0058, + 0x0058, 0x0058, 0x0000, 0x0058, 0x0058, 0x0058, 0x0058, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0058, 0x0058, 0x0000, 0x0058, + 0x0058, 0x0058, 0x0000, 0x0000, 0x0058, 0x0000, 0x0000, 0x0058, + 0x0058, 0x0058, 0x0058, 0x0000, 0x0000, 0x0058, 0x0058, 0x0058, + 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0058, 0x0058, + 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x002b, + 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, + 0x002b, 0x002b, 0x002b, 0x002b, 0x0000, 0x002b, 0x002b, 0x002b, + 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, + 0x002b, 0x002b, 0x002b, 0x0000, 0x002b, 0x002b, 0x002b, 0x002b, + 0x002b, 0x0000, 0x0000, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, + 0x0000, 0x002b, 0x002b, 0x002b, 0x0000, 0x002b, 0x002b, 0x002b, + 0x002b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x002b, 0x002b, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x002b, 0x002b, + 0x0000, 0x002b, 0x002b, 0x002b, 0x002b, 0x0000, 0x0000, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, - 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x0000, 0x002b, 0x002b, - 0x002b, 0x002b, 0x002b, 0x0000, 0x0000, 0x002b, 0x002b, 0x002b, - 0x002b, 0x002b, 0x0000, 0x002b, 0x002b, 0x002b, 0x0000, 0x002b, - 0x002b, 0x002b, 0x002b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x002b, 0x002b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x002b, 0x0000, 0x002b, 0x002b, 0x002b, 0x002b, 0x0000, - 0x0000, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, - 0x002b, 0x002b, 0x002b, 0x0000, 0x002b, 0x002b, 0x0000, 0x0000, + 0x002b, 0x0000, 0x002b, 0x002b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, - 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, 0x0000, 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, + 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, 0x0000, 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, - 0x0038, 0x0000, 0x0038, 0x0038, 0x0038, 0x0000, 0x0038, 0x0038, - 0x0038, 0x0038, 0x0038, 0x0038, 0x0000, 0x0000, 0x0038, 0x0038, - 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, - 0x0000, 0x004e, 0x004e, 0x004e, 0x0000, 0x004e, 0x004e, 0x004e, - 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, - 0x0000, 0x0000, 0x0000, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, - 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, - 0x004e, 0x004e, 0x004e, 0x0000, 0x004e, 0x004e, 0x004e, 0x004e, - 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x0000, 0x004e, 0x0000, + 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, 0x0000, + 0x0038, 0x0038, 0x0038, 0x0000, 0x0038, 0x0038, 0x0038, 0x0038, + 0x0038, 0x0038, 0x0000, 0x0000, 0x0038, 0x0038, 0x0038, 0x0038, + 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, 0x0038, 0x0000, 0x004e, + 0x004e, 0x004e, 0x0000, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, + 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x0000, 0x0000, 0x0000, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, - 0x0000, 0x0000, 0x0000, 0x004e, 0x0000, 0x0000, 0x0000, 0x0000, - 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x0000, 0x004e, 0x0000, - 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, - 0x0000, 0x0000, 0x004e, 0x004e, 0x004e, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x005a, 0x005a, 0x005a, 0x005a, 0x005a, 0x005a, 0x005a, 0x005a, + 0x004e, 0x0000, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, + 0x004e, 0x004e, 0x004e, 0x0000, 0x004e, 0x0000, 0x0000, 0x004e, + 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x0000, 0x0000, + 0x0000, 0x004e, 0x0000, 0x0000, 0x0000, 0x0000, 0x004e, 0x004e, + 0x004e, 0x004e, 0x004e, 0x0000, 0x004e, 0x0000, 0x004e, 0x004e, + 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x004e, 0x004e, 0x004e, 0x004e, + 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x004e, 0x0000, 0x0000, + 0x004e, 0x004e, 0x004e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x005a, 0x005a, 0x005a, 0x005a, 0x005a, 0x005a, 0x005a, 0x005a, 0x005a, 0x005a, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0030, 0x0030, - 0x0000, 0x0030, 0x0000, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, - 0x0000, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, - 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, - 0x0030, 0x0000, 0x0030, 0x0000, 0x0030, 0x0030, 0x0030, 0x0030, + 0x005a, 0x005a, 0x005a, 0x005a, 0x005a, 0x005a, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0030, 0x0030, 0x0000, 0x0030, 0x0000, + 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0000, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, - 0x0030, 0x0030, 0x0000, 0x0000, 0x0030, 0x0030, 0x0030, 0x0030, - 0x0030, 0x0000, 0x0030, 0x0000, 0x0030, 0x0030, 0x0030, 0x0030, - 0x0030, 0x0030, 0x0000, 0x0000, 0x005b, 0x005b, 0x005b, 0x005b, - 0x005b, 0x005b, 0x005b, 0x005b, 0x005b, 0x005b, 0x005b, 0x005b, - 0x005b, 0x005b, 0x005b, 0x005b, 0x0000, 0x005b, 0x005b, 0x005b, + 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0000, 0x0030, + 0x0000, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, + 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0000, + 0x0000, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0000, 0x0030, + 0x0000, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0000, + 0x0000, 0x005b, 0x005b, 0x005b, 0x005b, 0x005b, 0x005b, 0x005b, 0x005b, 0x005b, 0x005b, 0x005b, 0x005b, 0x005b, 0x005b, 0x005b, - 0x005b, 0x005b, 0x0000, 0x0000, 0x0000, 0x005b, 0x005b, 0x005b, - 0x005b, 0x005b, 0x0001, 0x0001, 0x0001, 0x0001, 0x005b, 0x005b, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x003c, 0x003c, 0x003c, + 0x005b, 0x0000, 0x005b, 0x005b, 0x005b, 0x005b, 0x005b, 0x005b, + 0x005b, 0x005b, 0x005b, 0x005b, 0x005b, 0x005b, 0x005b, 0x0000, + 0x0000, 0x0000, 0x005b, 0x005b, 0x005b, 0x005b, 0x005b, 0x0001, + 0x0001, 0x0001, 0x0001, 0x005b, 0x005b, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x003c, 0x003c, 0x003c, 0x003c, 0x003c, 0x003c, 0x003c, 0x003c, 0x003c, 0x003c, 0x003c, 0x003c, 0x003c, 0x003c, - 0x003c, 0x003c, 0x003c, 0x003c, 0x003c, 0x001b, 0x001b, 0x001b, - 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, - 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x0000, 0x001b, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x001b, 0x0000, 0x0000, 0x001b, + 0x003c, 0x003c, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, - 0x001b, 0x001b, 0x0001, 0x001b, 0x001b, 0x001b, 0x001b, 0x0022, + 0x001b, 0x001b, 0x0000, 0x001b, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x001b, 0x0000, 0x0000, 0x001b, 0x001b, 0x001b, 0x001b, + 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x0001, + 0x001b, 0x001b, 0x001b, 0x001b, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, - 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x001a, + 0x0022, 0x0022, 0x0022, 0x0022, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, + 0x001a, 0x001a, 0x001a, 0x001a, 0x0000, 0x001a, 0x001a, 0x001a, + 0x001a, 0x0000, 0x0000, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, + 0x001a, 0x001a, 0x0000, 0x001a, 0x0000, 0x001a, 0x001a, 0x001a, + 0x001a, 0x0000, 0x0000, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, + 0x001a, 0x001a, 0x001a, 0x0000, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x0000, - 0x001a, 0x001a, 0x001a, 0x001a, 0x0000, 0x0000, 0x001a, 0x001a, - 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x0000, 0x001a, 0x0000, - 0x001a, 0x001a, 0x001a, 0x001a, 0x0000, 0x0000, 0x001a, 0x001a, - 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x0000, 0x001a, - 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, - 0x001a, 0x001a, 0x0000, 0x0000, 0x001a, 0x001a, 0x001a, 0x001a, - 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, - 0x001a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0012, + 0x0000, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, + 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0012, 0x0012, 0x0012, 0x0012, 0x0012, 0x0012, 0x0012, 0x0012, 0x0012, 0x0012, 0x0012, 0x0012, - 0x0012, 0x0012, 0x0012, 0x0012, 0x0012, 0x0012, 0x0012, 0x0000, - 0x0000, 0x0012, 0x0012, 0x0012, 0x0012, 0x0012, 0x0012, 0x0000, - 0x0000, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, + 0x0012, 0x0012, 0x0012, 0x0012, 0x0000, 0x0000, 0x0012, 0x0012, + 0x0012, 0x0012, 0x0012, 0x0012, 0x0000, 0x0000, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, - 0x000f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, + 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, - 0x003f, 0x0000, 0x0000, 0x0000, 0x004a, 0x004a, 0x004a, 0x004a, - 0x004a, 0x004a, 0x004a, 0x004a, 0x004a, 0x004a, 0x004a, 0x004a, - 0x004a, 0x004a, 0x004a, 0x004a, 0x0001, 0x0001, 0x0001, 0x004a, + 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x0000, 0x0000, + 0x0000, 0x004a, 0x004a, 0x004a, 0x004a, 0x004a, 0x004a, 0x004a, 0x004a, 0x004a, 0x004a, 0x004a, 0x004a, 0x004a, 0x004a, 0x004a, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0052, + 0x004a, 0x0001, 0x0001, 0x0001, 0x004a, 0x004a, 0x004a, 0x004a, + 0x004a, 0x004a, 0x004a, 0x004a, 0x004a, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0052, 0x0052, 0x0052, 0x0052, 0x0052, 0x0052, 0x0052, 0x0052, 0x0052, 0x0052, 0x0052, 0x0052, - 0x0052, 0x0052, 0x0052, 0x0052, 0x0000, 0x0052, 0x0052, 0x0052, - 0x0052, 0x0052, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0023, 0x0023, 0x0023, + 0x0052, 0x0052, 0x0052, 0x0052, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0052, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0001, 0x0001, 0x0000, + 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, - 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0053, 0x0053, 0x0053, 0x0053, + 0x000e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0053, 0x0053, 0x0053, 0x0053, 0x0053, 0x0053, 0x0053, 0x0053, 0x0053, 0x0053, 0x0053, - 0x0053, 0x0000, 0x0053, 0x0053, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0053, 0x0053, 0x0000, 0x0053, 0x0053, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x002f, 0x002f, 0x002f, 0x002f, 0x002f, 0x002f, 0x002f, 0x002f, 0x002f, 0x002f, 0x002f, 0x002f, 0x002f, 0x002f, 0x002f, - 0x002f, 0x002f, 0x002f, 0x002f, 0x002f, 0x002f, 0x002f, 0x002f, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x003b, 0x003b, - 0x0001, 0x0001, 0x003b, 0x0001, 0x003b, 0x003b, 0x003b, 0x003b, - 0x003b, 0x003b, 0x003b, 0x003b, 0x003b, 0x0000, 0x003b, 0x003b, + 0x002f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x003b, + 0x003b, 0x0001, 0x0001, 0x003b, 0x0001, 0x003b, 0x003b, 0x003b, + 0x003b, 0x003b, 0x003b, 0x003b, 0x003b, 0x003b, 0x003b, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x003b, 0x003b, 0x003b, 0x003b, 0x003b, 0x003b, 0x003b, 0x003b, 0x003b, 0x003b, 0x003b, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x003b, 0x003b, - 0x003b, 0x003b, 0x003b, 0x003b, 0x003b, 0x003b, 0x003b, 0x003b, - 0x003b, 0x003b, 0x003b, 0x003b, 0x003b, 0x003b, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000f, 0x000f, 0x000f, - 0x000f, 0x000f, 0x000f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0033, 0x0033, 0x0033, + 0x003b, 0x003b, 0x003b, 0x003b, 0x003b, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x000f, 0x000f, 0x000f, 0x000f, + 0x000f, 0x000f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0033, 0x0033, 0x0033, 0x0033, 0x0033, 0x0033, 0x0033, 0x0033, 0x0033, 0x0033, 0x0033, 0x0033, - 0x0033, 0x0033, 0x0033, 0x0033, 0x0033, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0033, 0x0000, 0x0000, 0x0000, 0x0033, 0x0033, 0x0033, + 0x0033, 0x0033, 0x0033, 0x0033, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0033, 0x0000, 0x0000, 0x0000, 0x0033, 0x0033, 0x0033, 0x0033, 0x0033, 0x0033, 0x0033, 0x0033, 0x0033, 0x0033, 0x0033, 0x0033, - 0x0033, 0x0054, 0x0054, 0x0054, 0x0054, 0x0054, 0x0054, 0x0054, 0x0054, 0x0054, 0x0054, 0x0054, 0x0054, 0x0054, 0x0054, 0x0054, - 0x0054, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x003d, 0x003d, 0x003d, 0x003d, + 0x0054, 0x0054, 0x0054, 0x0054, 0x0054, 0x0054, 0x0054, 0x0054, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x003d, 0x003d, 0x003d, 0x003d, 0x003d, 0x003d, 0x003d, 0x003d, 0x003d, 0x003d, 0x003d, 0x003d, 0x003d, - 0x003d, 0x003d, 0x003d, 0x003d, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x003d, 0x003d, 0x003d, 0x003d, 0x003d, 0x003d, - 0x003d, 0x003d, 0x003d, 0x003d, 0x003d, 0x0000, 0x0000, 0x0000, - 0x003d, 0x003d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, + 0x003d, 0x003d, 0x003d, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x003d, 0x003d, 0x003d, 0x003d, 0x003d, 0x003d, 0x003d, + 0x003d, 0x003d, 0x003d, 0x003d, 0x0000, 0x0000, 0x0000, 0x003d, + 0x003d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, - 0x000d, 0x000d, 0x0000, 0x0000, 0x000d, 0x000d, 0x0055, 0x0055, + 0x000d, 0x0000, 0x0000, 0x000d, 0x000d, 0x0055, 0x0055, 0x0055, 0x0055, 0x0055, 0x0055, 0x0055, 0x0055, 0x0055, 0x0055, 0x0055, - 0x0055, 0x0055, 0x0055, 0x0055, 0x0055, 0x0055, 0x0000, 0x0000, + 0x0055, 0x0055, 0x0055, 0x0055, 0x0055, 0x0000, 0x0000, 0x0055, 0x0055, 0x0055, 0x0055, 0x0055, 0x0055, 0x0055, 0x0055, 0x0055, - 0x0055, 0x0055, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0002, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0055, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0000, 0x0000, 0x0000, 0x0000, 0x004f, 0x004f, 0x004f, 0x004f, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, + 0x0000, 0x0000, 0x004f, 0x004f, 0x004f, 0x004f, 0x004f, 0x004f, 0x004f, 0x004f, 0x004f, 0x004f, 0x004f, 0x004f, 0x004f, 0x004f, - 0x004f, 0x004f, 0x004f, 0x004f, 0x0008, 0x0008, 0x0008, 0x0008, + 0x004f, 0x004f, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, - 0x0008, 0x0008, 0x0008, 0x0008, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0008, 0x0008, 0x0008, 0x0008, + 0x0008, 0x0008, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0008, 0x0008, 0x0008, 0x0008, 0x0032, 0x0032, 0x0032, 0x0032, 0x0032, 0x0032, 0x0032, 0x0032, 0x0032, 0x0032, - 0x0032, 0x0032, 0x0032, 0x0032, 0x0032, 0x0032, 0x0032, 0x0032, - 0x0000, 0x0000, 0x0000, 0x0032, 0x0032, 0x0032, 0x0032, 0x0032, - 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, + 0x0032, 0x0032, 0x0032, 0x0032, 0x0032, 0x0032, 0x0000, 0x0000, + 0x0000, 0x0032, 0x0032, 0x0032, 0x0032, 0x0032, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, - 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, - 0x0016, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0040, 0x0016, 0x0016, + 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, - 0x001b, 0x001b, 0x001b, 0x0000, 0x0000, 0x001b, 0x001b, 0x001b, - 0x004f, 0x004f, 0x004f, 0x004f, 0x004f, 0x004f, 0x004f, 0x004f, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0002, 0x0002, 0x0002, 0x0001, 0x0002, 0x0002, 0x0002, 0x0002, - 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, - 0x0001, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 0x0001, 0x0001, 0x0001, - 0x0002, 0x0002, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x0016, 0x0031, 0x0031, 0x0031, 0x0031, - 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, - 0x0031, 0x001e, 0x001e, 0x001e, 0x0031, 0x0031, 0x0031, 0x0031, - 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0031, 0x0031, 0x0031, - 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0016, 0x0031, 0x0031, + 0x001b, 0x0000, 0x0000, 0x001b, 0x001b, 0x001b, 0x004f, 0x004f, + 0x004f, 0x004f, 0x004f, 0x004f, 0x004f, 0x004f, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0002, 0x0002, + 0x0002, 0x0001, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0001, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0002, 0x0001, 0x0001, 0x0001, 0x0002, 0x0002, + 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0031, 0x0031, + 0x0031, 0x0031, 0x0031, 0x0031, 0x001e, 0x001e, 0x001e, 0x001e, + 0x001e, 0x0016, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, + 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x001e, + 0x001e, 0x001e, 0x0031, 0x0031, 0x0031, 0x0031, 0x001e, 0x001e, + 0x001e, 0x001e, 0x001e, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, + 0x0031, 0x0031, 0x0031, 0x0016, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, - 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x001e, 0x0002, 0x0002, - 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, - 0x0000, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x001e, 0x0000, 0x0000, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x001e, 0x0000, 0x0000, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0000, 0x001e, - 0x0000, 0x001e, 0x0000, 0x001e, 0x0000, 0x001e, 0x001e, 0x001e, + 0x0031, 0x0031, 0x0031, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, + 0x001e, 0x0000, 0x0000, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, + 0x001e, 0x0000, 0x0000, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, + 0x001e, 0x001e, 0x001e, 0x0000, 0x001e, 0x0000, 0x001e, 0x0000, + 0x001e, 0x0000, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x0000, 0x0000, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x0000, 0x001e, 0x001e, 0x001e, 0x0000, - 0x0000, 0x001e, 0x001e, 0x001e, 0x0000, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0000, 0x0001, + 0x0000, 0x0000, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, + 0x0000, 0x001e, 0x001e, 0x001e, 0x0000, 0x0000, 0x001e, 0x001e, + 0x001e, 0x0000, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, + 0x001e, 0x001e, 0x001e, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0002, 0x0002, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0031, 0x0000, 0x0000, + 0x0002, 0x0002, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0031, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0031, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0000, 0x0031, 0x0031, 0x0031, 0x0031, - 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, - 0x0031, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x001e, 0x0001, 0x0001, 0x0001, 0x0031, 0x0031, + 0x0031, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0031, 0x0001, - 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, - 0x0031, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, + 0x0000, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, + 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0000, 0x0000, + 0x0000, 0x0002, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x001e, + 0x0001, 0x0001, 0x0001, 0x0031, 0x0031, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, - 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0031, 0x0001, 0x0031, 0x0031, 0x0031, + 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0001, 0x0001, + 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000c, 0x000c, 0x000c, + 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, + 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001c, 0x001c, 0x0000, 0x0013, 0x0013, 0x0013, 0x0013, 0x0013, + 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x0013, 0x0013, 0x0013, 0x0013, 0x0013, 0x0013, 0x0013, 0x0013, 0x0013, - 0x0013, 0x0013, 0x0013, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0013, 0x0013, 0x0013, 0x0013, 0x0013, 0x0013, 0x0013, 0x005c, + 0x0013, 0x0013, 0x0013, 0x0013, 0x0013, 0x0013, 0x0013, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0013, 0x0013, 0x0013, 0x0013, + 0x0013, 0x0013, 0x0013, 0x005c, 0x005c, 0x005c, 0x005c, 0x005c, 0x005c, 0x005c, 0x005c, 0x005c, 0x005c, 0x005c, 0x005c, 0x005c, - 0x005c, 0x005c, 0x005c, 0x005c, 0x005c, 0x005c, 0x005c, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x005c, 0x0000, + 0x005c, 0x005c, 0x005c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x005c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x005c, 0x001a, 0x001a, - 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x001a, 0x001a, - 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x0000, 0x001a, 0x001a, - 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x0000, 0x0001, 0x0001, - 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0021, 0x0021, + 0x0000, 0x005c, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, + 0x001a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, + 0x001a, 0x0000, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, + 0x001a, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0000, 0x0000, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, - 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0000, 0x0021, - 0x0021, 0x0021, 0x0021, 0x0021, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0000, 0x0000, + 0x0021, 0x0021, 0x0000, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0021, 0x0021, 0x0021, 0x0021, + 0x0021, 0x0021, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0021, 0x0001, 0x0021, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, - 0x0021, 0x0002, 0x0002, 0x0002, 0x0002, 0x0022, 0x0022, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0021, - 0x0021, 0x0021, 0x0021, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0021, 0x0001, 0x0021, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0021, 0x0021, 0x0021, 0x0021, + 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0002, 0x0002, 0x0002, + 0x0002, 0x0022, 0x0022, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0021, 0x0021, 0x0021, 0x0021, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0000, 0x0025, 0x0025, 0x0025, 0x0025, 0x0025, 0x0025, 0x0025, 0x0025, 0x0025, 0x0025, 0x0025, 0x0025, - 0x0025, 0x0025, 0x0025, 0x0025, 0x0025, 0x0025, 0x0025, 0x0025, - 0x0000, 0x0000, 0x0002, 0x0002, 0x0001, 0x0001, 0x0025, 0x0025, - 0x0025, 0x0001, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, + 0x0025, 0x0025, 0x0025, 0x0025, 0x0000, 0x0000, 0x0002, 0x0002, + 0x0001, 0x0001, 0x0025, 0x0025, 0x0025, 0x0001, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, - 0x002c, 0x002c, 0x0001, 0x0001, 0x002c, 0x002c, 0x002c, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, + 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x0001, 0x0001, + 0x002c, 0x002c, 0x002c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, - 0x000a, 0x000a, 0x000a, 0x000a, 0x0000, 0x0022, 0x0022, 0x0022, + 0x0000, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, - 0x0022, 0x0022, 0x0022, 0x0022, 0x0000, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0022, 0x0022, 0x0022, + 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, - 0x0022, 0x0022, 0x0022, 0x0022, 0x0001, 0x002c, 0x002c, 0x002c, - 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0021, 0x0021, 0x0021, - 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, - 0x0021, 0x0021, 0x0000, 0x0000, 0x0000, 0x005f, 0x005f, 0x005f, + 0x0001, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, 0x002c, + 0x002c, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x005f, 0x005f, 0x005f, 0x005f, 0x005f, 0x005f, 0x005f, 0x005f, 0x005f, 0x005f, 0x005f, 0x005f, 0x005f, 0x005f, 0x005f, - 0x005f, 0x005f, 0x005f, 0x005f, 0x005f, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0035, 0x0035, + 0x005f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0035, 0x0035, 0x0035, 0x0035, 0x0035, 0x0035, 0x0035, 0x0035, 0x0035, 0x0035, 0x0035, 0x0035, 0x0035, 0x0035, - 0x0035, 0x0035, 0x0035, 0x0035, 0x0035, 0x0035, 0x005e, 0x005e, + 0x0035, 0x0035, 0x005e, 0x005e, 0x005e, 0x005e, 0x005e, 0x005e, 0x005e, 0x005e, 0x005e, 0x005e, 0x005e, 0x005e, 0x005e, 0x005e, - 0x005e, 0x005e, 0x005e, 0x005e, 0x005e, 0x005e, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0007, 0x0007, 0x0007, 0x0007, 0x0007, 0x0007, + 0x005e, 0x005e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0007, 0x0007, 0x0007, 0x0007, 0x0007, 0x0007, 0x0007, 0x0007, 0x0007, 0x0007, - 0x0007, 0x0007, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, - 0x0031, 0x0031, 0x0001, 0x0001, 0x0001, 0x0031, 0x0031, 0x0031, - 0x0031, 0x0031, 0x0000, 0x0000, 0x0031, 0x0031, 0x0031, 0x0031, - 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, - 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0050, 0x0050, 0x0050, + 0x0007, 0x0007, 0x0007, 0x0007, 0x0007, 0x0007, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0031, 0x0031, + 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0001, 0x0001, + 0x0001, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, + 0x0031, 0x0031, 0x0031, 0x0031, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0031, 0x0031, 0x0000, 0x0031, 0x0000, 0x0031, 0x0031, + 0x0031, 0x0031, 0x0031, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, + 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, - 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0000, 0x0000, 0x0000, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0047, 0x0047, 0x0047, 0x0047, 0x0047, 0x0047, 0x0047, 0x0047, + 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0000, + 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0047, 0x0047, 0x0047, 0x0047, 0x0047, 0x0047, 0x0047, 0x0047, 0x0047, 0x0047, 0x0047, 0x0047, 0x0047, 0x0047, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, + 0x0047, 0x0047, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, 0x004c, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x004c, 0x004c, 0x002d, 0x002d, 0x002d, 0x002d, 0x002d, 0x002d, + 0x004c, 0x004c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x004c, 0x004c, 0x002d, 0x002d, 0x002d, 0x002d, 0x002d, 0x002d, 0x002d, 0x002d, 0x002d, 0x002d, 0x002d, 0x002d, - 0x002d, 0x002d, 0x0001, 0x002d, 0x0049, 0x0049, 0x0049, 0x0049, + 0x002d, 0x002d, 0x002d, 0x002d, 0x0001, 0x002d, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, - 0x0049, 0x0049, 0x0049, 0x0049, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0049, - 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, - 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0000, 0x0000, 0x0000, - 0x0029, 0x0029, 0x0029, 0x0029, 0x0029, 0x0029, 0x0029, 0x0029, + 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0049, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, + 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0000, + 0x0000, 0x0000, 0x0029, 0x0029, 0x0029, 0x0029, 0x0029, 0x0029, 0x0029, 0x0029, 0x0029, 0x0029, 0x0029, 0x0029, 0x0029, 0x0029, - 0x0000, 0x0001, 0x0029, 0x0029, 0x0029, 0x0029, 0x0029, 0x0029, - 0x0029, 0x0029, 0x0029, 0x0029, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0029, 0x0029, 0x003c, 0x003c, 0x003c, 0x003c, 0x003c, 0x003c, + 0x0029, 0x0029, 0x0000, 0x0001, 0x0029, 0x0029, 0x0029, 0x0029, + 0x0029, 0x0029, 0x0029, 0x0029, 0x0029, 0x0029, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0029, 0x0029, 0x003c, 0x003c, 0x003c, 0x003c, 0x003c, 0x003c, 0x003c, 0x003c, 0x003c, 0x003c, 0x003c, 0x003c, - 0x003c, 0x0000, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x003c, 0x003c, 0x003c, 0x0000, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0000, 0x0000, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0056, 0x0056, 0x0056, 0x0056, 0x0056, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0000, + 0x0000, 0x0011, 0x0011, 0x0011, 0x0011, 0x0056, 0x0056, 0x0056, 0x0056, 0x0056, 0x0056, 0x0056, 0x0056, 0x0056, 0x0056, 0x0056, - 0x0056, 0x0056, 0x0056, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0056, 0x0056, 0x0056, 0x0056, 0x0056, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0056, 0x0056, 0x0056, 0x0056, 0x0056, 0x003a, 0x003a, 0x003a, + 0x0000, 0x0000, 0x0056, 0x0056, 0x0056, 0x0056, 0x0056, 0x003a, 0x003a, 0x003a, 0x003a, 0x003a, 0x003a, 0x003a, 0x003a, 0x003a, - 0x003a, 0x003a, 0x003a, 0x003a, 0x003a, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x001a, 0x001a, - 0x001a, 0x001a, 0x001a, 0x001a, 0x0000, 0x0000, 0x001a, 0x001a, - 0x001a, 0x001a, 0x001a, 0x001a, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0031, 0x0031, 0x0031, - 0x0031, 0x0031, 0x001e, 0x0031, 0x0031, 0x0031, 0x0031, 0x0001, - 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0022, 0x0022, 0x0022, - 0x0022, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0022, 0x0022, 0x0022, - 0x0022, 0x0022, 0x0022, 0x0022, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, - 0x0022, 0x0022, 0x0022, 0x0022, 0x0000, 0x0000, 0x0000, 0x0000, + 0x003a, 0x003a, 0x003a, 0x003a, 0x003a, 0x003a, 0x003a, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x0000, 0x0000, + 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0031, + 0x0031, 0x0031, 0x0031, 0x0031, 0x001e, 0x0031, 0x0031, 0x0031, + 0x0031, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0022, + 0x0022, 0x0022, 0x0022, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0022, + 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, + 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, - 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0021, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0031, 0x0031, 0x0031, 0x0031, - 0x0031, 0x0031, 0x0031, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0024, 0x0024, - 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0000, 0x0024, 0x0024, - 0x0024, 0x0024, 0x0024, 0x0000, 0x0024, 0x0000, 0x0024, 0x0024, - 0x0000, 0x0024, 0x0024, 0x0000, 0x0024, 0x0024, 0x0024, 0x0024, - 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0003, 0x0003, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0031, 0x0031, + 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0000, + 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0000, 0x0024, 0x0000, + 0x0024, 0x0024, 0x0000, 0x0024, 0x0024, 0x0000, 0x0024, 0x0024, + 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, + 0x0003, 0x0003, 0x0003, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, - 0x0003, 0x0003, 0x0003, 0x0003, 0x0001, 0x0001, 0x0003, 0x0003, + 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0001, 0x0001, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, - 0x0003, 0x0003, 0x0003, 0x0003, 0x0000, 0x0000, 0x0002, 0x0002, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, - 0x0002, 0x0002, 0x0002, 0x0002, 0x0016, 0x0016, 0x0001, 0x0001, - 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0016, 0x0016, + 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0000, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, diff --git a/dlls/dwrite/scripts.h b/dlls/dwrite/scripts.h index d1bdb49de4d..594d9edea87 100644 --- a/dlls/dwrite/scripts.h +++ b/dlls/dwrite/scripts.h @@ -1,5 +1,5 @@ /* Unicode Script IDs */ -/* generated from https://www.unicode.org/Public/13.0.0/ucd/UCD.zip:Scripts.txt */ +/* generated from https://www.unicode.org/Public/14.0.0/ucd/UCD.zip:Scripts.txt */ /* DO NOT EDIT!! */ enum unicode_script_id { diff --git a/dlls/dwrite/shapers/arabic_table.c b/dlls/dwrite/shapers/arabic_table.c index a0c677e02f9..503c8a15420 100644 --- a/dlls/dwrite/shapers/arabic_table.c +++ b/dlls/dwrite/shapers/arabic_table.c @@ -1,5 +1,5 @@ /* Unicode Arabic shaping */ -/* generated from https://www.unicode.org/Public/13.0.0/ucd/UCD.zip:ArabicShaping.txt */ +/* generated from https://www.unicode.org/Public/14.0.0/ucd/UCD.zip:ArabicShaping.txt */ /* DO NOT EDIT!! */ #include "windef.h" @@ -10,10 +10,10 @@ const unsigned short DECLSPEC_HIDDEN arabic_shaping_table[2099] = 0x0100, 0x010b, 0x010b, 0x011b, 0x0123, 0x012c, 0x013b, 0x014b, 0x015b, 0x016b, 0x017b, 0x018b, 0x019b, 0x01ab, 0x01b9, 0x01c8, 0x01d6, 0x010b, 0x010b, 0x01e1, 0x010b, 0x010b, 0x010b, 0x01f0, - 0x0200, 0x020e, 0x021d, 0x022d, 0x023d, 0x024d, 0x010b, 0x010b, - 0x025d, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, - 0x010b, 0x010b, 0x010b, 0x010b, 0x026d, 0x027d, 0x010b, 0x010b, - 0x028d, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, + 0x0200, 0x020e, 0x021d, 0x022d, 0x023d, 0x010f, 0x010b, 0x010b, + 0x024d, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, + 0x010b, 0x010b, 0x010b, 0x010b, 0x025d, 0x026d, 0x010b, 0x010b, + 0x027d, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, @@ -27,8 +27,8 @@ const unsigned short DECLSPEC_HIDDEN arabic_shaping_table[2099] = 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, - 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x0297, 0x010b, - 0x02a7, 0x02b7, 0x02c6, 0x02d6, 0x010b, 0x010b, 0x010b, 0x010b, + 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x0287, 0x010b, + 0x0297, 0x02a7, 0x02b6, 0x02c6, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, @@ -38,75 +38,73 @@ const unsigned short DECLSPEC_HIDDEN arabic_shaping_table[2099] = 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, - 0x010b, 0x010b, 0x010b, 0x02e5, 0x010b, 0x010b, 0x02f5, 0x0305, + 0x010b, 0x010b, 0x010b, 0x02d5, 0x010b, 0x010b, 0x02e5, 0x02f5, /* level 2 offsets */ - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0318, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0328, 0x0328, 0x0328, 0x0328, 0x0328, - 0x0328, 0x0328, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0338, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0327, 0x0328, 0x0348, - 0x0356, 0x0315, 0x0315, 0x0315, 0x0366, 0x0376, 0x0385, 0x038d, - 0x0328, 0x039d, 0x03ad, 0x03b5, 0x03bd, 0x03c7, 0x03c7, 0x03d7, - 0x03e7, 0x03ef, 0x03ff, 0x0316, 0x040f, 0x041e, 0x0328, 0x042e, - 0x043c, 0x0448, 0x0457, 0x0315, 0x0315, 0x0342, 0x0467, 0x046d, - 0x03c7, 0x0477, 0x0483, 0x0315, 0x0491, 0x049d, 0x0315, 0x04ad, - 0x04b9, 0x04c9, 0x0315, 0x0315, 0x0315, 0x04d9, 0x04e8, 0x04f2, - 0x0345, 0x0502, 0x0328, 0x039a, 0x0315, 0x0315, 0x0512, 0x0521, - 0x0530, 0x053e, 0x0315, 0x054d, 0x0315, 0x0315, 0x0542, 0x055c, - 0x0315, 0x053e, 0x0317, 0x056b, 0x0315, 0x0315, 0x0542, 0x057a, - 0x054d, 0x0315, 0x0586, 0x056b, 0x0315, 0x0315, 0x0542, 0x0595, - 0x0315, 0x053e, 0x05a3, 0x054d, 0x0315, 0x0315, 0x0319, 0x055c, - 0x053b, 0x053e, 0x0315, 0x054c, 0x0315, 0x0315, 0x0315, 0x0541, - 0x0315, 0x0315, 0x0315, 0x05b2, 0x0315, 0x0315, 0x054f, 0x05c2, - 0x053b, 0x053e, 0x0315, 0x054d, 0x0315, 0x0315, 0x0319, 0x05d0, - 0x0315, 0x053e, 0x0315, 0x039b, 0x0315, 0x0315, 0x0570, 0x055c, - 0x0315, 0x053e, 0x0315, 0x054d, 0x0315, 0x0315, 0x0315, 0x0544, - 0x05de, 0x0315, 0x0315, 0x0315, 0x052d, 0x05e7, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x05f6, 0x05a5, 0x0315, 0x0315, - 0x0315, 0x0538, 0x0315, 0x0603, 0x0315, 0x0315, 0x0315, 0x0347, - 0x0613, 0x0620, 0x0328, 0x032b, 0x0548, 0x0315, 0x0315, 0x0315, - 0x0550, 0x062f, 0x0315, 0x0573, 0x0467, 0x063e, 0x064c, 0x0318, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0550, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x065a, 0x0315, 0x065a, 0x0315, 0x053e, 0x0315, 0x053e, - 0x0315, 0x0315, 0x0315, 0x0666, 0x031f, 0x0670, 0x0315, 0x0315, - 0x067e, 0x0315, 0x03c7, 0x03c7, 0x03c7, 0x03c7, 0x03c7, 0x068e, - 0x0699, 0x03c7, 0x06a0, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x06b0, 0x06be, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x06ca, 0x0315, - 0x0315, 0x0315, 0x06d6, 0x06e4, 0x06f1, 0x0315, 0x0315, 0x0315, - 0x0328, 0x0467, 0x0315, 0x0315, 0x0315, 0x0399, 0x0315, 0x0315, - 0x0701, 0x054c, 0x0315, 0x070e, 0x0399, 0x039b, 0x0315, 0x071e, - 0x0315, 0x0315, 0x0315, 0x072c, 0x039b, 0x0315, 0x0315, 0x0551, - 0x073b, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x074b, 0x075a, 0x0763, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0328, 0x0328, 0x0328, 0x0751, 0x076d, 0x0315, 0x058c, - 0x0315, 0x0315, 0x0315, 0x077b, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0328, 0x0328, 0x0467, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0316, 0x039b, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0316, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0328, 0x0328, 0x0315, 0x0315, 0x0553, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x078b, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0316, 0x079b, 0x0315, - 0x054f, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x039b, 0x07a9, - 0x0315, 0x07b5, 0x0315, 0x03c7, 0x03c7, 0x03c7, 0x07c5, 0x0315, - 0x0315, 0x0315, 0x0315, 0x053c, 0x0315, 0x0328, 0x056c, 0x0315, - 0x0315, 0x07cf, 0x0315, 0x035f, 0x039b, 0x0315, 0x0315, 0x039a, - 0x0315, 0x0315, 0x07dd, 0x0315, 0x0315, 0x0549, 0x0315, 0x0315, - 0x05a4, 0x07e8, 0x07f5, 0x0315, 0x0315, 0x0542, 0x0315, 0x0315, - 0x0315, 0x0805, 0x054d, 0x0315, 0x056f, 0x0548, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0815, 0x0315, 0x0317, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0328, 0x0315, 0x0328, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0316, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0823, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0308, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0318, 0x0318, 0x0318, 0x0318, 0x0318, + 0x0318, 0x0318, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0328, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0317, 0x0318, 0x0338, + 0x0346, 0x0305, 0x0305, 0x0305, 0x0356, 0x0366, 0x0375, 0x037d, + 0x0318, 0x038d, 0x039d, 0x03a5, 0x03ad, 0x03b7, 0x03b7, 0x03c7, + 0x03d7, 0x03df, 0x03ef, 0x0306, 0x03ff, 0x040e, 0x0318, 0x041e, + 0x042c, 0x0438, 0x0447, 0x0305, 0x0305, 0x0332, 0x0457, 0x045d, + 0x03b7, 0x0467, 0x0473, 0x0305, 0x0481, 0x048d, 0x0305, 0x049d, + 0x04a9, 0x04b9, 0x04c9, 0x04d6, 0x034e, 0x04e6, 0x04f5, 0x04ff, + 0x0318, 0x050d, 0x0318, 0x038a, 0x0305, 0x0305, 0x051d, 0x052c, + 0x053b, 0x0549, 0x0305, 0x0558, 0x0305, 0x0305, 0x054d, 0x0567, + 0x0305, 0x0549, 0x0307, 0x0576, 0x0305, 0x0305, 0x054d, 0x0585, + 0x0558, 0x0305, 0x0591, 0x0576, 0x0305, 0x0305, 0x054d, 0x05a0, + 0x0305, 0x0549, 0x05ae, 0x0558, 0x0305, 0x0305, 0x0309, 0x0567, + 0x0546, 0x0549, 0x0305, 0x0557, 0x0305, 0x0305, 0x0305, 0x054c, + 0x0305, 0x0305, 0x0305, 0x05bd, 0x0305, 0x0305, 0x05c2, 0x05d1, + 0x0546, 0x0549, 0x0305, 0x0558, 0x0305, 0x0305, 0x0309, 0x05df, + 0x0305, 0x0549, 0x0305, 0x038b, 0x0305, 0x0305, 0x057b, 0x0567, + 0x0305, 0x0549, 0x0305, 0x0558, 0x0305, 0x0305, 0x0305, 0x054f, + 0x05ed, 0x0305, 0x0305, 0x0305, 0x0538, 0x05f6, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0605, 0x05b0, 0x0305, 0x0305, + 0x0305, 0x0543, 0x0305, 0x0612, 0x0305, 0x0305, 0x0305, 0x0337, + 0x0622, 0x062f, 0x0318, 0x031b, 0x0553, 0x0305, 0x0305, 0x0305, + 0x055b, 0x063e, 0x0305, 0x057e, 0x0457, 0x064d, 0x065b, 0x0308, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x055b, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0669, 0x0305, 0x0549, 0x0305, 0x0549, 0x0305, 0x0549, + 0x0305, 0x0305, 0x0305, 0x0675, 0x030f, 0x067f, 0x0305, 0x0305, + 0x068d, 0x0305, 0x03b7, 0x03b7, 0x03b7, 0x03b7, 0x03b7, 0x069d, + 0x06a8, 0x03b7, 0x06af, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x06bf, 0x06cd, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x06d9, 0x0305, + 0x0305, 0x0305, 0x06e5, 0x06f3, 0x0700, 0x0305, 0x0305, 0x0305, + 0x0318, 0x0319, 0x0305, 0x0305, 0x0305, 0x0389, 0x0305, 0x0305, + 0x0710, 0x0557, 0x0305, 0x071d, 0x0389, 0x038b, 0x0305, 0x072d, + 0x0305, 0x0305, 0x0305, 0x073b, 0x038b, 0x0305, 0x0305, 0x055c, + 0x074a, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x050c, 0x075a, 0x0763, 0x076d, 0x0305, 0x0597, + 0x0305, 0x0305, 0x0305, 0x077b, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0318, 0x0318, 0x0457, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0306, 0x038b, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0306, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0318, 0x0318, 0x0305, 0x0305, 0x055e, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x078b, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0306, 0x079b, 0x0305, + 0x055a, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x038b, 0x07a9, + 0x0305, 0x07b5, 0x0305, 0x03b7, 0x03b7, 0x03b7, 0x07c5, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0547, 0x0305, 0x0318, 0x0577, 0x0305, + 0x0305, 0x07cf, 0x0305, 0x034f, 0x038b, 0x0305, 0x0305, 0x038a, + 0x0305, 0x0305, 0x07dd, 0x0305, 0x0305, 0x0554, 0x0305, 0x0305, + 0x05af, 0x07e8, 0x07f5, 0x0305, 0x0305, 0x054d, 0x0305, 0x0305, + 0x0305, 0x0805, 0x0558, 0x0305, 0x057a, 0x0553, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0815, 0x0305, 0x0307, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0318, 0x0305, 0x0318, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0306, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0823, /* values */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -164,87 +162,89 @@ const unsigned short DECLSPEC_HIDDEN arabic_shaping_table[2099] = 0x0002, 0x0003, 0x0002, 0x0002, 0x0002, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, 0x0000, 0x0003, 0x0003, 0x0003, 0x0003, 0x0000, 0x0002, 0x0003, 0x0002, 0x0002, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, 0x0003, 0x0003, 0x0003, - 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0002, 0x0002, - 0x0002, 0x0000, 0x0002, 0x0003, 0x0002, 0x0002, 0x0003, 0x0003, - 0x0000, 0x0003, 0x0003, 0x0003, 0x0002, 0x0003, 0x0003, 0x0003, - 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0002, 0x0002, 0x0002, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0000, 0x0000, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0002, + 0x0000, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0003, 0x0003, 0x0002, 0x0002, 0x0002, 0x0000, 0x0002, + 0x0003, 0x0002, 0x0002, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0002, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0003, 0x0003, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, - 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, - 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, - 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, - 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, - 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, + 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, 0x0000, 0x0006, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, + 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, - 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, + 0x0000, 0x0006, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, + 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, 0x0000, 0x0006, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, + 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0003, 0x0000, 0x0000, 0x0003, 0x0006, 0x0006, 0x0006, 0x0000, - 0x0000, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, - 0x0003, 0x0003, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0006, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, - 0x0003, 0x0003, 0x0003, 0x0003, 0x0006, 0x0003, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, + 0x0000, 0x0000, 0x0003, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, + 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0006, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0003, 0x0003, 0x0006, 0x0003, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, - 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, - 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, + 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, + 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, - 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, - 0x0000, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, + 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, - 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, - 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, diff --git a/dlls/gdi32/uniscribe/bracket.c b/dlls/gdi32/uniscribe/bracket.c index a4ca55bafba..9170a7ceeb9 100644 --- a/dlls/gdi32/uniscribe/bracket.c +++ b/dlls/gdi32/uniscribe/bracket.c @@ -1,5 +1,5 @@ /* Unicode Bidirectional Bracket table */ -/* generated from https://www.unicode.org/Public/13.0.0/ucd/UCD.zip:BidiBrackets.txt */ +/* generated from https://www.unicode.org/Public/14.0.0/ucd/UCD.zip:BidiBrackets.txt */ /* DO NOT EDIT!! */ #include "windef.h" @@ -52,7 +52,7 @@ const unsigned short DECLSPEC_HIDDEN bidi_bracket_table[572] = 0x01ca, 0x01d4, 0x019c, 0x019c, 0x019c, 0x019c, 0x01a7, 0x019c, 0x01de, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x01e1, 0x01f1, 0x019c, 0x019c, 0x019c, 0x01be, 0x019c, - 0x01a0, 0x019c, 0x019c, 0x01d0, 0x019c, 0x019c, 0x019c, 0x019c, + 0x01a0, 0x019c, 0x019c, 0x01d0, 0x019c, 0x019c, 0x01cd, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x01ca, 0x0201, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, 0x019c, diff --git a/dlls/gdi32/uniscribe/direction.c b/dlls/gdi32/uniscribe/direction.c index 4c5c400762e..d7001c4997c 100644 --- a/dlls/gdi32/uniscribe/direction.c +++ b/dlls/gdi32/uniscribe/direction.c @@ -3,7 +3,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN bidi_direction_table[3313] = +const unsigned short DECLSPEC_HIDDEN bidi_direction_table[3351] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0115, 0x0125, 0x0135, 0x013e, 0x014e, 0x015e, @@ -49,50 +49,50 @@ const unsigned short DECLSPEC_HIDDEN bidi_direction_table[3313] = 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0559, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0563, 0x0573, 0x052d, 0x0575, 0x0583, 0x0593, 0x0598, 0x05a7, 0x05b7, 0x05c7, - 0x05d5, 0x05d5, 0x05da, 0x052d, 0x05ea, 0x05fa, 0x05d5, 0x05d5, - 0x05d5, 0x05d5, 0x05d5, 0x0604, 0x0613, 0x0623, 0x062d, 0x05f9, - 0x05d5, 0x052d, 0x063d, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, - 0x064a, 0x0659, 0x0593, 0x0593, 0x0669, 0x0675, 0x0593, 0x0683, - 0x068f, 0x0594, 0x0593, 0x069f, 0x06af, 0x04df, 0x04df, 0x04df, - 0x05d5, 0x06bf, 0x06c7, 0x06d4, 0x06e2, 0x052d, 0x06ef, 0x04df, - 0x04df, 0x06f5, 0x0704, 0x055b, 0x0712, 0x04df, 0x0721, 0x04df, - 0x04df, 0x0716, 0x0730, 0x04df, 0x0712, 0x073e, 0x074d, 0x04df, - 0x04df, 0x0716, 0x075c, 0x0721, 0x04df, 0x0768, 0x074d, 0x04df, - 0x04df, 0x0716, 0x0777, 0x04df, 0x0712, 0x0786, 0x0721, 0x04df, - 0x04df, 0x0796, 0x0730, 0x07a6, 0x0712, 0x04df, 0x0720, 0x04df, - 0x04df, 0x04df, 0x0715, 0x04df, 0x04df, 0x07b3, 0x07c3, 0x04df, - 0x04df, 0x0723, 0x07d3, 0x07a6, 0x0712, 0x07e1, 0x0721, 0x04df, - 0x04df, 0x0716, 0x0751, 0x04df, 0x0712, 0x04df, 0x07f1, 0x04df, - 0x04df, 0x0752, 0x0730, 0x04df, 0x0712, 0x04df, 0x0721, 0x04df, - 0x04df, 0x04df, 0x0718, 0x07ff, 0x04df, 0x04df, 0x04df, 0x080e, - 0x081e, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x082d, - 0x0788, 0x04df, 0x04df, 0x04df, 0x083a, 0x04df, 0x0845, 0x04df, - 0x04df, 0x04df, 0x0854, 0x085e, 0x086b, 0x052d, 0x0530, 0x071c, - 0x04df, 0x04df, 0x04df, 0x0724, 0x087a, 0x04df, 0x0755, 0x0888, - 0x0897, 0x08a5, 0x08b3, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04df, 0x0724, 0x04df, 0x04df, 0x04df, 0x08c3, 0x04df, 0x04df, + 0x05d2, 0x05d2, 0x05d7, 0x052d, 0x05e7, 0x05d1, 0x05d2, 0x05d2, + 0x05d2, 0x05d2, 0x05d2, 0x05f4, 0x0603, 0x0613, 0x061d, 0x062c, + 0x05d2, 0x052d, 0x063c, 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x05d2, + 0x0636, 0x064c, 0x0593, 0x0593, 0x065c, 0x0668, 0x0593, 0x0676, + 0x0682, 0x0594, 0x0593, 0x0692, 0x06a2, 0x05d2, 0x06b2, 0x06c2, + 0x05d2, 0x05d2, 0x0632, 0x052d, 0x06d0, 0x052d, 0x06dd, 0x04df, + 0x04df, 0x06e3, 0x06f2, 0x055b, 0x0700, 0x04df, 0x070f, 0x04df, + 0x04df, 0x0704, 0x071e, 0x04df, 0x0700, 0x072c, 0x073b, 0x04df, + 0x04df, 0x0704, 0x074a, 0x070f, 0x04df, 0x0756, 0x073b, 0x04df, + 0x04df, 0x0704, 0x0765, 0x04df, 0x0700, 0x0774, 0x070f, 0x04df, + 0x04df, 0x0784, 0x071e, 0x0794, 0x0700, 0x04df, 0x070e, 0x04df, + 0x04df, 0x04df, 0x0703, 0x04df, 0x04df, 0x07a1, 0x07b1, 0x04df, + 0x04df, 0x07b6, 0x07c5, 0x0794, 0x0700, 0x07d3, 0x070f, 0x04df, + 0x04df, 0x0704, 0x073f, 0x04df, 0x0700, 0x04df, 0x07e3, 0x04df, + 0x04df, 0x0740, 0x071e, 0x04df, 0x0700, 0x04df, 0x070f, 0x04df, + 0x04df, 0x04df, 0x0706, 0x07f1, 0x04df, 0x04df, 0x04df, 0x0800, + 0x0810, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x081f, + 0x0776, 0x04df, 0x04df, 0x04df, 0x082c, 0x04df, 0x0837, 0x04df, + 0x04df, 0x04df, 0x0846, 0x0850, 0x085d, 0x052d, 0x0530, 0x070a, + 0x04df, 0x04df, 0x04df, 0x0712, 0x086c, 0x04df, 0x0743, 0x087a, + 0x0889, 0x0897, 0x08a5, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, + 0x04df, 0x0712, 0x04df, 0x04df, 0x04df, 0x08b5, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0485, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x08d3, 0x08d8, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x08e6, 0x04df, 0x08e6, 0x04df, - 0x0712, 0x04df, 0x0712, 0x04df, 0x04df, 0x04df, 0x08f2, 0x0809, - 0x08fc, 0x04df, 0x08c3, 0x090c, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x07a6, 0x04df, 0x0719, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x091c, 0x092a, 0x093a, 0x04df, 0x04df, + 0x04df, 0x04df, 0x04df, 0x04df, 0x08c5, 0x08ca, 0x04df, 0x04df, + 0x04df, 0x04df, 0x04df, 0x04df, 0x08d8, 0x04df, 0x0700, 0x04df, + 0x0700, 0x04df, 0x0700, 0x04df, 0x04df, 0x04df, 0x08e4, 0x07fb, + 0x08ee, 0x04df, 0x08b5, 0x08fe, 0x04df, 0x04df, 0x04df, 0x04df, + 0x04df, 0x04df, 0x04df, 0x0794, 0x04df, 0x0707, 0x04df, 0x04df, + 0x04df, 0x04df, 0x04df, 0x090d, 0x091b, 0x092b, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0487, 0x051d, - 0x051d, 0x04df, 0x0943, 0x04df, 0x04df, 0x04df, 0x094f, 0x095d, - 0x096a, 0x04df, 0x04df, 0x04df, 0x052d, 0x0888, 0x04df, 0x04df, - 0x04df, 0x06ee, 0x04df, 0x04df, 0x097a, 0x0720, 0x04df, 0x0987, - 0x06ee, 0x07f1, 0x04df, 0x0997, 0x04df, 0x04df, 0x04df, 0x09a5, - 0x07f1, 0x04df, 0x04df, 0x0725, 0x09b4, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x09c4, 0x09d3, - 0x09dc, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, + 0x051d, 0x04df, 0x0934, 0x04df, 0x04df, 0x04df, 0x0940, 0x094e, + 0x095b, 0x04df, 0x04df, 0x04df, 0x052d, 0x052e, 0x04df, 0x04df, + 0x04df, 0x06dc, 0x04df, 0x04df, 0x096b, 0x070e, 0x04df, 0x0978, + 0x06dc, 0x07e3, 0x04df, 0x0988, 0x04df, 0x04df, 0x04df, 0x0996, + 0x07e3, 0x04df, 0x04df, 0x0713, 0x09a5, 0x04df, 0x04df, 0x04df, + 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x09b5, 0x09c4, + 0x09cd, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x052d, 0x052d, 0x052d, - 0x09ca, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x09e6, 0x0498, 0x0488, 0x0488, - 0x08d6, 0x09f6, 0x051d, 0x0a06, 0x0a16, 0x0a22, 0x0a27, 0x0a37, - 0x0a47, 0x0a57, 0x04df, 0x0a67, 0x0a67, 0x04df, 0x052d, 0x052d, - 0x0888, 0x0a77, 0x0a83, 0x0a91, 0x0aa0, 0x0ab0, 0x051d, 0x04df, + 0x052d, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, + 0x04df, 0x04df, 0x04df, 0x04df, 0x09d7, 0x0498, 0x0488, 0x0488, + 0x08c8, 0x09e7, 0x051d, 0x09f7, 0x0a07, 0x0a13, 0x0a18, 0x0a28, + 0x0a38, 0x0a48, 0x04df, 0x0a58, 0x0a58, 0x0a67, 0x052d, 0x052d, + 0x087a, 0x0a77, 0x0a83, 0x0a91, 0x0aa0, 0x0ab0, 0x051d, 0x04df, 0x04df, 0x0abe, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x0ace, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, @@ -106,16 +106,16 @@ const unsigned short DECLSPEC_HIDDEN bidi_direction_table[3313] = 0x051d, 0x051d, 0x051d, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0b1d, 0x0b2c, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x0889, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, + 0x04df, 0x04df, 0x087b, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x052d, 0x052d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, - 0x0483, 0x04df, 0x04df, 0x051d, 0x0b35, 0x051d, 0x051d, 0x051d, + 0x0500, 0x04df, 0x04df, 0x051d, 0x0b35, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x0482, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x0ad8, 0x04df, 0x0502, 0x0b45, 0x051d, 0x0b54, 0x0b64, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0b74, 0x0485, 0x04df, 0x04df, 0x04df, 0x04df, 0x04e4, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x051d, - 0x051d, 0x0482, 0x04df, 0x08d6, 0x04df, 0x04df, 0x04df, 0x051d, + 0x051d, 0x0482, 0x04df, 0x08c8, 0x04df, 0x04df, 0x04df, 0x051d, 0x04df, 0x0b81, 0x04df, 0x04df, 0x04df, 0x051c, 0x0489, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0b90, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0487, 0x04df, 0x0486, 0x04df, @@ -123,27 +123,27 @@ const unsigned short DECLSPEC_HIDDEN bidi_direction_table[3313] = 0x04df, 0x04df, 0x04df, 0x051d, 0x051d, 0x051d, 0x051d, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x051d, 0x051d, 0x051d, 0x0ad7, 0x04df, 0x04df, 0x04df, 0x0488, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0889, 0x0ba0, 0x04df, - 0x0723, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x07f1, 0x051d, + 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x087b, 0x0ba0, 0x04df, + 0x0711, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x07e3, 0x051d, 0x051d, 0x0484, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04e7, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0bb0, 0x04df, 0x0bbc, 0x0bc9, 0x04df, 0x04df, 0x04df, 0x0ab6, 0x04df, - 0x04df, 0x04df, 0x04df, 0x0bd5, 0x04df, 0x052d, 0x06f0, 0x04df, - 0x04df, 0x0bdf, 0x04df, 0x06d0, 0x07f1, 0x04df, 0x04df, 0x06ef, - 0x04df, 0x04df, 0x0bed, 0x04df, 0x04df, 0x071d, 0x04df, 0x04df, - 0x0bfb, 0x0882, 0x0c0a, 0x04df, 0x04df, 0x0716, 0x04df, 0x04df, - 0x04df, 0x0c1a, 0x0721, 0x04df, 0x0751, 0x071c, 0x04df, 0x04df, + 0x04df, 0x04df, 0x04df, 0x0bd5, 0x04df, 0x052d, 0x06de, 0x04df, + 0x04df, 0x0bdf, 0x04df, 0x0bed, 0x07e3, 0x04df, 0x04df, 0x06dd, + 0x04df, 0x04df, 0x0bfd, 0x04df, 0x04df, 0x070b, 0x04df, 0x04df, + 0x0c0b, 0x0874, 0x0c1a, 0x04df, 0x04df, 0x0704, 0x04df, 0x04df, + 0x04df, 0x0c2a, 0x070f, 0x04df, 0x073f, 0x070a, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0aa0, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x0c2a, 0x04df, 0x0c38, 0x0c47, - 0x0c51, 0x0c61, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, - 0x05d5, 0x0c71, 0x0c7e, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, - 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, - 0x05d5, 0x05d5, 0x05d5, 0x0c81, 0x04df, 0x05d5, 0x05d5, 0x05d5, - 0x05d5, 0x0c7f, 0x05d5, 0x05d5, 0x06c7, 0x04df, 0x04df, 0x0c91, - 0x052d, 0x08c3, 0x052d, 0x051d, 0x051d, 0x0ca1, 0x0cb1, 0x06bf, - 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x0cc1, - 0x0cd1, 0x0476, 0x0485, 0x048a, 0x0485, 0x048a, 0x0ad8, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0ce1, 0x048c, + 0x04df, 0x04df, 0x04df, 0x04df, 0x0c3a, 0x04df, 0x0c48, 0x0c57, + 0x0c61, 0x0c71, 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x05d2, + 0x05d2, 0x0c81, 0x06af, 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x05d2, + 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x05d2, + 0x05d2, 0x05d2, 0x05d2, 0x0c91, 0x051d, 0x05d2, 0x05d2, 0x05d2, + 0x05d2, 0x06b0, 0x05d2, 0x05d2, 0x0ca1, 0x04df, 0x04df, 0x0cb1, + 0x052d, 0x08b5, 0x052d, 0x051d, 0x051d, 0x0cc1, 0x0cd1, 0x0ce1, + 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x05d2, 0x0ce7, + 0x0cf7, 0x0476, 0x0485, 0x048a, 0x0485, 0x048a, 0x0ad8, 0x04df, + 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0d07, 0x048c, /* values */ 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000b, 0x000d, 0x000b, 0x000c, 0x000d, 0x000a, 0x000a, @@ -194,155 +194,155 @@ const unsigned short DECLSPEC_HIDDEN bidi_direction_table[3313] = 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0000, 0x0000, 0x0005, 0x0009, 0x0009, 0x0005, 0x0007, 0x0005, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0005, 0x0005, 0x0001, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, - 0x0003, 0x0003, 0x0003, 0x0003, 0x0009, 0x0003, 0x0003, 0x0005, - 0x0005, 0x0005, 0x0006, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0006, 0x0006, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0003, + 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0009, 0x0003, 0x0003, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0003, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0005, 0x0005, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0005, 0x0005, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0001, 0x0005, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0001, 0x0001, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0005, 0x0005, 0x0005, 0x0001, 0x0005, 0x0006, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, + 0x0001, 0x0005, 0x0005, 0x0005, 0x0006, 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 0x0002, 0x0002, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0002, 0x0002, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0002, 0x0001, 0x0001, 0x0006, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0002, 0x0002, 0x0000, 0x0000, 0x0000, 0x0000, 0x0002, - 0x0001, 0x0001, 0x0006, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, - 0x0002, 0x0006, 0x0006, 0x0006, 0x0006, 0x0002, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0002, 0x0006, 0x0006, 0x0006, 0x0002, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0002, - 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, - 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0002, 0x0001, 0x0005, + 0x0002, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0002, 0x0006, + 0x0006, 0x0006, 0x0002, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0001, 0x0001, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0002, 0x0001, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0005, 0x0001, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0003, 0x0006, 0x0006, 0x0006, + 0x0005, 0x0001, 0x0003, 0x0003, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0003, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, - 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, - 0x0009, 0x0009, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0009, 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0006, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, - 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0009, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, + 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0009, 0x0009, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0009, + 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0009, 0x0000, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0009, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0006, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0009, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, - 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0009, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0001, - 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0001, 0x0006, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, - 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0009, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, - 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, + 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0001, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0001, + 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0006, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x000c, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, - 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, - 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0009, - 0x0001, 0x0006, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, - 0x0006, 0x0006, 0x000a, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, - 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, - 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x000c, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, - 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, - 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0006, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0009, 0x0001, 0x0006, 0x0001, 0x0001, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0006, 0x0006, 0x0006, 0x000a, 0x0006, 0x0006, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, + 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, + 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, + 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, + 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0000, 0x000c, 0x000c, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0000, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, - 0x000c, 0x000a, 0x000a, 0x000a, 0x0001, 0x0002, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000c, 0x000d, - 0x0011, 0x000f, 0x0012, 0x0010, 0x000e, 0x0007, 0x0009, 0x0009, - 0x0009, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0007, 0x0000, + 0x000c, 0x000c, 0x000a, 0x000a, 0x000a, 0x0001, 0x0002, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000c, + 0x000d, 0x0011, 0x000f, 0x0012, 0x0010, 0x000e, 0x0007, 0x0009, + 0x0009, 0x0009, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0007, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000c, 0x000a, - 0x000a, 0x000a, 0x000a, 0x000a, 0x0001, 0x0013, 0x0014, 0x0015, - 0x0016, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0004, - 0x0001, 0x0001, 0x0001, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0008, 0x0008, 0x0000, 0x0000, 0x0000, 0x0001, 0x0004, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000c, + 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0001, 0x0013, 0x0014, + 0x0015, 0x0016, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, + 0x0004, 0x0001, 0x0001, 0x0001, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0008, 0x0008, 0x0000, 0x0000, 0x0000, 0x0001, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0008, 0x0008, 0x0000, 0x0000, 0x0000, 0x0001, 0x0009, + 0x0004, 0x0004, 0x0008, 0x0008, 0x0000, 0x0000, 0x0000, 0x0001, + 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, - 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0000, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, @@ -390,6 +390,8 @@ const unsigned short DECLSPEC_HIDDEN bidi_direction_table[3313] = 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, @@ -406,21 +408,23 @@ const unsigned short DECLSPEC_HIDDEN bidi_direction_table[3313] = 0x0001, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0001, 0x0002, 0x0001, 0x0002, 0x0002, 0x0001, 0x0002, 0x0002, 0x0001, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, - 0x0002, 0x0005, 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0002, 0x0005, 0x0005, 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0000, 0x0000, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0000, 0x0001, - 0x0001, 0x0007, 0x0000, 0x0007, 0x0001, 0x0000, 0x0007, 0x0000, + 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0000, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0000, 0x0000, + 0x0000, 0x0007, 0x0000, 0x0007, 0x0001, 0x0000, 0x0007, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0009, 0x0000, 0x0000, 0x0008, 0x0008, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0009, 0x0009, 0x0000, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0001, 0x0001, - 0x000a, 0x0001, 0x0000, 0x0000, 0x0009, 0x0009, 0x0009, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0008, 0x0007, 0x0008, 0x0007, - 0x0007, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, 0x0009, 0x0009, - 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0001 + 0x0001, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0001, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0001, 0x0001, 0x000a, 0x0001, + 0x0000, 0x0000, 0x0009, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0008, 0x0007, 0x0008, 0x0007, 0x0007, 0x0009, + 0x0009, 0x0000, 0x0000, 0x0000, 0x0009, 0x0009, 0x0001, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001 }; diff --git a/dlls/gdi32/uniscribe/indicsyllable.c b/dlls/gdi32/uniscribe/indicsyllable.c index 514392345bb..6160188c9e2 100644 --- a/dlls/gdi32/uniscribe/indicsyllable.c +++ b/dlls/gdi32/uniscribe/indicsyllable.c @@ -1,11 +1,11 @@ /* Unicode Indic Syllabic Category */ -/* generated from https://www.unicode.org/Public/13.0.0/ucd/UCD.zip:IndicSyllabicCategory.txt */ -/* and from https://www.unicode.org/Public/13.0.0/ucd/UCD.zip:IndicPositionalCategory.t… */ +/* generated from https://www.unicode.org/Public/14.0.0/ucd/UCD.zip:IndicSyllabicCategory.txt */ +/* and from https://www.unicode.org/Public/14.0.0/ucd/UCD.zip:IndicPositionalCategory.t… */ /* DO NOT EDIT!! */ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3016] = +const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3033] = { /* level 1 offsets */ 0x0100, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, @@ -60,31 +60,31 @@ const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3016] = 0x067d, 0x068d, 0x02b7, 0x0696, 0x06a5, 0x06b5, 0x06c2, 0x06cb, 0x06ce, 0x06db, 0x025d, 0x025d, 0x025d, 0x02b7, 0x02b7, 0x06eb, 0x06fa, 0x070a, 0x071a, 0x0729, 0x0738, 0x0746, 0x0756, 0x025d, - 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x0766, 0x0774, 0x02b4, - 0x0774, 0x02b4, 0x0784, 0x0766, 0x0794, 0x02b7, 0x02b7, 0x07a4, - 0x07b0, 0x07c0, 0x07cf, 0x0270, 0x025d, 0x07df, 0x05e6, 0x07ef, - 0x07ff, 0x03aa, 0x02b7, 0x080f, 0x081f, 0x02b7, 0x02b7, 0x082f, - 0x083f, 0x084e, 0x085e, 0x025d, 0x025d, 0x02b7, 0x086e, 0x02b7, - 0x02b7, 0x087e, 0x088b, 0x089b, 0x08a9, 0x0270, 0x0270, 0x025d, - 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x08b9, 0x02b4, 0x02b7, - 0x08c9, 0x08d9, 0x0270, 0x08e5, 0x08f2, 0x0902, 0x02b7, 0x0911, - 0x0921, 0x02b7, 0x02b7, 0x0931, 0x0941, 0x02b7, 0x02b7, 0x0951, - 0x095e, 0x096e, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, - 0x025d, 0x025d, 0x097e, 0x098e, 0x099c, 0x025d, 0x025d, 0x025d, + 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x02b4, 0x0766, 0x02b4, + 0x0775, 0x02b4, 0x0785, 0x0795, 0x07a4, 0x02b7, 0x02b7, 0x07b4, + 0x07c0, 0x07d0, 0x07df, 0x0270, 0x025d, 0x07ef, 0x05e6, 0x07ff, + 0x080f, 0x03aa, 0x02b7, 0x081f, 0x082f, 0x02b7, 0x02b7, 0x083f, + 0x084f, 0x085e, 0x086e, 0x025d, 0x025d, 0x02b7, 0x087e, 0x02b7, + 0x02b7, 0x088e, 0x089b, 0x08ab, 0x08b9, 0x0270, 0x0270, 0x025d, + 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x08c9, 0x02b4, 0x02b7, + 0x08d9, 0x08e9, 0x0270, 0x08f6, 0x0903, 0x0913, 0x02b7, 0x0922, + 0x0932, 0x02b7, 0x02b7, 0x0942, 0x0952, 0x02b7, 0x02b7, 0x0962, + 0x096f, 0x097f, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, + 0x025d, 0x025d, 0x098f, 0x099f, 0x09ad, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, - 0x025d, 0x025d, 0x025d, 0x025d, 0x09a7, 0x09b3, 0x09c3, 0x025d, - 0x025d, 0x025d, 0x025d, 0x025d, 0x09cf, 0x09dd, 0x025d, 0x025d, - 0x025d, 0x025d, 0x025d, 0x025d, 0x09ed, 0x025d, 0x025d, 0x025d, + 0x025d, 0x025d, 0x025d, 0x025d, 0x09b8, 0x09c4, 0x09d4, 0x025d, + 0x025d, 0x025d, 0x025d, 0x025d, 0x09e0, 0x09ee, 0x025d, 0x025d, + 0x025d, 0x025d, 0x025d, 0x025d, 0x09fe, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, - 0x025d, 0x0292, 0x025d, 0x025d, 0x025d, 0x09fd, 0x02b7, 0x0a0a, - 0x025d, 0x02b7, 0x0a1a, 0x0a28, 0x0a37, 0x0a47, 0x02b5, 0x02b7, - 0x0a57, 0x0a63, 0x0270, 0x0a73, 0x0a81, 0x0a91, 0x02b7, 0x0a9f, - 0x02b7, 0x0aaf, 0x0abe, 0x025d, 0x025d, 0x0ace, 0x02b7, 0x02b7, - 0x0add, 0x0aed, 0x0270, 0x0afd, 0x0b0d, 0x02b1, 0x02b7, 0x0b1d, - 0x0b2c, 0x0b3c, 0x0270, 0x02b7, 0x0b4b, 0x02b7, 0x02b7, 0x02b7, - 0x0b5b, 0x0b6b, 0x025d, 0x0b7b, 0x0b8b, 0x025d, 0x025d, 0x025d, + 0x025d, 0x0292, 0x025d, 0x025d, 0x025d, 0x0a0e, 0x02b7, 0x0a1b, + 0x025d, 0x02b7, 0x0a2b, 0x0a39, 0x0a48, 0x0a58, 0x02b5, 0x02b7, + 0x0a68, 0x0a74, 0x0270, 0x0a84, 0x0a92, 0x0aa2, 0x02b7, 0x0ab0, + 0x02b7, 0x0ac0, 0x0acf, 0x025d, 0x025d, 0x0adf, 0x02b7, 0x02b7, + 0x0aee, 0x0afe, 0x0270, 0x0b0e, 0x0b1e, 0x02b1, 0x02b7, 0x0b2e, + 0x0b3d, 0x0b4d, 0x0270, 0x02b7, 0x0b5c, 0x02b7, 0x02b7, 0x02b7, + 0x0b6c, 0x0b7c, 0x025d, 0x0b8c, 0x0b9c, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, - 0x025d, 0x0b9b, 0x0bab, 0x0bb8, 0x0270, + 0x025d, 0x0bac, 0x0bbc, 0x0bc9, 0x0270, /* values */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -165,10 +165,10 @@ const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3016] = 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0000, 0x0000, - 0x0000, 0x0003, 0x0507, 0x0507, 0x0107, 0x0107, 0x0107, 0x0107, + 0x0604, 0x0003, 0x0507, 0x0507, 0x0107, 0x0107, 0x0107, 0x0107, 0x0000, 0x0507, 0x0507, 0x0707, 0x0000, 0x0507, 0x0507, 0x0507, 0x0505, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0507, 0x0607, - 0x0000, 0x000a, 0x000a, 0x000a, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x000a, 0x000a, 0x000a, 0x0000, 0x0000, 0x000b, 0x0000, 0x0000, 0x0001, 0x0501, 0x0101, 0x0102, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x000a, 0x000a, 0x000a, 0x000a, 0x0000, 0x000a, 0x000a, @@ -176,7 +176,7 @@ const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3016] = 0x0507, 0x0807, 0x0107, 0x0107, 0x0107, 0x0107, 0x0000, 0x0507, 0x0807, 0x0807, 0x0000, 0x0807, 0x0807, 0x0507, 0x0505, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0107, 0x0107, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, 0x0000, 0x001f, + 0x0000, 0x0000, 0x0000, 0x0000, 0x000b, 0x000a, 0x0000, 0x001f, 0x001f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0501, 0x0501, 0x0101, 0x0102, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, @@ -247,12 +247,14 @@ const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3016] = 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0113, 0x0613, 0x000a, 0x0113, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0113, 0x0113, 0x0107, 0x0507, 0x0000, - 0x0000, 0x0006, 0x0006, 0x0006, 0x000a, 0x000a, 0x000a, 0x000a, - 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0000, 0x000a, - 0x000a, 0x0507, 0x0607, 0x0616, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, - 0x000a, 0x0507, 0x0607, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, + 0x0000, 0x000a, 0x000a, 0x0507, 0x0607, 0x0616, 0x0116, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x000a, 0x000a, 0x0507, 0x0607, 0x0116, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x000a, 0x000a, 0x0507, 0x0607, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0006, 0x0006, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, + 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0000, 0x000a, 0x000a, 0x0000, 0x0507, 0x0607, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, 0x000a, 0x000a, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, @@ -289,103 +291,103 @@ const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3016] = 0x0507, 0x0107, 0x0107, 0x0507, 0x0507, 0x0507, 0x0507, 0x0607, 0x0607, 0x0507, 0x0607, 0x0107, 0x0207, 0x0207, 0x0207, 0x0507, 0x0501, 0x0513, 0x0513, 0x0513, 0x0513, 0x0513, 0x0516, 0x0521, - 0x0521, 0x0000, 0x0000, 0x0621, 0x0501, 0x0501, 0x0501, 0x050c, + 0x0521, 0x0000, 0x0000, 0x0621, 0x0501, 0x0501, 0x0501, 0x050f, 0x0102, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x000a, 0x000a, 0x000a, 0x000a, 0x0504, 0x0107, 0x0507, 0x0507, 0x0607, 0x0607, 0x0607, 0x0b07, 0x0707, 0x0c07, 0x0207, 0x0207, 0x0407, 0x0407, 0x0507, 0x0807, 0x0105, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, + 0x000a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0500, 0x0600, 0x0500, 0x0500, + 0x0500, 0x0500, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0501, 0x050f, + 0x0102, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x010d, 0x060d, + 0x060d, 0x0507, 0x0607, 0x0207, 0x0107, 0x0507, 0x0507, 0x0116, + 0x0017, 0x060d, 0x060d, 0x000a, 0x000a, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0003, + 0x000a, 0x000a, 0x000a, 0x000f, 0x000f, 0x000a, 0x000a, 0x000a, + 0x000a, 0x0006, 0x0006, 0x0504, 0x0107, 0x0507, 0x0507, 0x0107, + 0x0107, 0x0107, 0x0507, 0x0107, 0x0507, 0x050f, 0x050f, 0x0116, + 0x0116, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, 0x000a, 0x000a, + 0x000a, 0x010d, 0x010d, 0x0107, 0x0207, 0x0207, 0x0907, 0x0107, + 0x0107, 0x0607, 0x050f, 0x050f, 0x050f, 0x050f, 0x0201, 0x0201, + 0x0521, 0x0604, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x0000, 0x0000, 0x0000, 0x000a, + 0x000a, 0x000a, 0x0519, 0x0519, 0x0519, 0x0000, 0x0d19, 0x0619, + 0x0619, 0x0619, 0x0619, 0x0619, 0x0519, 0x0519, 0x0619, 0x0619, + 0x0619, 0x0619, 0x0519, 0x0119, 0x0d00, 0x0d00, 0x0d00, 0x0d00, + 0x0d00, 0x0d00, 0x0d00, 0x0000, 0x0000, 0x0000, 0x0000, 0x0600, + 0x0000, 0x0000, 0x000b, 0x000b, 0x0519, 0x001f, 0x001f, 0x0119, + 0x0019, 0x0019, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0521, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0500, 0x0600, 0x0500, 0x0500, 0x0500, - 0x0500, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0501, 0x050c, 0x0102, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x000a, - 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x010d, 0x060d, 0x060d, - 0x0507, 0x0607, 0x0207, 0x0107, 0x0507, 0x0507, 0x0116, 0x0017, - 0x060d, 0x060d, 0x000a, 0x000a, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0003, 0x000a, - 0x000a, 0x000a, 0x000f, 0x000f, 0x000a, 0x000a, 0x000a, 0x000a, - 0x0006, 0x0006, 0x0504, 0x0107, 0x0507, 0x0507, 0x0107, 0x0107, - 0x0107, 0x0507, 0x0107, 0x0507, 0x050f, 0x050f, 0x0116, 0x0116, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, - 0x010d, 0x010d, 0x0107, 0x0207, 0x0207, 0x0907, 0x0107, 0x0107, - 0x0607, 0x050f, 0x050f, 0x050f, 0x050f, 0x0201, 0x0201, 0x0521, - 0x0604, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x0000, 0x0000, 0x0000, 0x000a, 0x000a, - 0x000a, 0x0519, 0x0519, 0x0519, 0x0000, 0x0d19, 0x0619, 0x0619, - 0x0619, 0x0619, 0x0619, 0x0519, 0x0519, 0x0619, 0x0619, 0x0619, - 0x0619, 0x0519, 0x0119, 0x0d00, 0x0d00, 0x0d00, 0x0d00, 0x0d00, - 0x0d00, 0x0d00, 0x0000, 0x0000, 0x0000, 0x0000, 0x0600, 0x0000, - 0x0000, 0x000b, 0x000b, 0x0519, 0x001f, 0x001f, 0x0119, 0x0019, - 0x0019, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0521, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x001a, 0x001b, 0x0000, 0x0000, 0x0009, 0x0009, - 0x0009, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0021, 0x0000, + 0x0000, 0x0000, 0x0000, 0x001a, 0x001b, 0x0000, 0x0000, 0x0009, + 0x0009, 0x0009, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0021, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0021, 0x0021, 0x0021, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0021, 0x0021, 0x0021, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0519, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0519, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0006, 0x0006, 0x0507, 0x0006, 0x0006, 0x0006, 0x0505, 0x000a, - 0x000a, 0x000a, 0x000a, 0x0501, 0x000a, 0x000a, 0x000a, 0x000a, - 0x0107, 0x0107, 0x0607, 0x0507, 0x0107, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0616, 0x0000, 0x0000, 0x0000, 0x000a, 0x000a, 0x000a, + 0x0000, 0x0006, 0x0006, 0x0507, 0x0006, 0x0006, 0x0006, 0x0505, + 0x000a, 0x000a, 0x000a, 0x000a, 0x0501, 0x000a, 0x000a, 0x000a, + 0x000a, 0x0107, 0x0107, 0x0607, 0x0507, 0x0107, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0616, 0x0000, 0x0000, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, - 0x000a, 0x000a, 0x000a, 0x0008, 0x0008, 0x000a, 0x000a, 0x000a, - 0x000a, 0x0008, 0x000d, 0x000d, 0x000a, 0x000a, 0x000a, 0x000a, - 0x000a, 0x000a, 0x000a, 0x000d, 0x000a, 0x0001, 0x0000, 0x0000, + 0x000a, 0x000a, 0x000a, 0x000a, 0x0008, 0x0008, 0x000a, 0x000a, + 0x000a, 0x000a, 0x0008, 0x000d, 0x000d, 0x000a, 0x000a, 0x000a, + 0x000a, 0x000a, 0x000a, 0x000a, 0x000d, 0x000a, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0101, 0x0102, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0101, 0x0102, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x000a, 0x000a, 0x000a, 0x000a, 0x010e, 0x0107, + 0x0006, 0x0006, 0x0006, 0x000a, 0x000a, 0x000a, 0x000a, 0x010e, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, - 0x0107, 0x0107, 0x0605, 0x0501, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0519, 0x0519, + 0x0107, 0x0107, 0x0107, 0x0605, 0x0501, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, - 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0001, 0x0001, + 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0001, + 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0507, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x000a, + 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0008, 0x0008, 0x0008, + 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0613, 0x0613, + 0x0613, 0x0000, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, + 0x000a, 0x000a, 0x0607, 0x0607, 0x0607, 0x0507, 0x0607, 0x0607, + 0x0607, 0x0607, 0x050f, 0x050f, 0x010f, 0x0116, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0006, 0x0507, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x000a, 0x000a, - 0x000a, 0x000a, 0x000a, 0x000a, 0x0008, 0x0008, 0x0008, 0x0008, - 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0613, 0x0613, 0x0613, - 0x0000, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, - 0x000a, 0x0607, 0x0607, 0x0607, 0x0507, 0x0607, 0x0607, 0x0607, - 0x0607, 0x050f, 0x050f, 0x010f, 0x0116, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0501, 0x0501, 0x050c, 0x0102, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x000a, 0x000a, 0x000a, 0x0006, 0x0006, 0x0006, - 0x000a, 0x000a, 0x000a, 0x0504, 0x0107, 0x0107, 0x0507, 0x0507, - 0x0607, 0x0607, 0x0207, 0x0207, 0x0507, 0x060e, 0x0b0e, 0x0f0e, - 0x0b05, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0501, 0x0501, 0x050f, 0x0102, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x000a, 0x000a, 0x000a, 0x0006, 0x0006, + 0x0006, 0x000a, 0x000a, 0x000a, 0x0504, 0x0107, 0x0107, 0x0507, + 0x0507, 0x0607, 0x0607, 0x0207, 0x0207, 0x0507, 0x060e, 0x0b0e, + 0x0f0e, 0x0b05, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0507, 0x0000, 0x000a, - 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0000, - 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, - 0x000a, 0x0507, 0x0507, 0x0507, 0x0507, 0x0607, 0x0507, 0x0207, - 0x0507, 0x0607, 0x010e, 0x020e, 0x060e, 0x060e, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000f, - 0x000f, 0x000f, 0x050f, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, - 0x000f, 0x000f, 0x000f, 0x050f, 0x010f, 0x0000, 0x0000, 0x000a, - 0x000a, 0x000a, 0x0009, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, - 0x000a, 0x0113, 0x0513, 0x0113, 0x000a, 0x000a, 0x0507, 0x0107, - 0x0507, 0x0507, 0x0607, 0x0307, 0x0307, 0x0507, 0x0507, 0x0307, - 0x0107, 0x0307, 0x0307, 0x0107, 0x0507, 0x0513, 0x0012, 0x0513, - 0x0012, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, - 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, - 0x000a, 0x0207, 0x0607, 0x0507, 0x0207, 0x0107, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0102, 0x0017, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, 0x000a, + 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0507, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, - 0x000a, 0x000a, 0x000a, 0x000a, 0x0006, 0x0006, 0x000a, 0x0006, + 0x000a, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, + 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, + 0x000a, 0x000a, 0x0507, 0x0507, 0x0507, 0x0507, 0x0607, 0x0507, + 0x0207, 0x0507, 0x0607, 0x010e, 0x020e, 0x060e, 0x060e, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x000f, 0x000f, 0x000f, 0x050f, 0x000f, 0x000f, 0x000f, 0x000f, + 0x000f, 0x000f, 0x000f, 0x000f, 0x050f, 0x010f, 0x0000, 0x0000, + 0x000a, 0x000a, 0x000a, 0x0009, 0x0009, 0x0009, 0x0000, 0x0000, + 0x0000, 0x000a, 0x0113, 0x0513, 0x0113, 0x000a, 0x000a, 0x0507, + 0x0107, 0x0507, 0x0507, 0x0607, 0x0307, 0x0307, 0x0507, 0x0507, + 0x0307, 0x0107, 0x0307, 0x0307, 0x0107, 0x0507, 0x0513, 0x0012, + 0x0513, 0x0012, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, + 0x0006, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, + 0x000a, 0x000a, 0x0207, 0x0607, 0x0507, 0x0207, 0x0107, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0102, 0x0017, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, - 0x000a, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, 0x0107, 0x0107, - 0x0507, 0x0107, 0x0107, 0x0607, 0x0107, 0x0107, 0x0000, 0x0113, - 0x0616, 0x0000, 0x0000 + 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0006, 0x0006, 0x000a, + 0x0006, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, + 0x000a, 0x000a, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, 0x0107, + 0x0107, 0x0507, 0x0107, 0x0107, 0x0607, 0x0107, 0x0107, 0x0000, + 0x0113, 0x0616, 0x0000, 0x0000 }; diff --git a/dlls/gdi32/uniscribe/linebreak.c b/dlls/gdi32/uniscribe/linebreak.c index be971c65217..ad9ec19438c 100644 --- a/dlls/gdi32/uniscribe/linebreak.c +++ b/dlls/gdi32/uniscribe/linebreak.c @@ -1,10 +1,10 @@ /* Unicode Line Break Properties */ -/* generated from https://www.unicode.org/Public/13.0.0/ucd/UCD.zip:LineBreak.txt */ +/* generated from https://www.unicode.org/Public/14.0.0/ucd/UCD.zip:LineBreak.txt */ /* DO NOT EDIT!! */ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[5672] = +const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[5710] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0114, 0x0124, 0x012f, 0x013c, 0x014c, 0x015c, @@ -12,156 +12,156 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[5672] = 0x01ec, 0x01fc, 0x020c, 0x021b, 0x022b, 0x0110, 0x0233, 0x0243, 0x0253, 0x0263, 0x0272, 0x0282, 0x0292, 0x02a2, 0x0110, 0x02b2, 0x02c2, 0x02d2, 0x02e2, 0x02f2, 0x0302, 0x0312, 0x0322, 0x0332, - 0x0110, 0x0341, 0x0110, 0x0351, 0x035f, 0x036f, 0x037f, 0x038f, - 0x039f, 0x03af, 0x03bf, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c8, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, 0x03c4, - 0x03d8, 0x03c4, 0x03c4, 0x03c4, 0x03e0, 0x0110, 0x03f0, 0x0400, - 0x0410, 0x0420, 0x0430, 0x0440, 0x0450, 0x0452, 0x0454, 0x0456, - 0x0451, 0x0453, 0x0455, 0x0450, 0x0452, 0x0454, 0x0456, 0x0451, - 0x0453, 0x0455, 0x0450, 0x0452, 0x0454, 0x0456, 0x0451, 0x0453, - 0x0455, 0x0450, 0x0452, 0x0454, 0x0456, 0x0451, 0x0453, 0x0455, - 0x0450, 0x0452, 0x0454, 0x0456, 0x0451, 0x0453, 0x0455, 0x0450, - 0x0452, 0x0454, 0x0456, 0x0451, 0x0453, 0x0455, 0x0450, 0x0460, - 0x0470, 0x0470, 0x0470, 0x0470, 0x0470, 0x0470, 0x0470, 0x0470, - 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, - 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, - 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, 0x0480, - 0x0480, 0x03c4, 0x03c4, 0x0490, 0x0110, 0x049e, 0x04ae, 0x04be, + 0x0110, 0x0341, 0x0110, 0x0351, 0x035b, 0x036b, 0x037b, 0x038b, + 0x039b, 0x03ab, 0x03bb, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c4, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, 0x03c0, + 0x03d4, 0x03c0, 0x03c0, 0x03c0, 0x03dc, 0x0110, 0x03ec, 0x03fc, + 0x040c, 0x041c, 0x042c, 0x043c, 0x044c, 0x044e, 0x0450, 0x0452, + 0x044d, 0x044f, 0x0451, 0x044c, 0x044e, 0x0450, 0x0452, 0x044d, + 0x044f, 0x0451, 0x044c, 0x044e, 0x0450, 0x0452, 0x044d, 0x044f, + 0x0451, 0x044c, 0x044e, 0x0450, 0x0452, 0x044d, 0x044f, 0x0451, + 0x044c, 0x044e, 0x0450, 0x0452, 0x044d, 0x044f, 0x0451, 0x044c, + 0x044e, 0x0450, 0x0452, 0x044d, 0x044f, 0x0451, 0x044c, 0x045c, + 0x046c, 0x046c, 0x046c, 0x046c, 0x046c, 0x046c, 0x046c, 0x046c, + 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, + 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, + 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, 0x047c, + 0x047c, 0x03c0, 0x03c0, 0x048c, 0x0110, 0x049a, 0x04aa, 0x04ba, /* level 2 offsets */ - 0x04ce, 0x04dc, 0x04ec, 0x04fc, 0x050c, 0x0511, 0x050c, 0x051f, - 0x052e, 0x04dc, 0x053e, 0x054e, 0x050c, 0x055e, 0x050c, 0x055e, - 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, - 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, - 0x0567, 0x0574, 0x050c, 0x050c, 0x04dc, 0x04dc, 0x04dc, 0x04dc, - 0x0584, 0x0587, 0x0594, 0x05a4, 0x05b4, 0x050c, 0x05c2, 0x050c, - 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x05cf, - 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x05df, - 0x050c, 0x05e8, 0x050c, 0x050c, 0x05f1, 0x0601, 0x04dc, 0x0603, - 0x0613, 0x0623, 0x0628, 0x0637, 0x0647, 0x0657, 0x050c, 0x050c, - 0x05c7, 0x04dc, 0x0667, 0x0677, 0x050c, 0x050c, 0x050c, 0x050c, - 0x050c, 0x0683, 0x068b, 0x069b, 0x06a5, 0x0676, 0x050c, 0x04dc, - 0x06b5, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x06c2, 0x06d1, - 0x069b, 0x050c, 0x05c7, 0x06e1, 0x050c, 0x06f1, 0x06fd, 0x05e0, - 0x050c, 0x070d, 0x071d, 0x0728, 0x0728, 0x0728, 0x050c, 0x05da, - 0x0720, 0x0735, 0x0743, 0x04dc, 0x074f, 0x050c, 0x050c, 0x0755, - 0x04dc, 0x0762, 0x0770, 0x050c, 0x0780, 0x078c, 0x0793, 0x07a2, - 0x07b0, 0x07bf, 0x07ce, 0x07de, 0x07ed, 0x078c, 0x0793, 0x07fc, - 0x080a, 0x0819, 0x0828, 0x0838, 0x0847, 0x05c2, 0x0793, 0x0854, - 0x0862, 0x0727, 0x07ce, 0x0872, 0x0882, 0x078c, 0x0793, 0x0854, - 0x0892, 0x08a0, 0x07ce, 0x0720, 0x08b0, 0x08bf, 0x08cf, 0x08dd, - 0x08eb, 0x08fb, 0x0828, 0x090b, 0x091b, 0x05de, 0x0793, 0x0929, - 0x0937, 0x0945, 0x07ce, 0x0950, 0x095f, 0x05de, 0x0793, 0x0968, - 0x0937, 0x0978, 0x07ce, 0x0987, 0x0997, 0x05de, 0x050c, 0x09a5, - 0x09b3, 0x09c3, 0x07ce, 0x09cb, 0x09db, 0x09e4, 0x050c, 0x09f2, - 0x0a02, 0x0a11, 0x0828, 0x0a21, 0x0a30, 0x0a31, 0x0a31, 0x0a36, - 0x0a46, 0x0a56, 0x0728, 0x0728, 0x0a65, 0x0a31, 0x0a71, 0x0a33, - 0x0a7c, 0x0a8c, 0x0728, 0x0728, 0x0a9c, 0x0aaa, 0x069b, 0x0ab6, - 0x0920, 0x050c, 0x0ac6, 0x0ad5, 0x0adf, 0x0aec, 0x04dc, 0x0af5, - 0x0b05, 0x0b15, 0x0728, 0x0728, 0x0a31, 0x0a31, 0x0a31, 0x0a31, - 0x0b25, 0x0a31, 0x0a31, 0x0a31, 0x0a31, 0x0b35, 0x050c, 0x050c, - 0x0b45, 0x050c, 0x050c, 0x050c, 0x0b55, 0x0b55, 0x0b55, 0x0b55, - 0x0b55, 0x0b55, 0x0b65, 0x0b65, 0x0b65, 0x0b65, 0x0b6d, 0x0b75, - 0x0b75, 0x0b75, 0x0b75, 0x0b75, 0x050c, 0x050c, 0x050c, 0x050c, - 0x0b85, 0x0b95, 0x050c, 0x050c, 0x0b85, 0x050c, 0x050c, 0x0b8d, - 0x0b9d, 0x0921, 0x050c, 0x050c, 0x0b9d, 0x050c, 0x050c, 0x050c, - 0x0ba5, 0x0bb5, 0x0ac6, 0x050c, 0x071e, 0x050c, 0x050c, 0x050c, - 0x050c, 0x050c, 0x0bbf, 0x0bcf, 0x050c, 0x050c, 0x050c, 0x050c, - 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, - 0x050c, 0x050c, 0x050c, 0x0bcf, 0x0bd4, 0x050c, 0x050c, 0x050c, - 0x050c, 0x0be4, 0x071f, 0x078f, 0x0bf2, 0x050c, 0x0c02, 0x050c, - 0x0c12, 0x078f, 0x0c22, 0x0a31, 0x0a31, 0x0a31, 0x0a31, 0x0a31, - 0x0c32, 0x0c42, 0x071e, 0x0c52, 0x0c42, 0x050c, 0x050c, 0x050c, - 0x050c, 0x050c, 0x071f, 0x0c62, 0x050c, 0x0c69, 0x050c, 0x050c, - 0x050c, 0x050c, 0x0722, 0x050c, 0x05e0, 0x0c79, 0x0c79, 0x0c89, - 0x0a31, 0x0a33, 0x0c99, 0x0a31, 0x0a31, 0x0a35, 0x0a31, 0x0ca9, - 0x0cb9, 0x050c, 0x050c, 0x0cc9, 0x0a31, 0x0a31, 0x0a31, 0x0a32, - 0x0a31, 0x0cd9, 0x0c42, 0x0c42, 0x0a33, 0x04dc, 0x0ce8, 0x0728, - 0x0728, 0x0728, 0x074e, 0x050c, 0x050c, 0x0cf8, 0x0d03, 0x0d13, - 0x0d22, 0x0d2e, 0x0d3e, 0x050c, 0x0745, 0x069b, 0x050c, 0x050c, - 0x06c2, 0x0d4e, 0x050c, 0x050c, 0x0cf8, 0x0d5e, 0x0d6e, 0x069b, - 0x050c, 0x0d7b, 0x071f, 0x050c, 0x050c, 0x05e4, 0x0720, 0x0742, - 0x0d8b, 0x0d94, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, - 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x04dc, 0x04dc, - 0x04dc, 0x0da4, 0x050c, 0x0bbf, 0x050c, 0x050c, 0x0bbf, 0x0db4, - 0x050c, 0x05e1, 0x050c, 0x050c, 0x050c, 0x05da, 0x05da, 0x0dc3, - 0x050c, 0x0dd3, 0x0de3, 0x0df3, 0x0e03, 0x0e13, 0x0e21, 0x0e2b, - 0x0e3b, 0x0e4b, 0x0e5b, 0x0ac6, 0x0e6b, 0x0e75, 0x0e84, 0x04dc, - 0x04dc, 0x0ce8, 0x0e94, 0x0ea1, 0x0eb0, 0x050c, 0x050c, 0x0ebc, - 0x0ecc, 0x0ece, 0x0ed8, 0x0ece, 0x050c, 0x050c, 0x050c, 0x0ee8, - 0x050c, 0x050c, 0x0ef8, 0x0f06, 0x0f15, 0x0f24, 0x0f32, 0x0f3c, - 0x0f4c, 0x050c, 0x0f54, 0x0f35, 0x0f5f, 0x0f65, 0x050c, 0x050c, - 0x0f75, 0x050c, 0x0f85, 0x0f93, 0x0f9f, 0x050c, 0x050c, 0x050c, - 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, - 0x050c, 0x0faf, 0x050c, 0x050c, 0x0721, 0x0728, 0x071d, 0x0728, - 0x0fbf, 0x0fbf, 0x0fbf, 0x0fbf, 0x0fbf, 0x0fbf, 0x0fbf, 0x0fbf, - 0x0fbf, 0x0fc0, 0x0fbf, 0x0fbf, 0x0fbf, 0x0fbf, 0x0ecc, 0x0fbf, - 0x0fbf, 0x0fca, 0x0fbf, 0x0fd8, 0x0fe8, 0x0ff6, 0x1002, 0x1010, - 0x101e, 0x050c, 0x102e, 0x103e, 0x050c, 0x104e, 0x105e, 0x050c, - 0x106e, 0x107e, 0x050c, 0x1012, 0x050c, 0x1080, 0x108d, 0x109c, - 0x10ab, 0x10ba, 0x10c7, 0x050c, 0x050c, 0x050c, 0x050c, 0x10d5, - 0x10e4, 0x10ee, 0x0fbf, 0x10fa, 0x050c, 0x050c, 0x1105, 0x050c, - 0x110f, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, - 0x050c, 0x1112, 0x111a, 0x050c, 0x050c, 0x050c, 0x0f85, 0x050c, - 0x10fe, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x1125, 0x050c, - 0x0789, 0x050c, 0x05d9, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, - 0x050c, 0x05e0, 0x050c, 0x050c, 0x05e0, 0x050c, 0x050c, 0x050c, - 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x112f, 0x113e, 0x050c, - 0x050c, 0x0b45, 0x050c, 0x050c, 0x050c, 0x114e, 0x115e, 0x050c, - 0x0721, 0x116e, 0x116e, 0x116e, 0x116e, 0x04dc, 0x04dc, 0x117e, - 0x118c, 0x119c, 0x11ac, 0x11bc, 0x0725, 0x0728, 0x0728, 0x11cc, - 0x11d2, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11de, 0x11cc, - 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, - 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11ee, 0x0728, 0x11fe, 0x120e, - 0x121c, 0x122c, 0x123c, 0x124c, 0x11cc, 0x1259, 0x11cc, 0x1266, - 0x1275, 0x1285, 0x11cc, 0x1259, 0x11cc, 0x1266, 0x1290, 0x11f9, - 0x11cc, 0x11cc, 0x12a0, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cd, - 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11de, 0x12b0, 0x11cc, - 0x11cd, 0x11cc, 0x11cc, 0x12c0, 0x11cc, 0x11cc, 0x11cc, 0x11cc, - 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, - 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x050c, 0x050c, 0x050c, 0x050c, - 0x11cc, 0x12d0, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, - 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, 0x11cc, - 0x12d6, 0x11cc, 0x11cc, 0x11cc, 0x12dc, 0x050c, 0x050c, 0x0d7b, - 0x12ec, 0x050c, 0x12fc, 0x0728, 0x050c, 0x050c, 0x112f, 0x130c, - 0x050c, 0x1130, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x131c, - 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, - 0x050c, 0x050c, 0x050c, 0x050c, 0x132a, 0x0728, 0x0728, 0x12e7, - 0x133a, 0x050c, 0x1347, 0x1357, 0x050c, 0x050c, 0x050c, 0x1367, - 0x1377, 0x050c, 0x050c, 0x0cf8, 0x1387, 0x0c42, 0x04dc, 0x1397, - 0x069b, 0x050c, 0x13a7, 0x050c, 0x13b7, 0x13c3, 0x0b55, 0x13d3, - 0x074f, 0x050c, 0x050c, 0x13e3, 0x13f2, 0x1402, 0x0a31, 0x0c8f, - 0x050c, 0x050c, 0x05c9, 0x13c0, 0x1410, 0x1420, 0x0a31, 0x0a31, - 0x0a31, 0x0a31, 0x0a31, 0x0a31, 0x1430, 0x0a26, 0x05c7, 0x1440, - 0x144f, 0x1457, 0x116e, 0x050c, 0x050c, 0x050c, 0x1467, 0x050c, - 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x1477, 0x0c42, - 0x1487, 0x148b, 0x1498, 0x148f, 0x1498, 0x1493, 0x1498, 0x1487, - 0x148b, 0x1498, 0x148f, 0x1498, 0x1493, 0x1498, 0x1487, 0x148b, - 0x1498, 0x148f, 0x1498, 0x1493, 0x1498, 0x1487, 0x148b, 0x1498, - 0x148f, 0x1498, 0x14a4, 0x0b65, 0x14b4, 0x0b75, 0x0b75, 0x14bf, - 0x14cf, 0x14cf, 0x14cf, 0x14cf, 0x14cf, 0x14cf, 0x14cf, 0x14cf, - 0x14cf, 0x14cf, 0x14cf, 0x14cf, 0x14cf, 0x14cf, 0x14cf, 0x14cf, - 0x0728, 0x0728, 0x0728, 0x0728, 0x0728, 0x0728, 0x0728, 0x0728, - 0x0728, 0x0728, 0x0728, 0x0728, 0x0728, 0x0728, 0x0728, 0x0728, - 0x0721, 0x14df, 0x14ee, 0x14f8, 0x1508, 0x050c, 0x050c, 0x050c, - 0x050c, 0x050c, 0x050c, 0x050c, 0x0726, 0x0d78, 0x050c, 0x050c, - 0x050c, 0x1518, 0x0728, 0x050c, 0x050c, 0x050c, 0x050c, 0x0d79, - 0x050c, 0x050c, 0x0720, 0x0728, 0x0728, 0x1528, 0x04dc, 0x1538, - 0x04dc, 0x1548, 0x1554, 0x1564, 0x1573, 0x05da, 0x050c, 0x050c, - 0x050c, 0x050c, 0x050c, 0x050c, 0x050c, 0x1583, 0x1593, 0x15a2, - 0x11cc, 0x15b2, 0x11cc, 0x15c0, 0x15d0, 0x15df, 0x11cc, 0x15e1, - 0x11cc, 0x11cd, 0x15f1, 0x15f9, 0x1609, 0x1618, + 0x04ca, 0x04d8, 0x04e8, 0x04f8, 0x0508, 0x050d, 0x0508, 0x051b, + 0x052a, 0x04d8, 0x053a, 0x054a, 0x0508, 0x055a, 0x0508, 0x055a, + 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0563, 0x0570, 0x0508, 0x0508, 0x04d8, 0x04d8, 0x04d8, 0x04d8, + 0x0580, 0x0583, 0x0590, 0x05a0, 0x05b0, 0x0508, 0x05be, 0x0508, + 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x05cb, + 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x05db, + 0x0508, 0x05e4, 0x0508, 0x0508, 0x05ed, 0x05fd, 0x04d8, 0x05ff, + 0x060f, 0x061f, 0x0624, 0x0633, 0x0643, 0x0653, 0x0508, 0x0508, + 0x05c3, 0x04d8, 0x0663, 0x0673, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x067f, 0x0687, 0x0697, 0x06a1, 0x0672, 0x0508, 0x04d8, + 0x06b1, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x06be, 0x06cd, + 0x0697, 0x0508, 0x05c3, 0x06dd, 0x0508, 0x06ed, 0x06f9, 0x05dc, + 0x0508, 0x0709, 0x0719, 0x0508, 0x05dc, 0x0722, 0x0508, 0x0508, + 0x05c4, 0x04d8, 0x0730, 0x04d8, 0x073c, 0x0508, 0x0508, 0x0742, + 0x04d8, 0x074f, 0x075d, 0x0508, 0x076d, 0x0779, 0x0780, 0x078f, + 0x079d, 0x07ac, 0x07bb, 0x07cb, 0x07da, 0x0779, 0x0780, 0x07e9, + 0x07f7, 0x0806, 0x0815, 0x0825, 0x0834, 0x05be, 0x0780, 0x0841, + 0x084f, 0x085f, 0x07bb, 0x086f, 0x087f, 0x0779, 0x0780, 0x0841, + 0x088f, 0x089d, 0x07bb, 0x08ac, 0x08ba, 0x08c9, 0x08d9, 0x08e7, + 0x08f5, 0x0905, 0x0815, 0x0915, 0x0925, 0x05da, 0x0780, 0x0933, + 0x0941, 0x094f, 0x07bb, 0x095d, 0x096c, 0x05da, 0x0780, 0x0975, + 0x0941, 0x0985, 0x07bb, 0x0991, 0x09a1, 0x05da, 0x0508, 0x09af, + 0x09bd, 0x09cd, 0x07bb, 0x09d5, 0x09e5, 0x09ee, 0x0508, 0x09fc, + 0x0a0c, 0x0a1b, 0x0815, 0x0a2b, 0x0a3a, 0x0a3b, 0x0a3b, 0x0a40, + 0x0a50, 0x0a60, 0x0a6c, 0x0a6c, 0x0a7b, 0x0a3b, 0x0a87, 0x0a3d, + 0x0a92, 0x0aa2, 0x0a6c, 0x0a6c, 0x0ab2, 0x0ac0, 0x0697, 0x0acc, + 0x092a, 0x0508, 0x0adc, 0x0aeb, 0x0af5, 0x0b02, 0x04d8, 0x0b0b, + 0x0b1b, 0x0b2b, 0x0a6c, 0x0a6c, 0x0a3b, 0x0a3b, 0x0a3b, 0x0a3b, + 0x0b3b, 0x0a3b, 0x0a3b, 0x0a3b, 0x0a3b, 0x0b4b, 0x0508, 0x0508, + 0x0b5b, 0x0508, 0x0508, 0x0508, 0x0b6b, 0x0b6b, 0x0b6b, 0x0b6b, + 0x0b6b, 0x0b6b, 0x0b7b, 0x0b7b, 0x0b7b, 0x0b7b, 0x0b83, 0x0b8b, + 0x0b8b, 0x0b8b, 0x0b8b, 0x0b8b, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0b9b, 0x0bab, 0x0508, 0x0508, 0x0b9b, 0x0508, 0x0508, 0x0ba3, + 0x0bb3, 0x092b, 0x0508, 0x0508, 0x0bb3, 0x0508, 0x0508, 0x0508, + 0x0bbb, 0x0bcb, 0x0adc, 0x0508, 0x071a, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0bd5, 0x0be5, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0508, 0x0be5, 0x0bea, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0bfa, 0x0c08, 0x0508, 0x0c18, 0x0508, 0x0c27, 0x0508, + 0x0c37, 0x077c, 0x0c47, 0x0a3b, 0x0a3b, 0x0a3b, 0x0a3b, 0x0a3b, + 0x0c57, 0x0c67, 0x071a, 0x0c77, 0x0c67, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0c08, 0x0c87, 0x0508, 0x0c8e, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0c9e, 0x0508, 0x05dc, 0x0cae, 0x0cae, 0x0cbe, + 0x0a3b, 0x0a3d, 0x0cce, 0x0a3b, 0x0a3b, 0x0a3f, 0x0a3b, 0x0cde, + 0x0cee, 0x0508, 0x0508, 0x0cfe, 0x0a3b, 0x0a3b, 0x0a3b, 0x0a3c, + 0x0a3b, 0x0d0e, 0x0c67, 0x0c67, 0x0a3d, 0x04d8, 0x0d1d, 0x0a6c, + 0x0a6c, 0x0a6c, 0x073b, 0x0508, 0x0508, 0x0d2d, 0x0d38, 0x0d48, + 0x0d57, 0x0d63, 0x0d73, 0x0508, 0x0732, 0x0697, 0x0508, 0x0508, + 0x06be, 0x0d83, 0x0508, 0x0508, 0x0d2d, 0x0d93, 0x0da3, 0x0697, + 0x0508, 0x0db0, 0x0c08, 0x0508, 0x0508, 0x05e0, 0x08ac, 0x072f, + 0x0dc0, 0x0dc9, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x04d8, 0x04d8, + 0x04d8, 0x04d8, 0x0508, 0x0bd5, 0x0508, 0x0508, 0x0bd5, 0x0dd9, + 0x0508, 0x05dd, 0x0508, 0x0508, 0x0508, 0x05d6, 0x05d6, 0x0de8, + 0x0508, 0x0df8, 0x0e08, 0x0e18, 0x0e28, 0x0e38, 0x0e46, 0x0e50, + 0x0e60, 0x0e70, 0x0e80, 0x0adc, 0x0e90, 0x0e9a, 0x0ea8, 0x04d8, + 0x04d8, 0x0eb8, 0x0ec8, 0x0ed5, 0x0ee4, 0x0508, 0x0508, 0x0ef0, + 0x0f00, 0x0f02, 0x0f0c, 0x0f02, 0x0508, 0x0508, 0x0508, 0x0f1c, + 0x0508, 0x0508, 0x0f2c, 0x0f3a, 0x0f49, 0x0f58, 0x0f66, 0x0f70, + 0x0f80, 0x0508, 0x0f88, 0x0f69, 0x0f93, 0x0f99, 0x0508, 0x0508, + 0x0fa9, 0x0508, 0x0fb9, 0x0fc7, 0x0fd3, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0fe3, 0x0508, 0x0508, 0x0fec, 0x0a6c, 0x0719, 0x0a6c, + 0x0ffc, 0x0ffc, 0x0ffc, 0x0ffc, 0x0ffc, 0x0ffc, 0x0ffc, 0x0ffc, + 0x0ffc, 0x0ffd, 0x0ffc, 0x0ffc, 0x0ffc, 0x0ffc, 0x0f00, 0x0ffc, + 0x0ffc, 0x1007, 0x0ffc, 0x1015, 0x1025, 0x1033, 0x103f, 0x104d, + 0x105b, 0x0508, 0x106b, 0x107b, 0x0508, 0x108b, 0x109b, 0x0508, + 0x10ab, 0x10bb, 0x0508, 0x104f, 0x0508, 0x10bd, 0x10ca, 0x10d9, + 0x10e8, 0x10f7, 0x1104, 0x0508, 0x0508, 0x0508, 0x0508, 0x1112, + 0x1121, 0x112b, 0x0ffc, 0x1137, 0x0508, 0x0508, 0x1142, 0x0508, + 0x114c, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x114f, 0x1157, 0x0508, 0x0508, 0x0508, 0x0fb9, 0x0508, + 0x113b, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x1162, 0x0508, + 0x0776, 0x0508, 0x05d5, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x116c, 0x117b, 0x0508, 0x0508, 0x0b5b, 0x0508, 0x0508, + 0x0508, 0x0c09, 0x118a, 0x0508, 0x0fec, 0x119a, 0x119a, 0x119a, + 0x119a, 0x04d8, 0x04d8, 0x11aa, 0x11b8, 0x11c8, 0x11d8, 0x11e8, + 0x11f8, 0x0a6c, 0x0a6c, 0x1208, 0x120e, 0x1208, 0x1208, 0x1208, + 0x1208, 0x1208, 0x121a, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, + 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, + 0x122a, 0x0a6c, 0x123a, 0x124a, 0x1258, 0x1268, 0x1278, 0x1288, + 0x1208, 0x1295, 0x1208, 0x12a2, 0x12b1, 0x12c1, 0x1208, 0x1295, + 0x1208, 0x12a2, 0x12cc, 0x1235, 0x1208, 0x1208, 0x1207, 0x1208, + 0x1208, 0x1208, 0x1208, 0x1209, 0x1208, 0x1208, 0x1208, 0x1208, + 0x1208, 0x121a, 0x12dc, 0x1208, 0x1209, 0x1208, 0x1208, 0x12ec, + 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, + 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, + 0x0508, 0x0508, 0x0508, 0x0508, 0x1208, 0x12fc, 0x1208, 0x1208, + 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, 0x1208, + 0x1208, 0x1208, 0x1208, 0x1208, 0x1302, 0x1208, 0x1208, 0x1208, + 0x1308, 0x0508, 0x0508, 0x0db0, 0x1318, 0x0508, 0x1328, 0x0a6c, + 0x0508, 0x0508, 0x116c, 0x1338, 0x0508, 0x116d, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0508, 0x1348, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0719, 0x1358, 0x0a6c, 0x0dae, 0x1368, 0x0508, 0x1375, 0x1385, + 0x0508, 0x0508, 0x0508, 0x1395, 0x13a5, 0x0508, 0x0508, 0x0d2d, + 0x13b5, 0x0c67, 0x04d8, 0x13c5, 0x0697, 0x0508, 0x13d5, 0x0508, + 0x13e5, 0x13f1, 0x0b6b, 0x1401, 0x073c, 0x0508, 0x0508, 0x1411, + 0x1420, 0x1430, 0x0a3b, 0x0cc4, 0x0508, 0x0508, 0x05c5, 0x13ee, + 0x143e, 0x144e, 0x0a3b, 0x0a3b, 0x0a3b, 0x0a3b, 0x0a3b, 0x0a3b, + 0x145e, 0x0a30, 0x05c3, 0x146e, 0x147d, 0x0c9d, 0x119a, 0x0508, + 0x0508, 0x0508, 0x0fe7, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x0508, 0x148d, 0x0c67, 0x149d, 0x14a1, 0x14ae, 0x14a5, + 0x14ae, 0x14a9, 0x14ae, 0x149d, 0x14a1, 0x14ae, 0x14a5, 0x14ae, + 0x14a9, 0x14ae, 0x149d, 0x14a1, 0x14ae, 0x14a5, 0x14ae, 0x14a9, + 0x14ae, 0x149d, 0x14a1, 0x14ae, 0x14a5, 0x14ae, 0x14ba, 0x0b7b, + 0x14ca, 0x0b8b, 0x0b8b, 0x14d5, 0x14e5, 0x14e5, 0x14e5, 0x14e5, + 0x14e5, 0x14e5, 0x14e5, 0x14e5, 0x14e5, 0x14e5, 0x14e5, 0x14e5, + 0x14e5, 0x14e5, 0x14e5, 0x14e5, 0x0a6c, 0x0a6c, 0x0a6c, 0x0a6c, + 0x0a6c, 0x0a6c, 0x0a6c, 0x0a6c, 0x0a6c, 0x0a6c, 0x0a6c, 0x0a6c, + 0x0a6c, 0x0a6c, 0x0a6c, 0x0a6c, 0x0fec, 0x14f5, 0x1504, 0x150e, + 0x151e, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x152e, 0x0dad, 0x0508, 0x0508, 0x0508, 0x153e, 0x0508, 0x0508, + 0x0508, 0x0508, 0x0508, 0x0dae, 0x0508, 0x0508, 0x0c09, 0x0a6c, + 0x0a6c, 0x154e, 0x04d8, 0x155e, 0x04d8, 0x156e, 0x157a, 0x158a, + 0x1599, 0x05d6, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, 0x0508, + 0x0508, 0x15a9, 0x15b9, 0x15c8, 0x1208, 0x15d8, 0x1208, 0x15e6, + 0x15f6, 0x1605, 0x1208, 0x1607, 0x1208, 0x1209, 0x1617, 0x161f, + 0x162f, 0x163e, /* values */ 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0022, 0x0003, 0x0001, 0x0001, 0x0002, 0x0004, 0x0004, @@ -213,7 +213,7 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[5672] = 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001b, 0x001b, 0x001b, 0x0019, 0x0019, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0017, 0x0004, 0x0011, 0x0017, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0017, 0x0004, 0x0017, 0x0017, 0x0017, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001b, 0x001c, 0x001c, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, @@ -239,243 +239,250 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[5672] = 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0022, + 0x0022, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, + 0x001c, 0x001c, 0x001c, 0x001d, 0x0004, 0x0004, 0x0004, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0004, 0x0004, 0x0004, 0x001d, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0022, 0x0022, - 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001c, 0x001c, 0x001d, 0x0004, 0x0004, 0x0004, 0x0011, 0x001d, + 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, - 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x0011, - 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, - 0x0004, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, - 0x0011, 0x0004, 0x0004, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, - 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x0011, - 0x001d, 0x001d, 0x0004, 0x0004, 0x0011, 0x0011, 0x001c, 0x001c, + 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, + 0x0011, 0x0004, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0011, 0x0011, 0x0004, 0x0004, 0x0011, 0x0011, 0x0004, 0x0004, + 0x0004, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, + 0x0011, 0x001d, 0x001d, 0x0004, 0x0004, 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001d, 0x001d, 0x001b, 0x001b, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001b, 0x001d, 0x001a, 0x001d, 0x001d, 0x0004, 0x0011, - 0x0004, 0x0004, 0x0004, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0011, - 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, - 0x0011, 0x0011, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0011, 0x0011, 0x0004, - 0x0004, 0x0004, 0x0011, 0x0011, 0x0004, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0011, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001c, 0x001c, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x0004, - 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x001d, 0x001d, + 0x001c, 0x001d, 0x001d, 0x001b, 0x001b, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001b, 0x001d, 0x001a, 0x001d, 0x001d, 0x0004, + 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, + 0x0011, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x0011, 0x001d, + 0x001d, 0x0011, 0x0011, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0011, 0x0011, + 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0004, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, + 0x001d, 0x0011, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, + 0x001c, 0x001c, 0x001c, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, + 0x0004, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x0011, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x0011, 0x0011, 0x0004, 0x001d, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, + 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x001d, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001a, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, + 0x0004, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0011, 0x0011, 0x001d, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0011, 0x0011, 0x0004, 0x0004, 0x0011, 0x0011, + 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, + 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0004, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, + 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, + 0x001d, 0x001d, 0x0011, 0x001d, 0x0011, 0x001d, 0x001d, 0x0011, + 0x0011, 0x0011, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x001d, + 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, - 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0011, 0x0011, 0x0004, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, - 0x0004, 0x0004, 0x0011, 0x0011, 0x001d, 0x001a, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, - 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0011, 0x0011, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0011, 0x0011, 0x0004, 0x0004, 0x0011, 0x0011, 0x0004, - 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, - 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, - 0x0011, 0x001d, 0x0011, 0x0011, 0x0004, 0x001d, 0x0011, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, - 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, - 0x0011, 0x0011, 0x001d, 0x001d, 0x0011, 0x001d, 0x0011, 0x001d, - 0x001d, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x0011, 0x0011, - 0x0011, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x001d, + 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, + 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0011, 0x0011, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001a, 0x001d, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, - 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x001d, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001a, 0x001d, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, - 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, - 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0011, 0x001d, + 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0004, 0x001d, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, + 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0004, 0x0004, 0x0011, 0x001d, 0x001d, 0x001d, + 0x0011, 0x0011, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0021, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0021, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0004, + 0x001d, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0021, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0021, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0004, 0x001d, - 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, - 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x001d, 0x0011, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, + 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0004, 0x0004, 0x001d, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, - 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, - 0x0011, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001b, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0004, 0x0004, - 0x0004, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, + 0x0004, 0x0004, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, + 0x0004, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, + 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001b, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0011, 0x001d, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0004, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0011, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0004, 0x0004, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, + 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x0011, 0x0011, 0x0011, 0x0004, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, + 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0011, 0x0011, 0x0004, 0x0004, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, + 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, 0x0011, 0x0011, 0x001a, + 0x0023, 0x0011, 0x0011, 0x0011, 0x0011, 0x001a, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x001d, + 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x001d, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001c, 0x001c, 0x0022, 0x0022, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0023, 0x0023, 0x0011, 0x0023, 0x0011, 0x0023, 0x0023, 0x0023, - 0x0023, 0x0023, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, - 0x0023, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0023, 0x0023, 0x0023, 0x0011, 0x0023, 0x0011, 0x0023, 0x0023, - 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, 0x001c, 0x001c, + 0x0022, 0x0022, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0023, 0x0023, 0x0011, 0x0023, 0x0011, 0x0023, + 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0023, 0x0023, 0x0023, + 0x0023, 0x0011, 0x0023, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, + 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0023, 0x0011, + 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x0011, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x001d, 0x0021, - 0x0021, 0x0021, 0x0021, 0x001d, 0x0021, 0x0021, 0x0006, 0x0021, - 0x0021, 0x0022, 0x0006, 0x0017, 0x0017, 0x0017, 0x0006, 0x001d, - 0x0017, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0022, 0x0004, 0x001d, 0x0004, - 0x001d, 0x0004, 0x0012, 0x0013, 0x0012, 0x0013, 0x0004, 0x0004, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, + 0x001c, 0x001c, 0x0011, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, + 0x001d, 0x0021, 0x0021, 0x0021, 0x0021, 0x001d, 0x0021, 0x0021, + 0x0006, 0x0021, 0x0021, 0x0022, 0x0006, 0x0017, 0x0017, 0x0017, + 0x0006, 0x001d, 0x0017, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0022, 0x0004, + 0x001d, 0x0004, 0x001d, 0x0004, 0x0012, 0x0013, 0x0012, 0x0013, + 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, + 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0022, 0x0004, - 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, + 0x0022, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0022, 0x0022, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x0021, - 0x0021, 0x0022, 0x0021, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0006, 0x0006, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001c, - 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001c, 0x0022, 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001c, - 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001c, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0011, 0x0011, 0x000c, + 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0022, + 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, + 0x001d, 0x0021, 0x0021, 0x0022, 0x0021, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0006, 0x0006, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, + 0x001c, 0x001c, 0x001c, 0x0022, 0x0022, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, + 0x001c, 0x001c, 0x001c, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, + 0x0023, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, + 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0011, + 0x0011, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, - 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000d, + 0x000c, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, - 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000e, + 0x000d, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, - 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, - 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x001d, + 0x000e, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, + 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x0011, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, + 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0004, 0x0004, + 0x0004, 0x001d, 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x001d, - 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, - 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, - 0x0011, 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x0011, 0x0011, 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0012, 0x0013, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0012, 0x0013, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0022, 0x0022, 0x0022, 0x001d, 0x001d, 0x0004, 0x0004, + 0x001d, 0x001d, 0x001d, 0x0022, 0x0022, 0x0022, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x0004, + 0x0004, 0x0004, 0x0022, 0x0022, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x0004, 0x0004, - 0x0004, 0x0022, 0x0022, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x0004, 0x0004, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0011, 0x0004, 0x0004, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0011, 0x0004, + 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0023, 0x0023, 0x0023, + 0x0023, 0x0022, 0x0022, 0x0016, 0x0023, 0x0022, 0x001d, 0x0022, + 0x001a, 0x0023, 0x0023, 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, + 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x0017, + 0x0017, 0x0022, 0x0022, 0x0021, 0x001d, 0x0017, 0x0017, 0x001d, + 0x0004, 0x0004, 0x0004, 0x0006, 0x0004, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0011, 0x0011, 0x0011, + 0x0017, 0x0017, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, + 0x001c, 0x001c, 0x001c, 0x001c, 0x0023, 0x0023, 0x0023, 0x0023, + 0x0023, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0022, 0x0022, 0x0016, 0x0023, 0x0022, 0x001d, 0x0022, 0x001a, - 0x0023, 0x0023, 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x0017, 0x0017, - 0x0022, 0x0022, 0x0021, 0x001d, 0x0017, 0x0017, 0x001d, 0x0004, - 0x0004, 0x0004, 0x0006, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, - 0x0011, 0x0011, 0x0011, 0x001d, 0x0011, 0x0011, 0x0011, 0x0017, - 0x0017, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001c, 0x001c, 0x001c, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x0023, 0x0011, 0x0011, - 0x0011, 0x0023, 0x0023, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, - 0x0011, 0x001d, 0x001d, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, + 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, + 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x0023, 0x0011, + 0x0011, 0x0011, 0x0023, 0x0023, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0011, 0x0011, 0x001d, 0x001d, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0011, 0x0011, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, + 0x0023, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, - 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x0022, - 0x0022, 0x001d, 0x0022, 0x0022, 0x0022, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, - 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, + 0x0004, 0x0004, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0011, 0x0011, 0x0011, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, + 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001c, 0x001c, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, + 0x0022, 0x0022, 0x001d, 0x0022, 0x0022, 0x0022, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0022, 0x0022, + 0x0011, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x0022, 0x0022, 0x0004, 0x0004, 0x0004, + 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, + 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0011, 0x0011, 0x0011, 0x0022, 0x0022, 0x0022, 0x0022, + 0x0022, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, + 0x001c, 0x001c, 0x001c, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x0022, 0x0022, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x0004, 0x0004, + 0x0004, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, + 0x001d, 0x0011, 0x001d, 0x0011, 0x001d, 0x0011, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, + 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0021, 0x001d, 0x0011, 0x0022, 0x0022, + 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0006, 0x0022, 0x0022, + 0x0022, 0x0009, 0x0004, 0x002b, 0x0004, 0x0004, 0x0022, 0x0006, + 0x0022, 0x0022, 0x0025, 0x0024, 0x0024, 0x001d, 0x0015, 0x0015, + 0x0012, 0x0015, 0x0015, 0x0015, 0x0012, 0x0015, 0x0024, 0x0024, + 0x001d, 0x001d, 0x001f, 0x001f, 0x001f, 0x0022, 0x0001, 0x0001, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0006, 0x001b, 0x001b, + 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001d, 0x0015, + 0x0015, 0x0024, 0x0016, 0x0016, 0x001d, 0x001d, 0x001d, 0x001d, + 0x0019, 0x0012, 0x0013, 0x0016, 0x0016, 0x0016, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x0022, 0x001d, 0x0022, 0x0022, + 0x0022, 0x0022, 0x001d, 0x0022, 0x0022, 0x0022, 0x000b, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, - 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, - 0x0011, 0x001d, 0x0011, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x001d, - 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0021, 0x001d, 0x0011, 0x0022, 0x0022, 0x0022, - 0x0022, 0x0022, 0x0022, 0x0022, 0x0006, 0x0022, 0x0022, 0x0022, - 0x0009, 0x0004, 0x002b, 0x0004, 0x0004, 0x0022, 0x0006, 0x0022, - 0x0022, 0x0025, 0x0024, 0x0024, 0x001d, 0x0015, 0x0015, 0x0012, - 0x0015, 0x0015, 0x0015, 0x0012, 0x0015, 0x0024, 0x0024, 0x001d, - 0x001d, 0x001f, 0x001f, 0x001f, 0x0022, 0x0001, 0x0001, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0006, 0x001b, 0x001b, 0x001b, - 0x001b, 0x001b, 0x001b, 0x001b, 0x001b, 0x001d, 0x0015, 0x0015, - 0x0024, 0x0016, 0x0016, 0x001d, 0x001d, 0x001d, 0x001d, 0x0019, - 0x0012, 0x0013, 0x0016, 0x0016, 0x0016, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x0022, 0x001d, 0x0022, 0x0022, 0x0022, - 0x0022, 0x001d, 0x0022, 0x0022, 0x0022, 0x000b, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x0011, - 0x0011, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0012, 0x0013, 0x0024, 0x001d, 0x0024, 0x0024, - 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0012, 0x0013, 0x0011, 0x001a, 0x001a, 0x001a, - 0x001a, 0x001a, 0x001a, 0x001a, 0x001b, 0x001a, 0x001a, 0x001a, + 0x0011, 0x0011, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0012, 0x0013, 0x0024, 0x001d, 0x0024, + 0x0024, 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0012, 0x0013, 0x0011, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001b, 0x001a, 0x001a, - 0x001a, 0x001a, 0x001b, 0x001a, 0x001a, 0x001b, 0x001a, 0x001a, + 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001b, 0x001a, + 0x001a, 0x001a, 0x001a, 0x001b, 0x001a, 0x001a, 0x001b, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, - 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001d, 0x001d, + 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x0004, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001b, 0x001d, 0x0024, 0x001d, 0x001d, 0x001d, 0x001b, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x001d, 0x001d, 0x001a, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, @@ -513,58 +520,57 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[5672] = 0x001d, 0x001d, 0x0012, 0x0013, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001e, 0x001e, 0x001e, 0x001e, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, + 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, + 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x0024, 0x0024, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0024, 0x0024, 0x001d, 0x0024, 0x0024, 0x0024, - 0x0024, 0x0024, 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0024, 0x0024, 0x001d, 0x001d, 0x0024, 0x0024, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0024, 0x0024, 0x0024, 0x001d, 0x001d, 0x0024, - 0x001d, 0x001d, 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0024, 0x0024, 0x0024, 0x0024, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, - 0x001e, 0x001e, 0x001e, 0x001e, 0x001d, 0x0024, 0x0024, 0x001d, - 0x001d, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001e, 0x001e, 0x0024, 0x0024, - 0x001e, 0x001d, 0x001e, 0x001e, 0x001e, 0x0029, 0x001e, 0x001e, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001e, 0x001e, 0x001e, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0024, 0x001d, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x001d, 0x0024, 0x0024, + 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x001d, 0x001d, 0x0024, + 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x0024, 0x001d, 0x001d, + 0x0024, 0x001d, 0x001d, 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x0024, 0x0024, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x0024, 0x001e, 0x001e, 0x001e, 0x001e, 0x001d, 0x0024, 0x0024, + 0x001d, 0x001d, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, + 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001e, 0x001e, 0x0024, + 0x0024, 0x001e, 0x001d, 0x001e, 0x001e, 0x001e, 0x0029, 0x001e, + 0x001e, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001e, 0x001e, 0x001e, 0x001d, 0x001d, 0x001d, + 0x001d, 0x0024, 0x001d, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0024, 0x0024, 0x001d, 0x0024, 0x0024, 0x0024, 0x001d, 0x0024, - 0x001e, 0x0024, 0x0024, 0x001d, 0x0024, 0x0024, 0x001d, 0x0024, + 0x001d, 0x0024, 0x0024, 0x001d, 0x0024, 0x0024, 0x0024, 0x001d, + 0x0024, 0x001e, 0x0024, 0x0024, 0x001d, 0x0024, 0x0024, 0x001d, + 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, - 0x0024, 0x0024, 0x0024, 0x0024, 0x001e, 0x001d, 0x001e, 0x001e, - 0x0024, 0x001e, 0x001e, 0x0024, 0x0024, 0x0024, 0x001e, 0x001e, - 0x0024, 0x0024, 0x001e, 0x0024, 0x0024, 0x001e, 0x001e, 0x001d, - 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x001e, - 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x0024, 0x001e, 0x001e, 0x0029, 0x001e, 0x0024, - 0x0024, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001d, 0x001d, - 0x001d, 0x001e, 0x001e, 0x0029, 0x0029, 0x0029, 0x0029, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x001d, - 0x001d, 0x001d, 0x0015, 0x0015, 0x0015, 0x0015, 0x0015, 0x001d, - 0x0017, 0x0017, 0x001e, 0x001d, 0x001d, 0x001d, 0x0012, 0x0013, - 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0024, 0x0024, + 0x001e, 0x0024, 0x0024, 0x0024, 0x0024, 0x001e, 0x001d, 0x001e, + 0x001e, 0x0024, 0x001e, 0x001e, 0x0024, 0x0024, 0x0024, 0x001e, + 0x001e, 0x0024, 0x0024, 0x001e, 0x0024, 0x0024, 0x001e, 0x001e, + 0x001d, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, + 0x001e, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x001e, 0x001e, + 0x001e, 0x001e, 0x001e, 0x0024, 0x001e, 0x001e, 0x0029, 0x001e, + 0x0024, 0x0024, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001d, + 0x001d, 0x001d, 0x001e, 0x001e, 0x0029, 0x0029, 0x0029, 0x0029, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, + 0x001d, 0x001d, 0x001d, 0x0015, 0x0015, 0x0015, 0x0015, 0x0015, + 0x001d, 0x0017, 0x0017, 0x001e, 0x001d, 0x001d, 0x001d, 0x0012, + 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0012, 0x0013, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0012, - 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, - 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0012, 0x0013, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0004, 0x0004, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0017, 0x0022, 0x0022, 0x0022, 0x001d, 0x0017, 0x0022, + 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, + 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0024, 0x0024, 0x0024, + 0x0024, 0x0024, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, + 0x001d, 0x0004, 0x0004, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0017, 0x0022, 0x0022, 0x0022, 0x001d, 0x0017, 0x0022, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, @@ -578,7 +584,9 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[5672] = 0x001d, 0x0022, 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0025, 0x0025, 0x0022, 0x0022, 0x0022, 0x001d, 0x0022, 0x0022, 0x0012, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, - 0x0022, 0x001d, 0x0022, 0x001d, 0x0022, 0x0022, 0x001e, 0x001e, + 0x0022, 0x001d, 0x0022, 0x001d, 0x0022, 0x0022, 0x001d, 0x001d, + 0x001d, 0x0017, 0x0017, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, + 0x0013, 0x0012, 0x0013, 0x0022, 0x0011, 0x0011, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x0011, 0x0011, 0x0011, @@ -605,9 +613,7 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[5672] = 0x0027, 0x001e, 0x0027, 0x001e, 0x0027, 0x001e, 0x0027, 0x001e, 0x0027, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0027, 0x0027, 0x001e, 0x001e, 0x001e, 0x001e, 0x0016, 0x0027, 0x0016, - 0x0016, 0x001e, 0x0011, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, + 0x0016, 0x001e, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, @@ -623,100 +629,99 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[5672] = 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x0004, 0x0004, 0x001d, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x0004, 0x001d, - 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, - 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0011, 0x0011, - 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001b, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0021, 0x0021, 0x0017, - 0x0017, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0022, - 0x0022, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0021, 0x001d, 0x001d, - 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0022, - 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0011, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, + 0x0004, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x001d, + 0x001d, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, + 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001b, 0x001d, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x0021, + 0x0021, 0x0017, 0x0017, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x000c, 0x000c, 0x000c, + 0x0011, 0x0022, 0x0022, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0021, + 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0022, 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, - 0x000c, 0x000c, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x0022, 0x0022, 0x0022, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0011, 0x001d, 0x001c, 0x001c, 0x001c, 0x001c, + 0x000c, 0x000c, 0x000c, 0x000c, 0x0011, 0x0011, 0x0011, 0x001d, + 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0022, 0x0022, 0x0022, + 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x001c, 0x001c, + 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, + 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x0004, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x0004, 0x0004, 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x0011, 0x0011, - 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, - 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x001c, 0x001c, 0x001c, 0x001c, 0x0011, 0x0011, 0x001d, 0x0022, - 0x0022, 0x0022, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0022, 0x0022, 0x001d, 0x001d, 0x001d, 0x0004, - 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x0022, 0x0022, 0x0022, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, - 0x0011, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0022, 0x0004, 0x0004, 0x0011, - 0x0011, 0x000f, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0022, 0x0022, 0x001d, 0x001d, + 0x001d, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0022, 0x0004, + 0x0004, 0x0011, 0x0011, 0x000f, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, - 0x0010, 0x000f, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, + 0x0010, 0x0010, 0x0010, 0x000f, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, - 0x0010, 0x0010, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x000d, 0x000d, - 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x0011, 0x0011, 0x0011, - 0x0011, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, - 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0010, 0x0010, 0x0010, 0x0010, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x000d, 0x0011, + 0x0011, 0x0011, 0x0011, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, + 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x000e, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0026, 0x0004, - 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, - 0x0026, 0x001d, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, - 0x0026, 0x0011, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0011, - 0x0026, 0x0011, 0x0026, 0x0026, 0x0011, 0x0026, 0x0026, 0x0011, - 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, - 0x0026, 0x0026, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x0013, 0x0012, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001b, 0x001d, - 0x0011, 0x0011, 0x0019, 0x0013, 0x0013, 0x0019, 0x0019, 0x0017, - 0x0017, 0x0012, 0x0013, 0x001f, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0012, - 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, - 0x0013, 0x0012, 0x0013, 0x001e, 0x001e, 0x0012, 0x0013, 0x001e, - 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0013, 0x001e, - 0x0013, 0x0011, 0x0016, 0x0016, 0x0017, 0x0017, 0x001e, 0x0012, - 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x001e, 0x001a, 0x001b, - 0x001e, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0011, 0x0011, 0x000b, 0x0011, 0x0017, 0x001e, - 0x001e, 0x001a, 0x001b, 0x001e, 0x001e, 0x0012, 0x0013, 0x001e, - 0x001e, 0x0013, 0x001e, 0x0013, 0x001e, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0016, 0x0016, - 0x001e, 0x001e, 0x001e, 0x0017, 0x001e, 0x001e, 0x001e, 0x001e, + 0x0005, 0x0005, 0x0005, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0026, 0x0004, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, + 0x0026, 0x0026, 0x0026, 0x001d, 0x0026, 0x0026, 0x0026, 0x0026, + 0x0026, 0x0026, 0x0026, 0x0011, 0x0026, 0x0026, 0x0026, 0x0026, + 0x0026, 0x0011, 0x0026, 0x0011, 0x0026, 0x0026, 0x0011, 0x0026, + 0x0026, 0x0011, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, + 0x0026, 0x0026, 0x0026, 0x0026, 0x001d, 0x001d, 0x001d, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x0013, 0x0012, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001b, 0x001d, 0x001d, 0x001d, 0x0019, 0x0013, 0x0013, 0x0019, + 0x0019, 0x0017, 0x0017, 0x0012, 0x0013, 0x001f, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x001e, 0x001e, 0x001e, 0x001e, + 0x001e, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, + 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x001e, 0x001e, 0x0012, + 0x0013, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, + 0x0013, 0x001e, 0x0013, 0x0011, 0x0016, 0x0016, 0x0017, 0x0017, + 0x001e, 0x0012, 0x0013, 0x0012, 0x0013, 0x0012, 0x0013, 0x001e, + 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x001e, + 0x001a, 0x001b, 0x001e, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x000b, 0x0011, + 0x0017, 0x001e, 0x001e, 0x001a, 0x001b, 0x001e, 0x001e, 0x0012, + 0x0013, 0x001e, 0x001e, 0x0013, 0x001e, 0x0013, 0x001e, 0x001e, + 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, + 0x0016, 0x0016, 0x001e, 0x001e, 0x001e, 0x0017, 0x001e, 0x001e, + 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, + 0x001e, 0x0012, 0x001e, 0x0013, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0012, - 0x001e, 0x0013, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0012, 0x001e, 0x0013, - 0x001e, 0x0012, 0x0013, 0x0013, 0x0012, 0x0013, 0x0013, 0x0016, - 0x001e, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, - 0x0027, 0x0027, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, + 0x001e, 0x0013, 0x001e, 0x0012, 0x0013, 0x0013, 0x0012, 0x0013, + 0x0013, 0x0016, 0x001e, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, + 0x0027, 0x0027, 0x0027, 0x0027, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, - 0x001e, 0x0016, 0x0016, 0x0011, 0x0011, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x0011, 0x0011, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x0011, 0x0011, 0x001e, 0x001e, 0x001e, - 0x0011, 0x0011, 0x0011, 0x001b, 0x001a, 0x001e, 0x001e, 0x001e, - 0x001a, 0x001a, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0007, 0x0024, - 0x0011, 0x0011 + 0x001e, 0x001e, 0x001e, 0x0016, 0x0016, 0x0011, 0x0011, 0x001e, + 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x0011, 0x001e, + 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x0011, 0x001e, + 0x001e, 0x001e, 0x0011, 0x0011, 0x0011, 0x001b, 0x001a, 0x001e, + 0x001e, 0x001e, 0x001a, 0x001a, 0x0011, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, + 0x0007, 0x0024, 0x0011, 0x0011 }; diff --git a/dlls/gdi32/uniscribe/mirror.c b/dlls/gdi32/uniscribe/mirror.c index 6409f222e39..44d63ebdb99 100644 --- a/dlls/gdi32/uniscribe/mirror.c +++ b/dlls/gdi32/uniscribe/mirror.c @@ -1,10 +1,10 @@ /* Unicode BiDi mirroring */ -/* generated from https://www.unicode.org/Public/13.0.0/ucd/UCD.zip:BidiMirroring.txt */ +/* generated from https://www.unicode.org/Public/14.0.0/ucd/UCD.zip:BidiMirroring.txt */ /* DO NOT EDIT!! */ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN wine_mirror_map[1414] = +const unsigned short DECLSPEC_HIDDEN wine_mirror_map[1428] = { /* level 1 offsets */ 0x0100, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, @@ -59,12 +59,12 @@ const unsigned short DECLSPEC_HIDDEN wine_mirror_map[1414] = 0x047c, 0x048c, 0x049c, 0x04ac, 0x04bb, 0x04ca, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x04d5, 0x04e4, 0x04f2, - 0x0502, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, - 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x050c, 0x051c, + 0x0502, 0x01d1, 0x01d1, 0x050d, 0x01d1, 0x01d1, 0x01d1, 0x01d1, + 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x051a, 0x052a, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, - 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x0528, 0x0537, + 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x0536, 0x0545, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, - 0x01d1, 0x053f, 0x0549, 0x01d1, 0x0558, 0x01d1, 0x0566, 0x0576, + 0x01d1, 0x054d, 0x0557, 0x01d1, 0x0566, 0x01d1, 0x0574, 0x0584, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, 0x01d1, /* values */ @@ -172,19 +172,21 @@ const unsigned short DECLSPEC_HIDDEN wine_mirror_map[1414] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2e1d, 0x2e1c, 0x0000, 0x0000, 0x2e21, 0x2e20, 0x2e23, 0x2e22, 0x2e25, 0x2e24, 0x2e27, 0x2e26, 0x2e29, 0x2e28, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x3009, 0x3008, 0x300b, 0x300a, 0x300d, - 0x300c, 0x300f, 0x300e, 0x3011, 0x3010, 0x0000, 0x0000, 0x3015, - 0x3014, 0x3017, 0x3016, 0x3019, 0x3018, 0x301b, 0x301a, 0x0000, + 0x0000, 0x2e56, 0x2e55, 0x2e58, 0x2e57, 0x2e5a, 0x2e59, 0x2e5c, + 0x2e5b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x3009, 0x3008, 0x300b, 0x300a, 0x300d, 0x300c, 0x300f, + 0x300e, 0x3011, 0x3010, 0x0000, 0x0000, 0x3015, 0x3014, 0x3017, + 0x3016, 0x3019, 0x3018, 0x301b, 0x301a, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xfe5a, 0xfe59, + 0xfe5c, 0xfe5b, 0xfe5e, 0xfe5d, 0x0000, 0x0000, 0x0000, 0x0000, + 0xfe65, 0xfe64, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0xff09, 0xff08, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0xfe5a, 0xfe59, 0xfe5c, 0xfe5b, 0xfe5e, 0xfe5d, 0x0000, 0x0000, - 0x0000, 0x0000, 0xfe65, 0xfe64, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xff09, 0xff08, + 0x0000, 0x0000, 0xff1e, 0x0000, 0xff1c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0xff1e, 0x0000, 0xff1c, 0x0000, + 0xff3d, 0x0000, 0xff3b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xff5d, 0x0000, + 0xff5b, 0x0000, 0xff60, 0xff5f, 0x0000, 0xff63, 0xff62, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0xff3d, 0x0000, 0xff3b, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0xff5d, 0x0000, 0xff5b, 0x0000, 0xff60, 0xff5f, 0x0000, 0xff63, - 0xff62, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + 0x0000, 0x0000, 0x0000 }; diff --git a/dlls/gdi32/uniscribe/shaping.c b/dlls/gdi32/uniscribe/shaping.c index 7beb763cf1c..e35544ee577 100644 --- a/dlls/gdi32/uniscribe/shaping.c +++ b/dlls/gdi32/uniscribe/shaping.c @@ -1,5 +1,5 @@ /* Unicode Arabic shaping */ -/* generated from https://www.unicode.org/Public/13.0.0/ucd/UCD.zip:ArabicShaping.txt */ +/* generated from https://www.unicode.org/Public/14.0.0/ucd/UCD.zip:ArabicShaping.txt */ /* DO NOT EDIT!! */ #include "windef.h" @@ -10,10 +10,10 @@ const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2099] = 0x0100, 0x010b, 0x010b, 0x011b, 0x0123, 0x012c, 0x013b, 0x014b, 0x015b, 0x016b, 0x017b, 0x018b, 0x019b, 0x01ab, 0x01b9, 0x01c8, 0x01d6, 0x010b, 0x010b, 0x01e1, 0x010b, 0x010b, 0x010b, 0x01f0, - 0x0200, 0x020e, 0x021d, 0x022d, 0x023d, 0x024d, 0x010b, 0x010b, - 0x025d, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, - 0x010b, 0x010b, 0x010b, 0x010b, 0x026d, 0x027d, 0x010b, 0x010b, - 0x028d, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, + 0x0200, 0x020e, 0x021d, 0x022d, 0x023d, 0x010f, 0x010b, 0x010b, + 0x024d, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, + 0x010b, 0x010b, 0x010b, 0x010b, 0x025d, 0x026d, 0x010b, 0x010b, + 0x027d, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, @@ -27,8 +27,8 @@ const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2099] = 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, - 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x0297, 0x010b, - 0x02a7, 0x02b7, 0x02c6, 0x02d6, 0x010b, 0x010b, 0x010b, 0x010b, + 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x0287, 0x010b, + 0x0297, 0x02a7, 0x02b6, 0x02c6, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, @@ -38,75 +38,73 @@ const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2099] = 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, 0x010b, - 0x010b, 0x010b, 0x010b, 0x02e5, 0x010b, 0x010b, 0x02f5, 0x0305, + 0x010b, 0x010b, 0x010b, 0x02d5, 0x010b, 0x010b, 0x02e5, 0x02f5, /* level 2 offsets */ - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0318, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0328, 0x0328, 0x0328, 0x0328, 0x0328, - 0x0328, 0x0328, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0338, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0327, 0x0328, 0x0348, - 0x0356, 0x0315, 0x0315, 0x0315, 0x0366, 0x0376, 0x0385, 0x038d, - 0x0328, 0x039d, 0x03ad, 0x03b5, 0x03bd, 0x03c7, 0x03c7, 0x03d7, - 0x03e7, 0x03ef, 0x03ff, 0x0316, 0x040f, 0x041e, 0x0328, 0x042e, - 0x043c, 0x0448, 0x0457, 0x0315, 0x0315, 0x0342, 0x0467, 0x046d, - 0x03c7, 0x0477, 0x0483, 0x0315, 0x0491, 0x049d, 0x0315, 0x04ad, - 0x04b9, 0x04c9, 0x0315, 0x0315, 0x0315, 0x04d9, 0x04e8, 0x04f2, - 0x0345, 0x0502, 0x0328, 0x039a, 0x0315, 0x0315, 0x0512, 0x0521, - 0x0530, 0x053e, 0x0315, 0x054d, 0x0315, 0x0315, 0x0542, 0x055c, - 0x0315, 0x053e, 0x0317, 0x056b, 0x0315, 0x0315, 0x0542, 0x057a, - 0x054d, 0x0315, 0x0586, 0x056b, 0x0315, 0x0315, 0x0542, 0x0595, - 0x0315, 0x053e, 0x05a3, 0x054d, 0x0315, 0x0315, 0x0319, 0x055c, - 0x053b, 0x053e, 0x0315, 0x054c, 0x0315, 0x0315, 0x0315, 0x0541, - 0x0315, 0x0315, 0x0315, 0x05b2, 0x0315, 0x0315, 0x054f, 0x05c2, - 0x053b, 0x053e, 0x0315, 0x054d, 0x0315, 0x0315, 0x0319, 0x05d0, - 0x0315, 0x053e, 0x0315, 0x039b, 0x0315, 0x0315, 0x0570, 0x055c, - 0x0315, 0x053e, 0x0315, 0x054d, 0x0315, 0x0315, 0x0315, 0x0544, - 0x05de, 0x0315, 0x0315, 0x0315, 0x052d, 0x05e7, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x05f6, 0x05a5, 0x0315, 0x0315, - 0x0315, 0x0538, 0x0315, 0x0603, 0x0315, 0x0315, 0x0315, 0x0347, - 0x0613, 0x0620, 0x0328, 0x032b, 0x0548, 0x0315, 0x0315, 0x0315, - 0x0550, 0x062f, 0x0315, 0x0573, 0x0467, 0x063e, 0x064c, 0x0318, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0550, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x065a, 0x0315, 0x065a, 0x0315, 0x053e, 0x0315, 0x053e, - 0x0315, 0x0315, 0x0315, 0x0666, 0x031f, 0x0670, 0x0315, 0x0315, - 0x067e, 0x0315, 0x03c7, 0x03c7, 0x03c7, 0x03c7, 0x03c7, 0x068e, - 0x0699, 0x03c7, 0x06a0, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x06b0, 0x06be, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x06ca, 0x0315, - 0x0315, 0x0315, 0x06d6, 0x06e4, 0x06f1, 0x0315, 0x0315, 0x0315, - 0x0328, 0x0467, 0x0315, 0x0315, 0x0315, 0x0399, 0x0315, 0x0315, - 0x0701, 0x054c, 0x0315, 0x070e, 0x0399, 0x039b, 0x0315, 0x071e, - 0x0315, 0x0315, 0x0315, 0x072c, 0x039b, 0x0315, 0x0315, 0x0551, - 0x073b, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x074b, 0x075a, 0x0763, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0328, 0x0328, 0x0328, 0x0751, 0x076d, 0x0315, 0x058c, - 0x0315, 0x0315, 0x0315, 0x077b, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0328, 0x0328, 0x0467, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0316, 0x039b, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0316, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0328, 0x0328, 0x0315, 0x0315, 0x0553, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x078b, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0316, 0x079b, 0x0315, - 0x054f, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x039b, 0x07a9, - 0x0315, 0x07b5, 0x0315, 0x03c7, 0x03c7, 0x03c7, 0x07c5, 0x0315, - 0x0315, 0x0315, 0x0315, 0x053c, 0x0315, 0x0328, 0x056c, 0x0315, - 0x0315, 0x07cf, 0x0315, 0x035f, 0x039b, 0x0315, 0x0315, 0x039a, - 0x0315, 0x0315, 0x07dd, 0x0315, 0x0315, 0x0549, 0x0315, 0x0315, - 0x05a4, 0x07e8, 0x07f5, 0x0315, 0x0315, 0x0542, 0x0315, 0x0315, - 0x0315, 0x0805, 0x054d, 0x0315, 0x056f, 0x0548, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0815, 0x0315, 0x0317, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0328, 0x0315, 0x0328, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0316, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, 0x0315, - 0x0315, 0x0315, 0x0315, 0x0315, 0x0823, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0308, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0318, 0x0318, 0x0318, 0x0318, 0x0318, + 0x0318, 0x0318, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0328, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0317, 0x0318, 0x0338, + 0x0346, 0x0305, 0x0305, 0x0305, 0x0356, 0x0366, 0x0375, 0x037d, + 0x0318, 0x038d, 0x039d, 0x03a5, 0x03ad, 0x03b7, 0x03b7, 0x03c7, + 0x03d7, 0x03df, 0x03ef, 0x0306, 0x03ff, 0x040e, 0x0318, 0x041e, + 0x042c, 0x0438, 0x0447, 0x0305, 0x0305, 0x0332, 0x0457, 0x045d, + 0x03b7, 0x0467, 0x0473, 0x0305, 0x0481, 0x048d, 0x0305, 0x049d, + 0x04a9, 0x04b9, 0x04c9, 0x04d6, 0x034e, 0x04e6, 0x04f5, 0x04ff, + 0x0318, 0x050d, 0x0318, 0x038a, 0x0305, 0x0305, 0x051d, 0x052c, + 0x053b, 0x0549, 0x0305, 0x0558, 0x0305, 0x0305, 0x054d, 0x0567, + 0x0305, 0x0549, 0x0307, 0x0576, 0x0305, 0x0305, 0x054d, 0x0585, + 0x0558, 0x0305, 0x0591, 0x0576, 0x0305, 0x0305, 0x054d, 0x05a0, + 0x0305, 0x0549, 0x05ae, 0x0558, 0x0305, 0x0305, 0x0309, 0x0567, + 0x0546, 0x0549, 0x0305, 0x0557, 0x0305, 0x0305, 0x0305, 0x054c, + 0x0305, 0x0305, 0x0305, 0x05bd, 0x0305, 0x0305, 0x05c2, 0x05d1, + 0x0546, 0x0549, 0x0305, 0x0558, 0x0305, 0x0305, 0x0309, 0x05df, + 0x0305, 0x0549, 0x0305, 0x038b, 0x0305, 0x0305, 0x057b, 0x0567, + 0x0305, 0x0549, 0x0305, 0x0558, 0x0305, 0x0305, 0x0305, 0x054f, + 0x05ed, 0x0305, 0x0305, 0x0305, 0x0538, 0x05f6, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0605, 0x05b0, 0x0305, 0x0305, + 0x0305, 0x0543, 0x0305, 0x0612, 0x0305, 0x0305, 0x0305, 0x0337, + 0x0622, 0x062f, 0x0318, 0x031b, 0x0553, 0x0305, 0x0305, 0x0305, + 0x055b, 0x063e, 0x0305, 0x057e, 0x0457, 0x064d, 0x065b, 0x0308, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x055b, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0669, 0x0305, 0x0549, 0x0305, 0x0549, 0x0305, 0x0549, + 0x0305, 0x0305, 0x0305, 0x0675, 0x030f, 0x067f, 0x0305, 0x0305, + 0x068d, 0x0305, 0x03b7, 0x03b7, 0x03b7, 0x03b7, 0x03b7, 0x069d, + 0x06a8, 0x03b7, 0x06af, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x06bf, 0x06cd, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x06d9, 0x0305, + 0x0305, 0x0305, 0x06e5, 0x06f3, 0x0700, 0x0305, 0x0305, 0x0305, + 0x0318, 0x0319, 0x0305, 0x0305, 0x0305, 0x0389, 0x0305, 0x0305, + 0x0710, 0x0557, 0x0305, 0x071d, 0x0389, 0x038b, 0x0305, 0x072d, + 0x0305, 0x0305, 0x0305, 0x073b, 0x038b, 0x0305, 0x0305, 0x055c, + 0x074a, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x050c, 0x075a, 0x0763, 0x076d, 0x0305, 0x0597, + 0x0305, 0x0305, 0x0305, 0x077b, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0318, 0x0318, 0x0457, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0306, 0x038b, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0306, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0318, 0x0318, 0x0305, 0x0305, 0x055e, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x078b, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0306, 0x079b, 0x0305, + 0x055a, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x038b, 0x07a9, + 0x0305, 0x07b5, 0x0305, 0x03b7, 0x03b7, 0x03b7, 0x07c5, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0547, 0x0305, 0x0318, 0x0577, 0x0305, + 0x0305, 0x07cf, 0x0305, 0x034f, 0x038b, 0x0305, 0x0305, 0x038a, + 0x0305, 0x0305, 0x07dd, 0x0305, 0x0305, 0x0554, 0x0305, 0x0305, + 0x05af, 0x07e8, 0x07f5, 0x0305, 0x0305, 0x054d, 0x0305, 0x0305, + 0x0305, 0x0805, 0x0558, 0x0305, 0x057a, 0x0553, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0815, 0x0305, 0x0307, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0318, 0x0305, 0x0318, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0306, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, 0x0305, + 0x0305, 0x0305, 0x0305, 0x0305, 0x0823, /* values */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -164,87 +162,89 @@ const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2099] = 0x0002, 0x0003, 0x0002, 0x0002, 0x0002, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, 0x0000, 0x0003, 0x0003, 0x0003, 0x0003, 0x0000, 0x0002, 0x0003, 0x0002, 0x0002, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, 0x0003, 0x0003, 0x0003, - 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0002, 0x0002, - 0x0002, 0x0000, 0x0002, 0x0003, 0x0002, 0x0002, 0x0003, 0x0003, - 0x0000, 0x0003, 0x0003, 0x0003, 0x0002, 0x0003, 0x0003, 0x0003, - 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0002, 0x0002, 0x0002, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0000, 0x0000, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0002, + 0x0000, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0003, 0x0003, 0x0002, 0x0002, 0x0002, 0x0000, 0x0002, + 0x0003, 0x0002, 0x0002, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0002, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0003, 0x0003, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, - 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, - 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, - 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, - 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, - 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, + 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, 0x0000, 0x0006, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, + 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, - 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, + 0x0000, 0x0006, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, + 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, 0x0000, 0x0006, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, + 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0003, 0x0000, 0x0000, 0x0003, 0x0006, 0x0006, 0x0006, 0x0000, - 0x0000, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, - 0x0003, 0x0003, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0006, 0x0006, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, - 0x0003, 0x0003, 0x0003, 0x0003, 0x0006, 0x0003, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, + 0x0000, 0x0000, 0x0003, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, + 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0006, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0003, 0x0003, 0x0006, 0x0003, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, - 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, - 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, + 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, + 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, - 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, - 0x0000, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, + 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, - 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, - 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, diff --git a/dlls/gdi32/vertical.c b/dlls/gdi32/vertical.c index 4f9195002c5..0df776b7f4d 100644 --- a/dlls/gdi32/vertical.c +++ b/dlls/gdi32/vertical.c @@ -1,5 +1,5 @@ /* Unicode Vertical Orientation */ -/* generated from https://www.unicode.org/Public/13.0.0/ucd/UCD.zip:VerticalOrientation.txt */ +/* generated from https://www.unicode.org/Public/14.0.0/ucd/UCD.zip:VerticalOrientation.txt */ /* DO NOT EDIT!! */ #include "windef.h" diff --git a/dlls/kernelbase/digitmap.c b/dlls/kernelbase/digitmap.c index 53efb4b2750..26a464e30f5 100644 --- a/dlls/kernelbase/digitmap.c +++ b/dlls/kernelbase/digitmap.c @@ -1,5 +1,5 @@ /* Unicode digit folding mappings */ -/* generated from https://www.unicode.org/Public/13.0.0/ucd/UCD.zip:UnicodeData.txt */ +/* generated from https://www.unicode.org/Public/14.0.0/ucd/UCD.zip:UnicodeData.txt */ /* DO NOT EDIT!! */ #include "windef.h" diff --git a/dlls/wineps.drv/vertical.c b/dlls/wineps.drv/vertical.c index 4f9195002c5..0df776b7f4d 100644 --- a/dlls/wineps.drv/vertical.c +++ b/dlls/wineps.drv/vertical.c @@ -1,5 +1,5 @@ /* Unicode Vertical Orientation */ -/* generated from https://www.unicode.org/Public/13.0.0/ucd/UCD.zip:VerticalOrientation.txt */ +/* generated from https://www.unicode.org/Public/14.0.0/ucd/UCD.zip:VerticalOrientation.txt */ /* DO NOT EDIT!! */ #include "windef.h" diff --git a/nls/l_intl.nls b/nls/l_intl.nls index a5b4bcfc3036add7cd72253e887c341f104b8210..16387e27c685990e18dd08a211d35d4a9db51320 100644 GIT binary patch delta 120 zcmeCsUZu^?$S{?afl+`_fl-UmiqU;yqUc7I1ZKu#lUtb+<wICwSp}KWffxo$fb14l zDBR4-vXyP}AugfGN4OFg?Ki7(mohVEPM*!@&o0cW%=(Q{Z}UgKWVXpsqAHVnM7So` L2=YyyB_ad>Fi;&O delta 112 zcmZ3b-J#9T$S{$Wfl+`_fl-UmiqU;yqUc7I1ZKwLlUtb+<s(=HnFN`V!6b+!$W#Di zH?TtCW>%K1Y?C)}Nlm`P6~Jh;S(m$%nK5hfVm^O%G1hO4-xw7)|Kv+%n;a&pHCaG} F3jjUa8j%11 diff --git a/nls/normidna.nls b/nls/normidna.nls index d4b37dfd66505dfbe27f0341845986b14a452841..f612d78f248d05b50274d31ca61bbe5642ace13d 100644 GIT binary patch delta 29417 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 delta 28571 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 diff --git a/nls/normnfc.nls b/nls/normnfc.nls index d9a88835e68481b0a8c717538d8ab7b5569c7a0a..8449e5dc8398643290d0fc67ec17702bee88fa02 100644 GIT binary patch delta 1282 zcmcgrT~HfU6uvjfCj6#Rz!oc#b}C>YfI38h*us#eSR#o;D1?@@=^wN~mR8eRL$fK+ zmMY5T*dNguM<1NAwkh-~_6H@cwpOi{iodifd6afK`{aYSj^5n_UmRaO54-1_`<?Hc z^X=WSOX{)9>LDZ6i;J?;met;_yU=oT)9hx1#ZZp8p*tN}SJ+n8q9<0>*`KTzW7DFP zGS7jK^C{Hedb+V`b#sdwVz>?@oDM}Q>+04uYugY)o^|WJ8#Zp*yoI)RY(?9Aod`YC z#dmMt@$7T{ox7gjO<xG~><J2?y}f<?bl-k@VBp}3^rgX<Ul|f94a2L4=wW(<@yK@c zH8c#>s!aSk+)(|s@LhzCA@m;ommNRBP)od#VRUk2^b~oYelYeSLZ{Igh2`uV{u~{r zA5r@8TudiW^t=*W_~cW1@e-w<T}GdOL6s_mzP$3)*H;mmyoSC>R7@!{?7-iOF{AoB z^t~7>!as<ya(G*tZTOSfPybL;hRws%B$V_c##8L|2L`8#`yX6x>N-U?l#VL;ADzXR zg`8d-<1iw_1q~{&H|K(|CW#A@NF)-@FNUbVX_y-!j=~N#?u9eOMvP#(ILIp8B`3Av z5}m5QAB@fSL#g>X@bzinv~lFVN8eKE2_qr0DNh*fGXt(z2}jFvVN1o`aIDru-l>?x z_ypN$xu}APE(5VI|5YPORph31BTkSlf*HSt2(|$=j5JlSPWhs=45D3`avrMc?kG5E ztyUdGK^XPqD0!nf1D4mPk|BG9W6XCcNx@tWe9dAQS~nkfkB;41Blui;n8)WRQ@`PI zYN4kf6)b%Vz+_5>Xros4aS$Hzt&l0g?p`=zTN*A(hVs2N@Uve>1otg%yk((Y!&Z&J z`L?A>Vr2a|jBM4W1m~<@jAg?i?}JRc3GeS39f}`-=&uYHateRDMU-@GyK*@qLi=$Q zbcU=j<IRHM<~-nAl3~)NBj>hNYr=&FrKHKj@afP~T9Ozm!36?;3vN3cayGLpkIZ(5 znO>bdE8-x}WMJE+h*BmiHjyj-UzpxC*>QOffYY1;cXs^-PInqaJ*je^Q@aBi`3-{K z4pnWXB(TST<B5mw#RRVUvmhF@z<6sFOqLttCq6BNd|C1YZ`vMb4N{3+806SBGq8_o zfXc>Xn0f3GQK|%fUw~b#YyJ!n3X(|D{#y2%4CHf2)(FN|nHXNrDSClr`$CvsmJT^> z3&3K|h_jclJswb+@&{)VbKfJ!;qF!_?WhL5%PdNEhSGzhp;MHs%*`c%!LyBj1Ky1| A?EnA( delta 1209 zcmcgrTToM16g?+54^RWKpaQi6;s{j{lj#T=(~2}=YEnr^ArPPhd>~LYX>C($>J6x^ zh*(Z`YpedmpH6MDDo4@!qz~WPLZ4G~+GM6bI)2<QKYHl2C-)}9N2kBtKX>o5*IsMy zea;=eAq-y=1`4pA%*ma0dG!{1Wkc77&W#9@?x)DQfZn>QYPIbJw8rjuacwn;kLNm3 z%3KK5xY0|sb)NbLZ(|e0u^l9=hZ2?5)BJLa524n!b?Y~5Y~R$;$+}+IjJ9lL2>Dsy z)z`MY{zmZ4?QiX1p|^L6;qIPYyZ5}q-rdW3_x0^({RiF~AQ8sk{SOYZ57|day+eo5 z5m>330rypZKgo%XA@nKxmwh(KF-1Of{PPnhPYp48`V2zD=&a0fZW8?kJI~mK$rxR{ zBnOwTjIb}iV(ja0(A8^PM7HZUZr-|m=kB-Pq0wZ;7>WNuqz?Q&i5CbzpdU%R1ph?h z%ka-!J;(4Dw_hg7Il2hk+FUx2HiGdO?N0j>gHxsXA6#MVS4NL&$1xNLbN@?^#4Yq( zVO)bndid!Y6+}fN_=0K(o2Exf(ji>0gX#u7&sHz&5a5zq2Ukk-un6O&B0uylKB0wD zqYm$ZfGHo0W%qay%`QKt0(Z}Rh%K9$Ad8r7aH};R+RabEp(Tsx$L3MYi-VS{DyZ0M zppF&4t5agJ#<{TA)<h%|?Xs@NJijPGF;vwn5Xle5S_52gr$cP138HnyM0$=RvgM8| z)=Yr^`Kd7IU67nW55~?cB4yD}><2X*H(fsWRdys)6-=3h*Ax<ICOFH|_$w}eN3IOm z@0!hHEuCHC)WY%2na~o{L>hKc!TUf9&Xx+f*4TQH^JD_E=0H~4LO#%nw#RCns2C7Y zfrZ;G947lin+8=d+Ad2+0;?d;Qv{MH9h@~fy1Z+pTBen3OTfIl68t8O(xU$n-0$%v z+s&g70}%xn79G?P{0$Sy#+#i26Wbqfp;-yw(2kIrPKX8!BhAWnR&-n7ZrwbHHO_&4 z*A(jL>DNHiI}Lnm)yakGlHX^Dv>g0<LlA9JmLye`5h)|FAnNE<bG><~%QA$lVCX9+ zk`tW!iXqxO1DZm`FxZ?f@Sg`-?b+O)ue5H;OjX5pmZx3@`1>C6rVEqPnZQ>+3u2xe aBAJzYY2(=psCGR|q;1^Ir=bJqYySb`G7Sy@ diff --git a/nls/normnfd.nls b/nls/normnfd.nls index bc8bfed2b1e35b759b25c51c7db05323e8b53b15..8551cf6b1529f66bb7e793ed309da40e46003232 100644 GIT binary patch delta 1335 zcmcgqYfu|i6u!IJO$vp$2sMSaCS`1JA_*`h*2pWAq=;Y%v<1q$Sc;@HL~HCrN&+-} zP;1#ewe2|LjP*y=+NQ#_DmHEL{X!cbqqU-vpU%*k{q4o6H@nb3j(<HrcJJByo$ve3 z*)u9>Mo((SOpIP!otZpXX{(-T;=B27(KVKe%GX!8+-O7PV^xn=i}72coP19WLQiZ& zwVt~AO`EqgG(w!I2AN5PT-Mdtw6(bfA=KK|-qE?O>&fk;dq)p?s@IFq&c0o~e*e?Y z?0z=z+#a%b-~Q(Z4h#lEL&Id`APFBje1sewJ@&%!7YR8rCQ1azNy?LmmrkM6P|jvB zXJCfCv*H{=uOsvZ`B%Joo}wP;dh0a0a4~Y}?Qt@J-$CdydRJk2ZxR1KnIs<&a%C|m zQFQg1l3btqkbLwpA)kDTKKq;~RS13Y<yT)%BlOL;=*B`tOc}#&<~uQN(tMA85aYSb zk7C>buW2)dziIq*mzq$lnfVzHExE}sG5Y$80T0Xn4@W+Blb~M|MV9=BvKV*bX!dU$ zgYe5a^(;&`7^Rjad=N(>5y@-=XOQRUF@kF?y&7f&Caoq0!7Xc$7Bt%~X(gME4Ts^? zhWjDk{wv5eDG+n<c;&-qSv{sCI1$Pd3P#oe>(~Hi3XRa?xECyyR(#G8W3(6X<p_?z z*`h3bs>sYjnNPseC4X?D?8G}OwlfQ?tD!T%L8#z9>7gWSbbB?BzvWS?oFmGm;PhoE z*HcyV3f$kS)dW!x3ffmG-%a*(xL&gq3)K;x3Z$uAb_dAi*&uWnKyK5~B{soaogPm3 zR;gXod$e%dodQ>f4Pebp0_SEeM2D9%K^XVC7bw<J3r6tRlVPSQ2MlftwFi@-3TO-H zCbrILRe6h^qhp9bd7DM~klz`F{9bKxa52JSJPS-^X>h(&593`KxN6%Rr$g#Bqy>s3 z3$H5fC>CWMZP<}WCweZha69M%dEYX~YBYntAqhP7I$Y!}=Ol}ul*~FiC_WVq<mD}x zyGv%TSY(1we;@cZ)+P`cg=XyaOB{IG{gi<RbFM&}PX?iBB}@&i!8L*38JM+Ys^dSR zv_G)tPbl>nRFn2nd~I(jmq?^Q4NSG><M{!BQ7;R!7!0+6We~DI2&Q%p`UV9kZgxWK z5tCBk;oy$fkZ@vjmr$LhczW<SPnT1m|6G78o04F5-C9vD0{P$o-N(8>Iu3<B48#uS z@F+1fD6X<nte#f}2vPqEFchZ3E3M0+*q*L3=h4>JD2`&?DKHf(rtPkW{YN`#8`-MU d{uWU#OYDd!cTuz+Zg_TyvWp&#c>b8a<R6zpJb?fJ delta 1225 zcmcgrT~t(66h3!mm;rLeK}bO@MqJLAF$9YyL%=|R5HW5bzYaMW4Ni@MDTPWigES$e zHD^Afa`liemS#Ym>`w~%|0A5T)dN}1tksLv!+q+ZV?Sr^OpAwBukDxf?YsB>zJ1Q# zcl3mIG^`C-BqLpwlm2JTc%8E?*cI%eRUu>Lrp;B=HRR6PEp=P#X>2}c8~MlXBBVhk zcQ-a|Z*FOAYe!7l3Pmy^UsKiEvBTL($UQq<_wKr{>wb4P-|cyTJm}?w?BRQRdiOoF z|3KfvkM#3{hYk-s>hlK%j|}n0g8cE}qa%FuiDSo~e2ViB4TGQHPbc-po*~boQgb~n zYyMgxh)xsoBLA1YbVlS@UF7V`=Uy3~;FGVuMhGLXs~qPSvftoua{ktWPu_k<buLW3 z%io*keCB=f!G}UbwU0jj<kQbS|KiJ8@>Q~8j>dkXibuLgV-{_Md`)Bd(l<0#B3%;d z+2%ileY-#|vaM*+=de)fj3mvm!PMU+$eNV@0cz*I<Ls1vUV=rt`oHvOtb$GD{h*Wl z?4+$x1B<T^(LNmlg&E<S)55I=RJcv7VVy^d@<s!u?aL)U=Iwrw-%&83N5L%yDTsZA zxhQmeFDh8pZD%yN6u1e|+n2_f!X>rnug*nx$r3zwtDT)LiAZ`sJ3r3GajJAV8!NSH zFtf+ZX3MYWl9H~D)tIPpQl*IfvZ+fFVSAj41*%50RO!WJlNqIrX^5^bf~DC;m5m}L zOYM86_8OuE*CD@sUGg4AOzzI4N+w%dH<lvuG7{hSd*Z4I>?ng$nMakSkR7RFmo4zh zCM=Ry3SZBjmt{Td-o?1mmx6$!SV-oIKsqkB+SpLrRXrk|6)Mr>&M85<7>74!<Ayu3 zaCW09JvfxyBtM&W{iZYc6NU_*S`&7ci4qmEfcu;VvOC#SPc=?9TcK=ELqs;P3!X|{ zT!aPodL=jqU2!MevXXgwLuw%Gt7o%)KT1@oRl6JLzbcrQC29^1=-7bIETO`goUdao zUg*@}SHBtCn%BV9u?j{xoy`W0r@+#_2+?|7@{JA2vlx-4GW2$5hBp*b<whZ5fOFUk z%MP_;78sT#gnFz9jjX52io`6b(vQed8!S%o^B%Gx-<hTr4}#d1EP=(Ah+T8FFA?K* vh;G-YzB2N&z<DYTIEoN$Sq4{2HdQtx#<WXBO}N-lPL%@!=CW(YOyz$Aml7S$ diff --git a/nls/normnfkc.nls b/nls/normnfkc.nls index bddf295de95992233a4e102b9edfa5d3c5ab2cc5..1e701ddf22db643328bf54fb38522616def67570 100644 GIT binary patch delta 24255 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 delta 23773 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 Y<wM5%bop5CI_2+HK9(0=esI|T00~#M{{R30 diff --git a/nls/normnfkd.nls b/nls/normnfkd.nls index 6c5e9f0382c13746355504800b82633b9bd1d85e..5121c38fc25eb3b17cc7db607f372c0f16bbcaab 100644 GIT binary patch delta 24264 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 zΠ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 delta 23755 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 F`5!G04wwJ{ diff --git a/nls/sortdefault.nls b/nls/sortdefault.nls index 8d6cc62209f770b865f0d2af2ca7fb6d9ff27fb6..43f86fb16783b183d2070e35ce1b469b12235649 100644 GIT binary patch delta 4172 zcmb7H4R90371r67k#)DalkRjYold_tiDP4I#}*W9u#E*c*kIfwg@o|qk`^fO07Yby z5-JGMFqxR*hM^Z4Q->0UCYTaW%3Lxv37)oT(wa6jkfH(wnx8^ze%zWL6H5DTSBGsf zVW#)ydvCve-@biX-JM29&-5}!&-OA%uvjd@aoO^cf-ToKpd@0FC?kn7lPD{RtVxue zM5B_(mP9#8WKSYCiMS*JnInn#BodOynMAH65|c<uBKH9#TaTk{RtqCAA*O(t$V}H( z9hcpD`EhwsCi9-Q?S$MMe8@WA>daUIFf9(_=d5Yd-6!P(*_xflE^V9xT!6>3m@2)6 z$83gP{h9n7hFPZV{akJwC0cW>SDCRo^LKf1wsy;l^R)Ip*{=Qd7Pt~G&eC4*lU<pN z<$e9-3$m8U^l4@Na&zG(YnxTg_%Xn=Juud-rkS&a86{fHW$6ECzx?T!T3Sk5(x4?( zpYeq}i($U6ZNCY9RazUMuQ?j@^-KMhh;LZ$*4$zJL?(vj`nA=gaC2d+bsIF(F|4^x z7<XGuGn;G7h|=aH8@~9Z=30#A)?_jpwNG5Qaa4`92|9XApCICQzw)F!%p-cKg7;*3 z^K79kY7H=Y!q#f*wDsEhY@F5~z;hB~avIY1L=Lsqod4JIY@Ip1Ip=aR>=FAE`#0?? z?d$Dr_E+qC?7ICO`(gV>_D}5pwr8>;o6DB5wd{lJOm;E5nr&idCfEe~1Gb&*WV_j3 z_AhKBdmaSS*+JIINnCE)iXm2UGr9R(3-=7yI>OqyPOh8#9hc%xbC<YlTsD%?XjF`< zP%hVqu5k-d3wXoUq0ML;>PWNwpm_@=j4j?r$59HMK<CjQx`mL#?<jH%!g!LS&N0`q zl#C5Nh~kcoj;)SejwLXcLT?VsOmY0m@e%M-j`PN>!^*q)K{T3=f}hGi41N$zcBIf^ zK805Daj@_4&-2?8{2pHC-{b$pr}%UHH9lK#3!{Z{!Qi#R*M(+brLbPuBD^f5_}7KE zg%2Q~63&zSbs^g+Io(2@^L}TIv&p&8xx$%nt`xR7JDhu+DZa~j$oU7zpLF&Se#M#P za=F|>z%|yj*BR$4UG=WSJeXMSTI+hw73W`c{nXXvS}F9nJ_Hu$&$uqTEFuTy6XX27 z;&^eoIEV0Wi>t+r;ui5$DAOVSTzp6Ty_iBr#lMOFB6(wVhUApOQmIreHA?fP7O5Bx ze4S*R_h!k+6HAzbJK_#$9}(>!ez$Z$+6`O9`2*>t2c^T($1wh!lr>5hqpMQ3`*z_w z>e2Ze$a~#^+p4kdL?w_0z&yZm_c4AgNxtCL+`HXf?jH9M_gV19@_yng-8Ug-%H~F* zoGa(a<#J4Z2<G-VAEz1lIeDwROYQ=T^F3+x5&5iqQSO0yx8zpNf#GBma9k@$uK_#; zhowqfhgSigi<e?!i|^uRNqiA^;QeH-8~0-4)1JhA_$FpOlE*mGJWmO+$({#*k0xXD zIjMywYNS2lF?phvUFLb(^E|-t+rhu)d7Ib=p5vZ#p6ec)*W=Cij`L3QKI~oWUG3fI z-RkWScX{`DyS>I1z21}FKJN{$T~U+*#b|n>GDG=>(j|WjVAvXEqp}6YKLPAk-UREC z57Jyh{s0Dl27IDiR0fC*0?YEzrPL!IC;9;eutAY8>Z7^=rN&pFG^LgEMywcGy==t% zlfLz^rj^WT;1fH+ndQDJ4i%%LSABcaMUBSW(&IZ-2A>Q0;iiMOXShBg(|eb`>5ll$ z_~^Te`b)lBJ|p8$>FpL!$HHi`IxB6)@h?yps0#rL)D^1nsKU_>+aRG1-+ttH3+NLa z>VEa0dRRTBUQh>BtKaR<^%wiA{Pq4h{w4l3{-nQ`ybHGZe+0JEALsMrF7R>QD3(xr z`~%7n|5@<=^nU@K4H)AA<v!)Q;tTi!YG6Pa0~k<BiJwF~J?X2;Ktj2q%naP!%&zGf z4EYZDtcD?<G1raf2jYB7fD_5PKF}Jt#<jzYX`O**xb8r2;0pOIxW=6f{3CE9kgx>p zK{<F&kQ2*;Q-X26F}M)CVJm_OGI}AX1$*4B+@7HENa`^6+u+CGJ4E^(|2%jlXbrhT zkCLZc4HbqeLiHhdqW}zB9$Fh(A8HG|651bf$+J}B3w<~A#}N6-6F_n~Lv}huUo&*k zkiP_F{!2^AeE9Ab4By>~!*^O@<izkVqAEO`)rO6m>%s7%@QU!$;pfBj_mFxm{A&0r z`F$Kdd*}EU;V#*nyGGQ%4s$UmdNiCupN3nxf$#z~D<VbmBBqSSg2=?kjL4&r=E$nZ zQ;|&(E%FlB&myly-ijQGd>A>c`|@!rld06N6k<E$nUub&XpByt93__?DZ+~~0u}kO zSOZ+qSS)6sf+Q;{qWSsx(Wthg7{|0vi*dh=u7ar}C3q7L*`X^M)#sMtT?}7uiePmt zR<E&TxQ(gM+skl(sVf_C8TIok8eqp*Y<6sRLqlwKy;%{eOc;OrsxYqGY{CRRBZ@N^ zT^ffUXM(pkq=T|Mxc=05e1*~0O~5<Z@X)2-HxZv<G_DdK4Cca>mzzfxLIAr>qeVqU zda4o&8QN!)@p7%H3VS^19m>sfHDXnHdAYW#3QyJEsKW1O!e0;V$!c7{9Mg7I<6H>8 zq2W9YsD@0ILa-jQTP&lr4b@oGo~Xeb;Wo<KfWz7yRNZ5$S(?3RsyWI-Q;51~3aQ-$ zfz;w@wiU933zWY>)d#8itf>}hR;^8|CCaOTLnkw9N$ph-NG(jWou=AD`G-_}imI7d zTJ59R%2>L#O8Fw-P`d?W5PoQ?gEZS~sza1trt1Gtb$BY&&Xz5fT$+7sD%3W39_8zS zL($D3gV1HDjq|>jX8R1a!Sg8>rV+J&8d29kAlX8ieFn0GkD>e(s@_M{M@)4w&2rPz z>JrLJfI|zDrjy#u5J;^unr%1L<&+<y>cdpsZ>q;@&2?~}jHyf4{u<@8fkW;2b)@zN z2&8re&32pWN~5;N_GlK|o)*h7?E=+1A4uz~NS<p>=iywcX*Vk$AobUQ5VqNA>T7BC zBxK2cF<QUHtdC|8eJKQzpHAx^9;#nQS5#Tk9qphiddwB|^b_2iVeG#tryc`5053oR z_y8)v4+sE)fDj-IhyZc{d4SP?djR(W@&We&3IK(GF@Pe#SU@qL1W>By)ZbtK+5Z6G Ctfo5v delta 4054 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 Bd8_~c diff --git a/tools/make_unicode b/tools/make_unicode index 8ece72926c2..4f060876b67 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -22,7 +22,7 @@ use strict; # base URLs for www.unicode.org files -my $UNIVERSION = "13.0.0"; +my $UNIVERSION = "14.0.0"; my $UNIDATA = "https://www.unicode.org/Public/$UNIVERSION/ucd/UCD.zip"; my $IDNADATA = "https://www.unicode.org/Public/idna/$UNIVERSION"; my $JISDATA = "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS"; -- 2.33.0

2 1

[PATCH v3 1/5] user32/tests: Fix occasional failure in ShowWindow() message sequences.
by Connor McAdams 15 Sep '21

15 Sep '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- -v3: Fix test failure when run on wine. dlls/user32/tests/msg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d61c813b492..8e523edd5ba 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13405,9 +13405,10 @@ static const struct message WmRestore_3[] = { { HCBT_ACTIVATE, hook|optional }, /* win2003 doesn't send it */ { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2003 doesn't send it */ + { WM_WINDOWPOSCHANGED, sent|optional }, /* Win8+ sometimes sends this. */ { HCBT_SETFOCUS, hook|optional }, /* win2003 doesn't send it */ { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGED, sent|optional }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_MAXIMIZED }, { HCBT_SETFOCUS, hook|optional }, /* win2003 sends it */ -- 2.25.1

2 9

[PATCH 5/5] gdi32: Directly use ntgdi functions in painting.c.
by Jacek Caban 15 Sep '21

15 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/painting.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-)

2 1

[PATCH 4/5] win32u: Directly use NtGdiGetDeviceCaps in ntgdi functions.
by Jacek Caban 15 Sep '21

15 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitmap.c | 2 +- dlls/gdi32/clipping.c | 4 ++-- dlls/gdi32/dc.c | 8 ++++---- dlls/gdi32/driver.c | 30 +++++++++++++++--------------- dlls/gdi32/mapping.c | 12 ++++++------ dlls/gdi32/palette.c | 7 +++---- 6 files changed, 31 insertions(+), 32 deletions(-)

2 1

[PATCH 3/5] win32u: Use NtGdiSetBrushOrg in NtGdiMaskBlt.
by Jacek Caban 15 Sep '21

15 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 2 +- dlls/gdi32/dc.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-)

2 1

[PATCH 2/5] gdi32: Direcly use ntgdi functions in dib driver.
by Jacek Caban 15 Sep '21

15 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dibdrv/dc.c | 4 +--- dlls/gdi32/dibdrv/graphics.c | 10 ++++++---- dlls/gdi32/dibdrv/objects.c | 19 ++++++++++++------- 3 files changed, 19 insertions(+), 14 deletions(-)

2 1

[PATCH 1/5] gdi32: Introduce get_gdi_object_type.
by Jacek Caban 15 Sep '21

15 Sep '21

And use it instead of GetObjectType in ntgdi functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 2 +- dlls/gdi32/bitmap.c | 4 ++-- dlls/gdi32/dc.c | 6 +++--- dlls/gdi32/dib.c | 4 ++-- dlls/gdi32/gdiobj.c | 5 +++++ dlls/gdi32/ntgdi_private.h | 1 + dlls/gdi32/palette.c | 2 +- dlls/gdi32/path.c | 14 ++++++++------ 8 files changed, 23 insertions(+), 15 deletions(-)

2 1

[PATCH 3/3] sapi: ISpObjectTokenCategory SetId - Support create parameter
by Alistair Leslie-Hughes 15 Sep '21

15 Sep '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/sapi/token.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index ec1cce5f462..ba91a425e9e 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -416,9 +416,10 @@ static HRESULT WINAPI token_category_SetId( ISpObjectTokenCategory *iface, hr = parse_cat_id( id, &root, &subkey ); if (hr != S_OK) return SPERR_INVALID_REGISTRY_KEY; - if (create) FIXME( "Ignoring create\n" ); - - res = RegOpenKeyExW( root, subkey, 0, KEY_ALL_ACCESS, &key ); + if (create) + res = RegCreateKeyExW( root, subkey, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL ); + else + res = RegOpenKeyExW( root, subkey, 0, KEY_ALL_ACCESS, &key ); if (res) return SPERR_INVALID_REGISTRY_KEY; hr = CoCreateInstance( &CLSID_SpDataKey, NULL, CLSCTX_ALL, -- 2.33.0

1 0

[PATCH 2/3] sapi: ISpObjectToken SetId - Support create parameter
by Alistair Leslie-Hughes 15 Sep '21

15 Sep '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/sapi/token.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 04fa3a25d6a..ec1cce5f462 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -942,7 +942,10 @@ static HRESULT WINAPI token_SetId( ISpObjectToken *iface, hr = parse_cat_id( token_id, &root, &subkey ); if (hr != S_OK) return SPERR_NOT_FOUND; - res = RegOpenKeyExW( root, subkey, 0, KEY_ALL_ACCESS, &key ); + if (create) + res = RegCreateKeyExW( root, subkey, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL); + else + res = RegOpenKeyExW( root, subkey, 0, KEY_ALL_ACCESS, &key ); if (res) return SPERR_NOT_FOUND; This->token_key = key; -- 2.33.0

1 0

[PATCH 1/3] include: Add ISpAudio interface
by Alistair Leslie-Hughes 15 Sep '21

15 Sep '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/sapi.idl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/sapi.idl b/include/sapi.idl index 5120e379450..b9bc05c5be4 100644 --- a/include/sapi.idl +++ b/include/sapi.idl @@ -492,6 +492,13 @@ typedef [hidden] enum SPFILEMODE SPFM_NUM_MODES } SPFILEMODE; +typedef [restricted, hidden] struct SPAUDIOBUFFERINFO +{ + ULONG ulMsMinNotification; + ULONG ulMsBufferSize; + ULONG ulMsEventBias; +} SPAUDIOBUFFERINFO; + cpp_quote("#if defined(__GNUC__)") cpp_quote("#define SPCAT_AUDIOOUT (const WCHAR []){ 'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E','\\\\','S','O','F','T','W','A','R','E','\\\\','M','i','c','r','o','s','o','f','t','\\\\','S','p','e','e','c','h','\\\\','A','u','d','i','o','O','u','t','p','u','t',0 }") @@ -993,6 +1000,28 @@ interface ISpStreamFormat : IStream HRESULT GetFormat(GUID *format, WAVEFORMATEX **wave); } +[ + object, + uuid(c05c768f-fae8-4ec2-8e07-338321c12452), + pointer_default(unique), + local, + restricted +] +interface ISpAudio : ISpStreamFormat +{ + HRESULT SetState([in] SPAUDIOSTATE state, [in] ULONGLONG reserved); + HRESULT SetFormat([in] REFGUID guid, [in] const WAVEFORMATEX *wave); + HRESULT GetStatus([out] SPAUDIOSTATUS *status); + HRESULT SetBufferInfo([in] const SPAUDIOBUFFERINFO *buffer); + HRESULT GetBufferInfo([out] SPAUDIOBUFFERINFO *buffer); + HRESULT GetDefaultFormat([out] GUID *guid, [out] WAVEFORMATEX **wave); + HANDLE EventHandle(); + HRESULT GetVolumeLevel([out] ULONG *level); + HRESULT SetVolumeLevel([in] ULONG level); + HRESULT GetBufferNotifySize([out] ULONG *size); + HRESULT SetBufferNotifySize([in] ULONG size); +}; + [ object, uuid(5b4fb971-b115-4de1-ad97-e482e3bf6ee4), -- 2.33.0

1 0

[PATCH 0/9] Fourth step for Dwarf 3/4 support in dbghelp
by Eric Pouech 15 Sep '21

15 Sep '21

Structure of dwarf info: an image, made of several compilation units, each compilation unit contains several debug info entries (DIE in dwarf-ish) We currently parse all of those in one pass. This needs to be reviewed for Dwarf4: - a DIE can reference another DIE in another compilation unit we currently support reference into the same CU only => we need to handle parsing of several CU at the same time - a DIE can reference a DIE in another image (with GNU's extension in dwarf4, will become standard in dwarf5) => this is used for example to store all C++ basic debug info (like STL) in a dedicated image, that is shared across several modules (this case is done at system level) This serie basically refactors the parsing mechanism to decouple the module parsing from the compilation unit parsing. It implements reference to DIE in another CU of same image. Next serie will focus on reference into another image. -- Eric Pouech (9): dbghelp/dwarf: separate cu handling from module handling dbghelp/dwarf: Moving the symt_cache from the unit context into the module context dbghelp/dwarf: Keep open and keep track of parse_context_t inside a module_context_t dbghelp: split in two phases the parsing of a dwarf compilation unit dbghelp/dwarf: Added ability to get to a DIE in a different CU dbghelp/dwarf: Properly supporting DW_FORM_ref_addr in type DIE lookup dbghelp/dwarf: Detect out of section sibling DIE information dbghelp/dwarf: add reference for a DIE to its CU programs/winedbg: show dwarf version(s) used for a module dlls/dbghelp/dwarf.c | 288 ++++++++++++++++++++++++++-------------- programs/winedbg/info.c | 13 +- 2 files changed, 202 insertions(+), 99 deletions(-)

1 9

[PATCH] msi: Fixup Installer\\Patches\\<...> key path (Coverity).
by Nikolay Sivov 15 Sep '21

15 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msi/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 623bc1866d3..5dc3c0a81c3 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -773,8 +773,8 @@ UINT MSIREG_OpenPatchesKey(LPCWSTR szPatch, HKEY *key, BOOL create) if (!squash_guid( szPatch, squashed_pc )) return ERROR_FUNCTION_FAILED; TRACE("%s squashed %s\n", debugstr_w(szPatch), debugstr_w(squashed_pc)); - swprintf( keypath, ARRAY_SIZE(keypath), L"Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Patches", - squashed_pc ); + lstrcpyW( keypath, L"Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Patches\\" ); + lstrcatW( keypath, squashed_pc ); if (create) return RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, key, NULL); return RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, key); -- 2.33.0

2 1

[PATCH v2 1/5] user32/tests: Fix occasional failure in ShowWindow() message sequences.
by Connor McAdams 15 Sep '21

15 Sep '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- -v2: Add this patch to fix test failure. dlls/user32/tests/msg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d61c813b492..5772cd0f612 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13405,6 +13405,7 @@ static const struct message WmRestore_3[] = { { HCBT_ACTIVATE, hook|optional }, /* win2003 doesn't send it */ { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2003 doesn't send it */ + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, /* Win8+ sometimes sends this. */ { HCBT_SETFOCUS, hook|optional }, /* win2003 doesn't send it */ { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, -- 2.25.1

2 8

[PATCH] dwrite/tests: Add a linebreaking test regarding LB30 rule changes in Unicode 13.
by Nikolay Sivov 15 Sep '21

15 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Windows 10 21H1 does not follow these changes, so no immediate need to implement that. dlls/dwrite/tests/analyzer.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 358e3e4780d..dd3207c7933 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1083,7 +1083,8 @@ struct linebreaks_test { DWRITE_LINE_BREAKPOINT bp[BREAKPOINT_COUNT]; }; -static struct linebreaks_test linebreaks_tests[] = { +static const struct linebreaks_test linebreaks_tests[] = +{ { {'A','-','B',' ','C',0x58a,'D',0x2010,'E',0x2012,'F',0x2013,'\t',0xc,0xb,0x2028,0x2029,0x200b,0}, { { DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, 0, 0 }, @@ -1124,6 +1125,14 @@ static struct linebreaks_test linebreaks_tests[] = { { DWRITE_BREAK_CONDITION_CAN_BREAK, DWRITE_BREAK_CONDITION_CAN_BREAK, 0, 0 }, } }, + /* LB30 changes in Unicode 13 regarding East Asian parentheses */ + { {0x5f35,'G',0x300c,0}, + { + { DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, DWRITE_BREAK_CONDITION_CAN_BREAK }, + { DWRITE_BREAK_CONDITION_CAN_BREAK, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK }, + { DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, DWRITE_BREAK_CONDITION_CAN_BREAK }, + } + }, { { 0 } } }; -- 2.33.0

1 0

[PATCH] d3dx10_36/tests: Enable tests.
by Nikolay Sivov 15 Sep '21

15 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 1 + configure.ac | 1 + dlls/d3dx10_36/Makefile.in | 1 + dlls/d3dx10_36/tests/Makefile.in | 6 ++++++ 4 files changed, 9 insertions(+) create mode 100644 dlls/d3dx10_36/tests/Makefile.in diff --git a/configure b/configure index 1adbf1789f3..1f25190a670 100755 --- a/configure +++ b/configure @@ -20374,6 +20374,7 @@ wine_fn_config_makefile dlls/d3dx10_33 enable_d3dx10_33 wine_fn_config_makefile dlls/d3dx10_34 enable_d3dx10_34 wine_fn_config_makefile dlls/d3dx10_35 enable_d3dx10_35 wine_fn_config_makefile dlls/d3dx10_36 enable_d3dx10_36 +wine_fn_config_makefile dlls/d3dx10_36/tests enable_tests wine_fn_config_makefile dlls/d3dx10_37 enable_d3dx10_37 wine_fn_config_makefile dlls/d3dx10_37/tests enable_tests wine_fn_config_makefile dlls/d3dx10_38 enable_d3dx10_38 diff --git a/configure.ac b/configure.ac index eb970972936..a82e815b53a 100644 --- a/configure.ac +++ b/configure.ac @@ -3073,6 +3073,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dx10_33) WINE_CONFIG_MAKEFILE(dlls/d3dx10_34) WINE_CONFIG_MAKEFILE(dlls/d3dx10_35) WINE_CONFIG_MAKEFILE(dlls/d3dx10_36) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_36/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_37) WINE_CONFIG_MAKEFILE(dlls/d3dx10_37/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_38) diff --git a/dlls/d3dx10_36/Makefile.in b/dlls/d3dx10_36/Makefile.in index efd498f7e2c..a15593f62f1 100644 --- a/dlls/d3dx10_36/Makefile.in +++ b/dlls/d3dx10_36/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_36.dll +IMPORTLIB = d3dx10_36 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_36/tests/Makefile.in b/dlls/d3dx10_36/tests/Makefile.in new file mode 100644 index 00000000000..22e9a91f581 --- /dev/null +++ b/dlls/d3dx10_36/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_36.dll +IMPORTS = d3dx10_36 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c -- 2.33.0

2 1

[PATCH 1/6] d3d10/effect: Handle object type D3D10_SVT_TEXTURE.
by Nikolay Sivov 15 Sep '21

15 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 3 + dlls/d3d10/tests/effect.c | 127 ++++++++++++++++++++++++-------------- 2 files changed, 84 insertions(+), 46 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 30650eca82d..6d2f862f252 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -836,6 +836,7 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object, D *flags = D3D10_EOT_FLAG_GS_SO; return D3D10_SVT_GEOMETRYSHADER; + case 9: return D3D10_SVT_TEXTURE; case 10: return D3D10_SVT_TEXTURE1D; case 11: return D3D10_SVT_TEXTURE1DARRAY; case 12: return D3D10_SVT_TEXTURE2D; @@ -1158,6 +1159,7 @@ static void set_variable_vtbl(struct d3d10_effect_variable *v) *vtbl = (const ID3D10EffectVariableVtbl *)&d3d10_effect_string_variable_vtbl; break; + case D3D10_SVT_TEXTURE: case D3D10_SVT_TEXTURE1D: case D3D10_SVT_TEXTURE1DARRAY: case D3D10_SVT_TEXTURE2D: @@ -2119,6 +2121,7 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, switch (v->type->basetype) { + case D3D10_SVT_TEXTURE: case D3D10_SVT_TEXTURE1D: case D3D10_SVT_TEXTURE1DARRAY: case D3D10_SVT_TEXTURE2D: diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index a7fef6433fa..505f782ecdc 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -1256,6 +1256,7 @@ RasterizerState rast; SamplerState sam; RenderTargetView rtv; DepthStencilView dsv; +Texture t0; Texture1D t1; Texture1DArray t1a; Texture2D t2; @@ -1274,9 +1275,9 @@ SamplerState sam2[2]; #endif static DWORD fx_test_evtc[] = { - 0x43425844, 0x2f42ba4c, 0x2e600cca, 0x3cf98c90, 0xab9f5124, 0x00000001, 0x00000768, 0x00000001, - 0x00000024, 0x30315846, 0x0000073c, 0xfeff1001, 0x00000001, 0x00000004, 0x00000015, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x0000046c, 0x00000000, 0x00000008, 0x00000003, 0x00000003, + 0x43425844, 0xbcafa6f1, 0x8baf9e54, 0x8e1fd2ef, 0x115ba370, 0x00000001, 0x000007a3, 0x00000001, + 0x00000024, 0x30315846, 0x00000777, 0xfeff1001, 0x00000001, 0x00000004, 0x00000016, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000493, 0x00000000, 0x00000009, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000001, 0x00000001, 0x00000004, 0x00000000, 0x00000000, 0x53006263, 0x6e697274, 0x00070067, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00730000, 0x49525453, 0x7300474e, 0x6c660032, 0x0074616f, 0x00000036, 0x00000001, 0x00000000, @@ -1293,47 +1294,49 @@ static DWORD fx_test_evtc[] = 0x73000000, 0x52006d61, 0x65646e65, 0x72615472, 0x56746567, 0x00776569, 0x0000018f, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00767472, 0x74706544, 0x65745368, 0x6c69636e, 0x77656956, 0x0001c000, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00001400, 0x76736400, 0x78655400, 0x65727574, 0xf1004431, 0x02000001, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x0a000000, 0x74000000, 0x65540031, 0x72757478, 0x41443165, 0x79617272, - 0x00021a00, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000b00, 0x61317400, - 0x78655400, 0x65727574, 0x49004432, 0x02000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x0c000000, 0x74000000, 0x65540032, 0x72757478, 0x4d443265, 0x02720053, 0x00020000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x000e0000, 0x32740000, 0x00736d64, 0x74786554, 0x32657275, - 0x72724144, 0xa0007961, 0x02000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0d000000, - 0x74000000, 0x54006132, 0x75747865, 0x44326572, 0x7241534d, 0x00796172, 0x000002cf, 0x00000002, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000f, 0x6d643274, 0x54006173, 0x75747865, - 0x44336572, 0x00030300, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001000, - 0x00337400, 0x74786554, 0x43657275, 0x00656275, 0x0000032c, 0x00000002, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000011, 0x47007174, 0x656d6f65, 0x53797274, 0x65646168, 0x03570072, - 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00070000, 0x73670000, 0x78695000, - 0x68536c65, 0x72656461, 0x00038500, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000500, 0x00737000, 0x74726556, 0x68537865, 0x72656461, 0x0003b000, 0x00000200, 0x00000100, - 0x00000000, 0x00000000, 0x00000000, 0x00000600, 0x00737600, 0x000000c9, 0x00000002, 0x00000002, - 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x6e656c62, 0xf6003264, 0x02000000, 0x02000000, - 0x00000000, 0x00000000, 0x00000000, 0x03000000, 0x64000000, 0x68747065, 0x6e657473, 0x326c6963, - 0x00013100, 0x00000200, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000400, 0x73617200, - 0x62003274, 0x02000001, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x15000000, 0x73000000, - 0x00326d61, 0x00000004, 0x00000060, 0x00000000, 0x00000004, 0xffffffff, 0x00000002, 0x0000002a, - 0x0000000e, 0x0000002c, 0x00000033, 0x0000000e, 0x0000002c, 0x00000058, 0x0000003c, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000007b, 0x0000005f, 0x00000000, 0x00000004, - 0x00000000, 0x00000000, 0x00000000, 0x000000a1, 0x00000085, 0x00000000, 0x00000010, 0x00000000, - 0x00000000, 0x00000000, 0x000000c7, 0x000000ab, 0x00000000, 0x00000040, 0x00000000, 0x00000000, - 0x00000000, 0x000000f0, 0x000000d4, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x00000124, - 0x00000108, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x0000015d, 0x00000141, 0x00000000, - 0xffffffff, 0x00000000, 0x00000000, 0x0000018b, 0x0000016f, 0x00000000, 0xffffffff, 0x00000000, - 0x00000000, 0x000001bc, 0x000001a0, 0x00000000, 0xffffffff, 0x00000000, 0x000001ed, 0x000001d1, - 0x00000000, 0xffffffff, 0x00000000, 0x00000217, 0x000001fb, 0x00000000, 0xffffffff, 0x00000000, - 0x00000245, 0x00000229, 0x00000000, 0xffffffff, 0x00000000, 0x0000026f, 0x00000253, 0x00000000, - 0xffffffff, 0x00000000, 0x0000029a, 0x0000027e, 0x00000000, 0xffffffff, 0x00000000, 0x000002cb, - 0x000002af, 0x00000000, 0xffffffff, 0x00000000, 0x000002fc, 0x000002e0, 0x00000000, 0xffffffff, - 0x00000000, 0x00000329, 0x0000030d, 0x00000000, 0xffffffff, 0x00000000, 0x00000354, 0x00000338, - 0x00000000, 0xffffffff, 0x00000000, 0x00000382, 0x00000366, 0x00000000, 0xffffffff, 0x00000000, - 0x00000000, 0x00000000, 0x000003ad, 0x00000391, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, - 0x000003d9, 0x000003bd, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x000003f8, 0x000003dc, - 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0x0000041b, 0x000003ff, 0x00000000, - 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0x00000445, 0x00000429, 0x00000000, 0xffffffff, - 0x00000000, 0x00000000, 0x00000000, 0x00000467, 0x0000044b, 0x00000000, 0xffffffff, 0x00000000, - 0x00000000, 0x00000000, + 0x00001400, 0x76736400, 0x78657400, 0x65727574, 0x0001f100, 0x00000200, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000900, 0x00307400, 0x74786554, 0x31657275, 0x02180044, 0x00020000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000a0000, 0x31740000, 0x78655400, 0x65727574, + 0x72414431, 0x00796172, 0x00000241, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x0000000b, 0x00613174, 0x74786554, 0x32657275, 0x02700044, 0x00020000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x000c0000, 0x32740000, 0x78655400, 0x65727574, 0x534d4432, 0x00029900, + 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000e00, 0x64327400, 0x5400736d, + 0x75747865, 0x44326572, 0x61727241, 0x02c70079, 0x00020000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x000d0000, 0x32740000, 0x65540061, 0x72757478, 0x4d443265, 0x72724153, 0xf6007961, + 0x02000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0f000000, 0x74000000, 0x736d6432, + 0x65540061, 0x72757478, 0x00443365, 0x0000032a, 0x00000002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000010, 0x54003374, 0x75747865, 0x75436572, 0x53006562, 0x02000003, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x11000000, 0x74000000, 0x65470071, 0x74656d6f, 0x68537972, + 0x72656461, 0x00037e00, 0x00000200, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000700, + 0x00736700, 0x65786950, 0x6168536c, 0x00726564, 0x000003ac, 0x00000002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000005, 0x56007370, 0x65747265, 0x61685378, 0x00726564, 0x000003d7, + 0x00000002, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0xc9007376, 0x02000000, + 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x02000000, 0x62000000, 0x646e656c, 0x00f60032, + 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x65640000, 0x73687470, + 0x636e6574, 0x00326c69, 0x00000131, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, + 0x00000004, 0x74736172, 0x01620032, 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, + 0x00150000, 0x61730000, 0x0400326d, 0x60000000, 0x00000000, 0x04000000, 0xff000000, 0x02ffffff, + 0x2a000000, 0x0e000000, 0x2c000000, 0x33000000, 0x0e000000, 0x2c000000, 0x58000000, 0x3c000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x7b000000, 0x5f000000, 0x00000000, + 0x04000000, 0x00000000, 0x00000000, 0x00000000, 0xa1000000, 0x85000000, 0x00000000, 0x10000000, + 0x00000000, 0x00000000, 0x00000000, 0xc7000000, 0xab000000, 0x00000000, 0x40000000, 0x00000000, + 0x00000000, 0x00000000, 0xf0000000, 0xd4000000, 0x00000000, 0xff000000, 0x00ffffff, 0x00000000, + 0x24000000, 0x08000001, 0x00000001, 0xff000000, 0x00ffffff, 0x00000000, 0x5d000000, 0x41000001, + 0x00000001, 0xff000000, 0x00ffffff, 0x00000000, 0x8b000000, 0x6f000001, 0x00000001, 0xff000000, + 0x00ffffff, 0x00000000, 0xbc000000, 0xa0000001, 0x00000001, 0xff000000, 0x00ffffff, 0xed000000, + 0xd1000001, 0x00000001, 0xff000000, 0x00ffffff, 0x15000000, 0xf9000002, 0x00000001, 0xff000000, + 0x00ffffff, 0x3e000000, 0x22000002, 0x00000002, 0xff000000, 0x00ffffff, 0x6c000000, 0x50000002, + 0x00000002, 0xff000000, 0x00ffffff, 0x96000000, 0x7a000002, 0x00000002, 0xff000000, 0x00ffffff, + 0xc1000000, 0xa5000002, 0x00000002, 0xff000000, 0x00ffffff, 0xf2000000, 0xd6000002, 0x00000002, + 0xff000000, 0x00ffffff, 0x23000000, 0x07000003, 0x00000003, 0xff000000, 0x00ffffff, 0x50000000, + 0x34000003, 0x00000003, 0xff000000, 0x00ffffff, 0x7b000000, 0x5f000003, 0x00000003, 0xff000000, + 0x00ffffff, 0xa9000000, 0x8d000003, 0x00000003, 0xff000000, 0x00ffffff, 0x00000000, 0x00000000, + 0xd4000000, 0xb8000003, 0x00000003, 0xff000000, 0x00ffffff, 0x00000000, 0x00000000, 0xe4000004, + 0x00000003, 0xff000000, 0x00ffffff, 0x00000000, 0x1f000000, 0x03000004, 0x00000004, 0xff000000, + 0x00ffffff, 0x00000000, 0x00000000, 0x42000000, 0x26000004, 0x00000004, 0xff000000, 0x00ffffff, + 0x00000000, 0x00000000, 0x6c000000, 0x50000004, 0x00000004, 0xff000000, 0x00ffffff, 0x00000000, + 0x00000000, 0x8e000000, 0x72000004, 0x00000004, 0xff000000, 0x00ffffff, 0x00000000, 0x00000000, + 0x00000000, }; static BOOL is_valid_check(BOOL a, BOOL b) @@ -1411,7 +1414,7 @@ static void check_as(ID3D10EffectVariable *variable) variable2 = (ID3D10EffectVariable *)variable->lpVtbl->AsShaderResource(variable); is_valid = variable2->lpVtbl->IsValid(variable2); - ret = is_valid_check(is_valid, td.Type == D3D10_SVT_TEXTURE1D + ret = is_valid_check(is_valid, td.Type == D3D10_SVT_TEXTURE || td.Type == D3D10_SVT_TEXTURE1D || td.Type == D3D10_SVT_TEXTURE1DARRAY || td.Type == D3D10_SVT_TEXTURE2D || td.Type == D3D10_SVT_TEXTURE2DMS || td.Type == D3D10_SVT_TEXTURE2DARRAY || td.Type == D3D10_SVT_TEXTURE2DMSARRAY || td.Type == D3D10_SVT_TEXTURE3D @@ -1457,7 +1460,7 @@ static void test_effect_variable_type_class(void) effect_desc.ConstantBuffers); ok(effect_desc.SharedConstantBuffers == 0, "Unexpected shared constant buffers count %u.\n", effect_desc.SharedConstantBuffers); - ok(effect_desc.GlobalVariables == 25, "Unexpected global variables count %u.\n", + ok(effect_desc.GlobalVariables == 26, "Unexpected global variables count %u.\n", effect_desc.GlobalVariables); ok(effect_desc.SharedGlobalVariables == 0, "Unexpected shared global variables count %u.\n", effect_desc.SharedGlobalVariables); @@ -1873,6 +1876,38 @@ static void test_effect_variable_type_class(void) ok(td.UnpackedSize == 0x0, "UnpackedSize is %#x, expected 0x0\n", td.UnpackedSize); ok(td.Stride == 0x0, "Stride is %#x, expected 0x0\n", td.Stride); + /* check Texture t0 */ + variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); + hr = variable->lpVtbl->GetDesc(variable, &vd); + ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + + ok(strcmp(vd.Name, "t0") == 0, "Name is \"%s\", expected \"t1\"\n", vd.Name); + ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); + ok(vd.Flags == 0, "Flags is %u, expected 0\n", vd.Flags); + ok(vd.Annotations == 0, "Annotations is %u, expected 0\n", vd.Annotations); + ok(vd.BufferOffset == 0, "BufferOffset is %u, expected 0\n", vd.BufferOffset); + ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); + + check_as(variable); + + parent = variable->lpVtbl->GetParentConstantBuffer(variable); + ok(null_buffer == parent, "GetParentConstantBuffer got %p, expected %p\n", parent, null_buffer); + + type = variable->lpVtbl->GetType(variable); + hr = type->lpVtbl->GetDesc(type, &td); + ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + + ok(!strcmp(td.TypeName, "texture"), "Unexpected TypeName \"%s\".\n", td.TypeName); + ok(td.Class == D3D10_SVC_OBJECT, "Unexpected Class %x.\n", td.Class); + ok(td.Type == D3D10_SVT_TEXTURE, "Unexpected Type %x.\n", td.Type); + ok(td.Elements == 0, "Elements is %u, expected 0\n", td.Elements); + ok(td.Members == 0, "Members is %u, expected 0\n", td.Members); + ok(td.Rows == 0, "Rows is %u, expected 0\n", td.Rows); + ok(td.Columns == 0, "Columns is %u, expected 0\n", td.Columns); + ok(td.PackedSize == 0x0, "PackedSize is %#x, expected 0x0\n", td.PackedSize); + ok(td.UnpackedSize == 0x0, "UnpackedSize is %#x, expected 0x0\n", td.UnpackedSize); + ok(td.Stride == 0x0, "Stride is %#x, expected 0x0\n", td.Stride); + /* check Texture1D t1 */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); -- 2.33.0

2 10

[v2 PATCH 1/6] d3d10/effect: Handle object type D3D10_SVT_TEXTURE.
by Matteo Bruni 15 Sep '21

15 Sep '21

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2 (Matteo): Fix typo, improve code style. dlls/d3d10/effect.c | 3 + dlls/d3d10/tests/effect.c | 127 ++++++++++++++++++++++++-------------- 2 files changed, 84 insertions(+), 46 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 30650eca82d..6d2f862f252 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -836,6 +836,7 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object, D *flags = D3D10_EOT_FLAG_GS_SO; return D3D10_SVT_GEOMETRYSHADER; + case 9: return D3D10_SVT_TEXTURE; case 10: return D3D10_SVT_TEXTURE1D; case 11: return D3D10_SVT_TEXTURE1DARRAY; case 12: return D3D10_SVT_TEXTURE2D; @@ -1158,6 +1159,7 @@ static void set_variable_vtbl(struct d3d10_effect_variable *v) *vtbl = (const ID3D10EffectVariableVtbl *)&d3d10_effect_string_variable_vtbl; break; + case D3D10_SVT_TEXTURE: case D3D10_SVT_TEXTURE1D: case D3D10_SVT_TEXTURE1DARRAY: case D3D10_SVT_TEXTURE2D: @@ -2119,6 +2121,7 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, switch (v->type->basetype) { + case D3D10_SVT_TEXTURE: case D3D10_SVT_TEXTURE1D: case D3D10_SVT_TEXTURE1DARRAY: case D3D10_SVT_TEXTURE2D: diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index a7fef6433fa..5e548a96172 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -1256,6 +1256,7 @@ RasterizerState rast; SamplerState sam; RenderTargetView rtv; DepthStencilView dsv; +Texture t0; Texture1D t1; Texture1DArray t1a; Texture2D t2; @@ -1274,9 +1275,9 @@ SamplerState sam2[2]; #endif static DWORD fx_test_evtc[] = { - 0x43425844, 0x2f42ba4c, 0x2e600cca, 0x3cf98c90, 0xab9f5124, 0x00000001, 0x00000768, 0x00000001, - 0x00000024, 0x30315846, 0x0000073c, 0xfeff1001, 0x00000001, 0x00000004, 0x00000015, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x0000046c, 0x00000000, 0x00000008, 0x00000003, 0x00000003, + 0x43425844, 0xbcafa6f1, 0x8baf9e54, 0x8e1fd2ef, 0x115ba370, 0x00000001, 0x000007a3, 0x00000001, + 0x00000024, 0x30315846, 0x00000777, 0xfeff1001, 0x00000001, 0x00000004, 0x00000016, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000493, 0x00000000, 0x00000009, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000001, 0x00000001, 0x00000004, 0x00000000, 0x00000000, 0x53006263, 0x6e697274, 0x00070067, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00730000, 0x49525453, 0x7300474e, 0x6c660032, 0x0074616f, 0x00000036, 0x00000001, 0x00000000, @@ -1293,47 +1294,49 @@ static DWORD fx_test_evtc[] = 0x73000000, 0x52006d61, 0x65646e65, 0x72615472, 0x56746567, 0x00776569, 0x0000018f, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00767472, 0x74706544, 0x65745368, 0x6c69636e, 0x77656956, 0x0001c000, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00001400, 0x76736400, 0x78655400, 0x65727574, 0xf1004431, 0x02000001, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x0a000000, 0x74000000, 0x65540031, 0x72757478, 0x41443165, 0x79617272, - 0x00021a00, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000b00, 0x61317400, - 0x78655400, 0x65727574, 0x49004432, 0x02000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x0c000000, 0x74000000, 0x65540032, 0x72757478, 0x4d443265, 0x02720053, 0x00020000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x000e0000, 0x32740000, 0x00736d64, 0x74786554, 0x32657275, - 0x72724144, 0xa0007961, 0x02000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0d000000, - 0x74000000, 0x54006132, 0x75747865, 0x44326572, 0x7241534d, 0x00796172, 0x000002cf, 0x00000002, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000f, 0x6d643274, 0x54006173, 0x75747865, - 0x44336572, 0x00030300, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001000, - 0x00337400, 0x74786554, 0x43657275, 0x00656275, 0x0000032c, 0x00000002, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000011, 0x47007174, 0x656d6f65, 0x53797274, 0x65646168, 0x03570072, - 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00070000, 0x73670000, 0x78695000, - 0x68536c65, 0x72656461, 0x00038500, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000500, 0x00737000, 0x74726556, 0x68537865, 0x72656461, 0x0003b000, 0x00000200, 0x00000100, - 0x00000000, 0x00000000, 0x00000000, 0x00000600, 0x00737600, 0x000000c9, 0x00000002, 0x00000002, - 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x6e656c62, 0xf6003264, 0x02000000, 0x02000000, - 0x00000000, 0x00000000, 0x00000000, 0x03000000, 0x64000000, 0x68747065, 0x6e657473, 0x326c6963, - 0x00013100, 0x00000200, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000400, 0x73617200, - 0x62003274, 0x02000001, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x15000000, 0x73000000, - 0x00326d61, 0x00000004, 0x00000060, 0x00000000, 0x00000004, 0xffffffff, 0x00000002, 0x0000002a, - 0x0000000e, 0x0000002c, 0x00000033, 0x0000000e, 0x0000002c, 0x00000058, 0x0000003c, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000007b, 0x0000005f, 0x00000000, 0x00000004, - 0x00000000, 0x00000000, 0x00000000, 0x000000a1, 0x00000085, 0x00000000, 0x00000010, 0x00000000, - 0x00000000, 0x00000000, 0x000000c7, 0x000000ab, 0x00000000, 0x00000040, 0x00000000, 0x00000000, - 0x00000000, 0x000000f0, 0x000000d4, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x00000124, - 0x00000108, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x0000015d, 0x00000141, 0x00000000, - 0xffffffff, 0x00000000, 0x00000000, 0x0000018b, 0x0000016f, 0x00000000, 0xffffffff, 0x00000000, - 0x00000000, 0x000001bc, 0x000001a0, 0x00000000, 0xffffffff, 0x00000000, 0x000001ed, 0x000001d1, - 0x00000000, 0xffffffff, 0x00000000, 0x00000217, 0x000001fb, 0x00000000, 0xffffffff, 0x00000000, - 0x00000245, 0x00000229, 0x00000000, 0xffffffff, 0x00000000, 0x0000026f, 0x00000253, 0x00000000, - 0xffffffff, 0x00000000, 0x0000029a, 0x0000027e, 0x00000000, 0xffffffff, 0x00000000, 0x000002cb, - 0x000002af, 0x00000000, 0xffffffff, 0x00000000, 0x000002fc, 0x000002e0, 0x00000000, 0xffffffff, - 0x00000000, 0x00000329, 0x0000030d, 0x00000000, 0xffffffff, 0x00000000, 0x00000354, 0x00000338, - 0x00000000, 0xffffffff, 0x00000000, 0x00000382, 0x00000366, 0x00000000, 0xffffffff, 0x00000000, - 0x00000000, 0x00000000, 0x000003ad, 0x00000391, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, - 0x000003d9, 0x000003bd, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x000003f8, 0x000003dc, - 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0x0000041b, 0x000003ff, 0x00000000, - 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0x00000445, 0x00000429, 0x00000000, 0xffffffff, - 0x00000000, 0x00000000, 0x00000000, 0x00000467, 0x0000044b, 0x00000000, 0xffffffff, 0x00000000, - 0x00000000, 0x00000000, + 0x00001400, 0x76736400, 0x78657400, 0x65727574, 0x0001f100, 0x00000200, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000900, 0x00307400, 0x74786554, 0x31657275, 0x02180044, 0x00020000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000a0000, 0x31740000, 0x78655400, 0x65727574, + 0x72414431, 0x00796172, 0x00000241, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x0000000b, 0x00613174, 0x74786554, 0x32657275, 0x02700044, 0x00020000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x000c0000, 0x32740000, 0x78655400, 0x65727574, 0x534d4432, 0x00029900, + 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000e00, 0x64327400, 0x5400736d, + 0x75747865, 0x44326572, 0x61727241, 0x02c70079, 0x00020000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x000d0000, 0x32740000, 0x65540061, 0x72757478, 0x4d443265, 0x72724153, 0xf6007961, + 0x02000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0f000000, 0x74000000, 0x736d6432, + 0x65540061, 0x72757478, 0x00443365, 0x0000032a, 0x00000002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000010, 0x54003374, 0x75747865, 0x75436572, 0x53006562, 0x02000003, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x11000000, 0x74000000, 0x65470071, 0x74656d6f, 0x68537972, + 0x72656461, 0x00037e00, 0x00000200, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000700, + 0x00736700, 0x65786950, 0x6168536c, 0x00726564, 0x000003ac, 0x00000002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000005, 0x56007370, 0x65747265, 0x61685378, 0x00726564, 0x000003d7, + 0x00000002, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0xc9007376, 0x02000000, + 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x02000000, 0x62000000, 0x646e656c, 0x00f60032, + 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x65640000, 0x73687470, + 0x636e6574, 0x00326c69, 0x00000131, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, + 0x00000004, 0x74736172, 0x01620032, 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, + 0x00150000, 0x61730000, 0x0400326d, 0x60000000, 0x00000000, 0x04000000, 0xff000000, 0x02ffffff, + 0x2a000000, 0x0e000000, 0x2c000000, 0x33000000, 0x0e000000, 0x2c000000, 0x58000000, 0x3c000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x7b000000, 0x5f000000, 0x00000000, + 0x04000000, 0x00000000, 0x00000000, 0x00000000, 0xa1000000, 0x85000000, 0x00000000, 0x10000000, + 0x00000000, 0x00000000, 0x00000000, 0xc7000000, 0xab000000, 0x00000000, 0x40000000, 0x00000000, + 0x00000000, 0x00000000, 0xf0000000, 0xd4000000, 0x00000000, 0xff000000, 0x00ffffff, 0x00000000, + 0x24000000, 0x08000001, 0x00000001, 0xff000000, 0x00ffffff, 0x00000000, 0x5d000000, 0x41000001, + 0x00000001, 0xff000000, 0x00ffffff, 0x00000000, 0x8b000000, 0x6f000001, 0x00000001, 0xff000000, + 0x00ffffff, 0x00000000, 0xbc000000, 0xa0000001, 0x00000001, 0xff000000, 0x00ffffff, 0xed000000, + 0xd1000001, 0x00000001, 0xff000000, 0x00ffffff, 0x15000000, 0xf9000002, 0x00000001, 0xff000000, + 0x00ffffff, 0x3e000000, 0x22000002, 0x00000002, 0xff000000, 0x00ffffff, 0x6c000000, 0x50000002, + 0x00000002, 0xff000000, 0x00ffffff, 0x96000000, 0x7a000002, 0x00000002, 0xff000000, 0x00ffffff, + 0xc1000000, 0xa5000002, 0x00000002, 0xff000000, 0x00ffffff, 0xf2000000, 0xd6000002, 0x00000002, + 0xff000000, 0x00ffffff, 0x23000000, 0x07000003, 0x00000003, 0xff000000, 0x00ffffff, 0x50000000, + 0x34000003, 0x00000003, 0xff000000, 0x00ffffff, 0x7b000000, 0x5f000003, 0x00000003, 0xff000000, + 0x00ffffff, 0xa9000000, 0x8d000003, 0x00000003, 0xff000000, 0x00ffffff, 0x00000000, 0x00000000, + 0xd4000000, 0xb8000003, 0x00000003, 0xff000000, 0x00ffffff, 0x00000000, 0x00000000, 0xe4000004, + 0x00000003, 0xff000000, 0x00ffffff, 0x00000000, 0x1f000000, 0x03000004, 0x00000004, 0xff000000, + 0x00ffffff, 0x00000000, 0x00000000, 0x42000000, 0x26000004, 0x00000004, 0xff000000, 0x00ffffff, + 0x00000000, 0x00000000, 0x6c000000, 0x50000004, 0x00000004, 0xff000000, 0x00ffffff, 0x00000000, + 0x00000000, 0x8e000000, 0x72000004, 0x00000004, 0xff000000, 0x00ffffff, 0x00000000, 0x00000000, + 0x00000000, }; static BOOL is_valid_check(BOOL a, BOOL b) @@ -1411,7 +1414,7 @@ static void check_as(ID3D10EffectVariable *variable) variable2 = (ID3D10EffectVariable *)variable->lpVtbl->AsShaderResource(variable); is_valid = variable2->lpVtbl->IsValid(variable2); - ret = is_valid_check(is_valid, td.Type == D3D10_SVT_TEXTURE1D + ret = is_valid_check(is_valid, td.Type == D3D10_SVT_TEXTURE || td.Type == D3D10_SVT_TEXTURE1D || td.Type == D3D10_SVT_TEXTURE1DARRAY || td.Type == D3D10_SVT_TEXTURE2D || td.Type == D3D10_SVT_TEXTURE2DMS || td.Type == D3D10_SVT_TEXTURE2DARRAY || td.Type == D3D10_SVT_TEXTURE2DMSARRAY || td.Type == D3D10_SVT_TEXTURE3D @@ -1457,7 +1460,7 @@ static void test_effect_variable_type_class(void) effect_desc.ConstantBuffers); ok(effect_desc.SharedConstantBuffers == 0, "Unexpected shared constant buffers count %u.\n", effect_desc.SharedConstantBuffers); - ok(effect_desc.GlobalVariables == 25, "Unexpected global variables count %u.\n", + ok(effect_desc.GlobalVariables == 26, "Unexpected global variables count %u.\n", effect_desc.GlobalVariables); ok(effect_desc.SharedGlobalVariables == 0, "Unexpected shared global variables count %u.\n", effect_desc.SharedGlobalVariables); @@ -1873,6 +1876,38 @@ static void test_effect_variable_type_class(void) ok(td.UnpackedSize == 0x0, "UnpackedSize is %#x, expected 0x0\n", td.UnpackedSize); ok(td.Stride == 0x0, "Stride is %#x, expected 0x0\n", td.Stride); + /* check Texture t0 */ + variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); + hr = variable->lpVtbl->GetDesc(variable, &vd); + ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr); + + ok(!strcmp(vd.Name, "t0"), "Unexpected Name \"%s\".\n", vd.Name); + ok(!vd.Semantic, "Unexpected Semantic \"%s\".\n", vd.Semantic); + ok(!vd.Flags, "Unexpected Flags %u.\n", vd.Flags); + ok(!vd.Annotations, "Unexpected Annotations %u.\n", vd.Annotations); + ok(!vd.BufferOffset, "Unexpected BufferOffset %u.\n", vd.BufferOffset); + ok(!vd.ExplicitBindPoint, "Unexpected ExplicitBindPoint %u.\n", vd.ExplicitBindPoint); + + check_as(variable); + + parent = variable->lpVtbl->GetParentConstantBuffer(variable); + ok(null_buffer == parent, "Unexpected parent %p.\n", parent); + + type = variable->lpVtbl->GetType(variable); + hr = type->lpVtbl->GetDesc(type, &td); + ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr); + + ok(!strcmp(td.TypeName, "texture"), "Unexpected TypeName \"%s\".\n", td.TypeName); + ok(td.Class == D3D10_SVC_OBJECT, "Unexpected Class %x.\n", td.Class); + ok(td.Type == D3D10_SVT_TEXTURE, "Unexpected Type %x.\n", td.Type); + ok(!td.Elements, "Unexpected Elements %u.\n", td.Elements); + ok(!td.Members, "Unexpected Members %u.\n", td.Members); + ok(!td.Rows, "Unexpected Rows %u.\n", td.Rows); + ok(!td.Columns, "Unexpected Columns %u.\n", td.Columns); + ok(!td.PackedSize, "Unexpected PackedSize %#x.\n", td.PackedSize); + ok(!td.UnpackedSize, "Unexpected UnpackedSize %#x.\n", td.UnpackedSize); + ok(!td.Stride, "Unexpected Stride %#x.\n", td.Stride); + /* check Texture1D t1 */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); -- 2.26.3

1 0

[PATCH vkd3d 1/7] tests: Test casts to float.
by Zebediah Figura 15 Sep '21

15 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 2 ++ tests/cast-to-float.shader_test | 29 +++++++++++++++++++++++++++++ tests/shader_runner_d3d12.c | 33 ++++++++++++++++++++++++++++++--- 3 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 tests/cast-to-float.shader_test diff --git a/Makefile.am b/Makefile.am index 05d9f00c6..d707a26b3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,6 +54,7 @@ vkd3d_shader_runners = \ tests/shader_runner_d3d12 vkd3d_shader_tests = \ + tests/cast-to-float.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ @@ -266,6 +267,7 @@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ + tests/cast-to-float.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ diff --git a/tests/cast-to-float.shader_test b/tests/cast-to-float.shader_test new file mode 100644 index 000000000..75822e527 --- /dev/null +++ b/tests/cast-to-float.shader_test @@ -0,0 +1,29 @@ +[pixel shader] + +float4 main(uniform int i, uniform uint u, uniform bool b, uniform half h) : sv_target +{ + return float4(((float)i) + 1.5, ((float)u) - 2.5, ((float)b) / 2, h); +} + +[test] +uniform 0 int -1 +uniform 1 uint 3 +uniform 2 int -2 +uniform 3 float 0.5 +draw quad +probe all rgba (0.5, 0.5, 0.5, 0.5) + +[pixel shader] + +float4 main() : sv_target +{ + int i = -1; + uint u = 3; + bool b = true; + half h = 0.5; + return float4(((float)i) + 1.5, ((float)u) - 2.5, ((float)b) / 2, h); +} + +[test] +draw quad +probe all rgba (0.5, 0.5, 0.5, 0.5) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 2221c0f87..86151e424 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -109,7 +109,7 @@ enum parse_state STATE_TEST, }; -static bool match_string(const char *line, const char *token, const char **const rest) +static bool match_string(char *line, const char *token, char **const rest) { size_t len = strlen(token); @@ -124,7 +124,7 @@ static bool match_string(const char *line, const char *token, const char **const return true; } -static void parse_test_directive(struct shader_context *context, const char *line) +static void parse_test_directive(struct shader_context *context, char *line) { const char *const orig_line = line; @@ -242,11 +242,38 @@ static void parse_test_directive(struct shader_context *context, const char *lin } memcpy(context->uniforms + offset, &v, sizeof(v)); } + else if (match_string(line, "float", &line)) + { + float f; + + if (!(f = strtof(line, &line)) && !line) + goto err; + if (offset + 1 > context->uniform_count) + { + context->uniform_count = offset + 1; + context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); + } + memcpy(context->uniforms + offset, &f, sizeof(f)); + } + else if (match_string(line, "int", &line)) + { + int i; + + if (!(i = strtol(line, &line, 0))) + goto err; + if (offset + 1 > context->uniform_count) + { + context->uniform_count = offset + 1; + context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); + } + memcpy(context->uniforms + offset, &i, sizeof(i)); + } else if (match_string(line, "uint", &line)) { unsigned int u; - sscanf(line, "%u", &u); + if (!(u = strtoul(line, &line, 0))) + goto err; if (offset + 1 > context->uniform_count) { context->uniform_count = offset + 1; -- 2.33.0

5 21

[PATCH 1/5] dinput8/tests: Add tests for the internal HID preparsed data structures.
by Rémi Bernon 15 Sep '21

15 Sep '21

Correct DInput implementation will require it to iterate on the internal HID structures, instead of using the higher-level value / button caps abstraction. This will make Wine DInput incompatible with native HID stack, unless the internal structure match. These tests exhibit native internal structures, which are close to what Wine uses, so it should not be too complicated to restore compatibility. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput8/tests/hid.c | 470 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 470 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 86e878d5ecb..cb1f4d61b7a 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -2710,6 +2710,475 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) SetCurrentDirectoryW( cwd ); } +/* undocumented HID internal preparsed data structure */ + +struct hidp_kdr_caps +{ + USHORT usage_page; + UCHAR report_id; + UCHAR start_bit; + USHORT bit_size; + USHORT report_count; + USHORT start_byte; + USHORT total_bits; + ULONG bit_field; + USHORT end_byte; + USHORT link_collection; + USAGE link_usage_page; + USAGE link_usage; + ULONG flags; + ULONG padding[8]; + USAGE usage_min; + USAGE usage_max; + USHORT string_min; + USHORT string_max; + USHORT designator_min; + USHORT designator_max; + USHORT data_index_min; + USHORT data_index_max; + USHORT null_value; + USHORT unknown; + LONG logical_min; + LONG logical_max; + LONG physical_min; + LONG physical_max; + LONG units; + LONG units_exp; +}; + +/* named array continues on next caps */ +#define HIDP_KDR_CAPS_ARRAY_HAS_MORE 0x01 +#define HIDP_KDR_CAPS_IS_CONSTANT 0x02 +#define HIDP_KDR_CAPS_IS_BUTTON 0x04 +#define HIDP_KDR_CAPS_IS_ABSOLUTE 0x08 +#define HIDP_KDR_CAPS_IS_RANGE 0x10 +#define HIDP_KDR_CAPS_IS_STRING_RANGE 0x40 +#define HIDP_KDR_CAPS_IS_DESIGNATOR_RANGE 0x80 + +struct hidp_kdr_node +{ + USAGE usage; + USAGE usage_page; + USHORT parent; + USHORT number_of_children; + USHORT next_sibling; + USHORT first_child; + ULONG collection_type; +}; + +struct hidp_kdr +{ + char magic[8]; + USAGE usage; + USAGE usage_page; + USHORT unknown[2]; + USHORT input_caps_start; + USHORT input_caps_count; + USHORT input_caps_end; + USHORT input_report_byte_length; + USHORT output_caps_start; + USHORT output_caps_count; + USHORT output_caps_end; + USHORT output_report_byte_length; + USHORT feature_caps_start; + USHORT feature_caps_count; + USHORT feature_caps_end; + USHORT feature_report_byte_length; + USHORT caps_size; + USHORT number_link_collection_nodes; + struct hidp_kdr_caps caps[1]; + /* struct hidp_kdr_node nodes[1] */ +}; + +static void test_hidp_kdr(void) +{ +#include "psh_hid_macros.h" + const unsigned char report_desc[] = + { + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Application), + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 127), + PHYSICAL_MINIMUM(1, -128), + PHYSICAL_MAXIMUM(1, 127), + + USAGE(1, HID_USAGE_GENERIC_RZ), + REPORT_SIZE(1, 16), + REPORT_COUNT(1, 0), + FEATURE(1, Data|Var|Abs), + USAGE(1, HID_USAGE_GENERIC_SLIDER), + REPORT_SIZE(1, 16), + REPORT_COUNT(1, 1), + FEATURE(1, Data|Var|Abs), + + USAGE(1, HID_USAGE_GENERIC_X), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + UNIT(1, 0x100e), + UNIT_EXPONENT(1, -3), + INPUT(1, Data|Var|Abs), + UNIT_EXPONENT(1, 0), + UNIT(1, 0), + USAGE(1, HID_USAGE_GENERIC_Y), + DESIGNATOR_MINIMUM(1, 1), + DESIGNATOR_MAXIMUM(1, 4), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + INPUT(1, Cnst|Var|Abs), + USAGE(1, HID_USAGE_GENERIC_Z), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + INPUT(1, Data|Var|Rel), + USAGE(1, HID_USAGE_GENERIC_RX), + USAGE(1, HID_USAGE_GENERIC_RY), + REPORT_SIZE(1, 16), + REPORT_COUNT(1, 2), + LOGICAL_MINIMUM(1, 7), + INPUT(1, Data|Var|Abs|Null), + + COLLECTION(1, Application), + USAGE(4, (HID_USAGE_PAGE_BUTTON << 16)|1), + USAGE(4, (HID_USAGE_PAGE_BUTTON << 16)|2), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 8), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + INPUT(1, Data|Var|Abs), + + USAGE_MINIMUM(4, (HID_USAGE_PAGE_BUTTON << 16)|3), + USAGE_MAXIMUM(4, (HID_USAGE_PAGE_BUTTON << 16)|8), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + LOGICAL_MINIMUM(1, 3), + LOGICAL_MAXIMUM(1, 8), + INPUT(1, Data|Ary|Abs), + + USAGE_MINIMUM(4, (HID_USAGE_PAGE_BUTTON << 16)|9), + USAGE_MAXIMUM(4, (HID_USAGE_PAGE_BUTTON << 16)|12), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 4), + LOGICAL_MINIMUM(1, 9), + LOGICAL_MAXIMUM(1, 12), + INPUT(2, Data|Ary|Abs|Buff), + + USAGE(4, (HID_USAGE_PAGE_BUTTON << 16)|13), + USAGE(4, (HID_USAGE_PAGE_BUTTON << 16)|14), + USAGE(4, (HID_USAGE_PAGE_BUTTON << 16)|15), + USAGE(4, (HID_USAGE_PAGE_BUTTON << 16)|16), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + LOGICAL_MINIMUM(1, 13), + LOGICAL_MAXIMUM(1, 16), + INPUT(1, Data|Ary|Abs), + END_COLLECTION, + END_COLLECTION, + }; +#include "pop_hid_macros.h" + + static const HIDP_CAPS expect_hidp_caps = + { + .Usage = HID_USAGE_GENERIC_JOYSTICK, + .UsagePage = HID_USAGE_PAGE_GENERIC, + .InputReportByteLength = 15, + }; + static const HID_DEVICE_ATTRIBUTES attributes = + { + .Size = sizeof(HID_DEVICE_ATTRIBUTES), + .VendorID = 0x1209, + .ProductID = 0x0001, + .VersionNumber = 0x0100, + }; + static const struct hidp_kdr expect_kdr = + { + .magic = "HidP KDR", + .usage = 0x04, + .usage_page = 0x01, + .input_caps_count = 13, + .input_caps_end = 13, + .input_report_byte_length = 15, + .output_caps_start = 13, + .output_caps_end = 13, + .feature_caps_start = 13, + .feature_caps_count = 2, + .feature_caps_end = 14, + .feature_report_byte_length = 3, + .caps_size = 1560, + .number_link_collection_nodes = 2, + }; + static const struct hidp_kdr_caps expect_caps[] = + { + { + .usage_page = 0x01, .bit_size = 0x08, .report_count = 0x1, .start_byte = 0x1, .total_bits = 0x08, + .bit_field = 0x002, .end_byte = 0x2, .link_usage_page = 0x01, .link_usage = 0x04, .flags = 0x08, + .usage_min = 0x30, .usage_max = 0x30, .logical_min = 1, .logical_max = 127, .physical_min = -128, + .physical_max = 127, .units = 0xe, .units_exp = -3 + }, + { + .usage_page = 0x01, .bit_size = 0x08, .report_count = 0x1, .start_byte = 0x2, .total_bits = 0x08, + .bit_field = 0x003, .end_byte = 0x3, .link_usage_page = 0x01, .link_usage = 0x04, .flags = 0x8a, + .usage_min = 0x31, .usage_max = 0x31, .designator_min = 1, .designator_max = 4, .data_index_min = 0x01, + .data_index_max = 0x01, .logical_min = 1, .logical_max = 127, .physical_min = -128, .physical_max = 127 + }, + { + .usage_page = 0x01, .bit_size = 0x08, .report_count = 0x1, .start_byte = 0x3, .total_bits = 0x08, + .bit_field = 0x006, .end_byte = 0x4, .link_usage_page = 0x01, .link_usage = 0x04, .usage_min = 0x32, + .usage_max = 0x32, .data_index_min = 0x02, .data_index_max = 0x02, .logical_min = 1, .logical_max = 127, + .physical_min = -128, .physical_max = 127 + }, + { + .usage_page = 0x01, .bit_size = 0x10, .report_count = 0x1, .start_byte = 0x6, .total_bits = 0x10, + .bit_field = 0x042, .end_byte = 0x8, .link_usage_page = 0x01, .link_usage = 0x04, .flags = 0x08, + .usage_min = 0x34, .usage_max = 0x34, .data_index_min = 0x03, .data_index_max = 0x03, .null_value = 1, + .logical_min = 7, .logical_max = 127, .physical_min = -128, .physical_max = 127 + }, + { + .usage_page = 0x01, .bit_size = 0x10, .report_count = 0x1, .start_byte = 0x4, .total_bits = 0x10, + .bit_field = 0x042, .end_byte = 0x6, .link_usage_page = 0x01, .link_usage = 0x04, .flags = 0x08, + .usage_min = 0x33, .usage_max = 0x33, .data_index_min = 0x04, .data_index_max = 0x04, .null_value = 1, + .logical_min = 7, .logical_max = 127, .physical_min = -128, .physical_max = 127 + }, + { + .usage_page = 0x09, .start_bit = 1, .bit_size = 0x01, .report_count = 0x7, .start_byte = 0x8, .total_bits = 0x07, + .bit_field = 0x002, .end_byte = 0x9, .link_collection = 1, .link_usage_page = 0x01, .flags = 0x0c, + .usage_min = 0x02, .usage_max = 0x02, .data_index_min = 0x05, .data_index_max = 0x05, + }, + { + .usage_page = 0x09, .bit_size = 0x01, .report_count = 0x1, .start_byte = 0x8, .total_bits = 0x01, + .bit_field = 0x002, .end_byte = 0x9, .link_collection = 1, .link_usage_page = 0x01, .flags = 0x0c, + .usage_min = 0x01, .usage_max = 0x01, .data_index_min = 0x06, .data_index_max = 0x06, + }, + { + .usage_page = 0x09, .bit_size = 0x08, .report_count = 0x1, .start_byte = 0x9, .total_bits = 0x08, + .bit_field = 0x000, .end_byte = 0xa, .link_collection = 1, .link_usage_page = 0x01, .flags = 0x1c, + .usage_min = 0x03, .usage_max = 0x08, .data_index_min = 0x07, .data_index_max = 0x0c, .null_value = 3, + .logical_min = 8 + }, + { + .usage_page = 0x09, .bit_size = 0x08, .report_count = 0x4, .start_byte = 0xa, .total_bits = 0x20, + .bit_field = 0x100, .end_byte = 0xe, .link_collection = 1, .link_usage_page = 0x01, .flags = 0x1c, + .usage_min = 0x09, .usage_max = 0x0c, .data_index_min = 0x0d, .data_index_max = 0x10, .null_value = 9, + .logical_min = 12 + }, + { + .usage_page = 0x09, .bit_size = 0x08, .report_count = 0x1, .start_byte = 0xe, .total_bits = 0x08, + .bit_field = 0x000, .end_byte = 0xf, .link_collection = 1, .link_usage_page = 0x01, .flags = 0x0d, + .usage_min = 0x10, .usage_max = 0x10, .data_index_min = 0x14, .data_index_max = 0x14, .null_value = 13, + .logical_min = 16 + }, + { + .usage_page = 0x09, .bit_size = 0x08, .report_count = 0x1, .start_byte = 0xe, .total_bits = 0x08, + .bit_field = 0x000, .end_byte = 0xf, .link_collection = 1, .link_usage_page = 0x01, .flags = 0x0d, + .usage_min = 0x0f, .usage_max = 0x0f, .data_index_min = 0x13, .data_index_max = 0x13, .null_value = 13, + .logical_min = 16 + }, + { + .usage_page = 0x09, .bit_size = 0x08, .report_count = 0x1, .start_byte = 0xe, .total_bits = 0x08, + .bit_field = 0x000, .end_byte = 0xf, .link_collection = 1, .link_usage_page = 0x01, .flags = 0x0d, + .usage_min = 0x0e, .usage_max = 0x0e, .data_index_min = 0x12, .data_index_max = 0x12, .null_value = 13, + .logical_min = 16 + }, + { + .usage_page = 0x09, .bit_size = 0x08, .report_count = 0x1, .start_byte = 0xe, .total_bits = 0x08, + .bit_field = 0x000, .end_byte = 0xf, .link_collection = 1, .link_usage_page = 0x01, .flags = 0x0c, + .usage_min = 0x0d, .usage_max = 0x0d, .data_index_min = 0x11, .data_index_max = 0x11, .null_value = 13, + .logical_min = 16 + }, + { + .usage_page = 0x01, .bit_size = 0x10, .report_count = 0x1, .start_byte = 0x1, .total_bits = 0x10, + .bit_field = 0x002, .end_byte = 0x3, .link_usage_page = 0x01, .link_usage = 0x04, .flags = 0x08, + .usage_min = 0x36, .usage_max = 0x36, .logical_min = 1, .logical_max = 127, .physical_min = -128, + .physical_max = 127 + }, + { + }, + }; + static const struct hidp_kdr_node expect_nodes[] = + { + { + .usage = 0x04, + .usage_page = 0x01, + .parent = 0, + .number_of_children = 0x1, + .next_sibling = 0, + .first_child = 0x1, + .collection_type = 0x1, + }, + { + .usage = 0x00, + .usage_page = 0x01, + .parent = 0, + .number_of_children = 0, + .next_sibling = 0, + .first_child = 0, + .collection_type = 0x1, + }, + }; + + char buffer[FIELD_OFFSET( SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath[MAX_PATH] )]; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(SP_DEVICE_INTERFACE_DATA)}; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *iface_detail = (void *)buffer; + SP_DEVINFO_DATA device = {sizeof(SP_DEVINFO_DATA)}; + WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; + PHIDP_PREPARSED_DATA preparsed_data; + DWORD i, report_id = 0, polled = 0; + struct hidp_kdr *kdr; + LSTATUS status; + HDEVINFO set; + HANDLE file; + HKEY hkey; + BOOL ret; + + GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); + GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); + SetCurrentDirectoryW( tempdir ); + + status = RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Services\\winetest", + 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL ); + ok( !status, "RegCreateKeyExW returned %#x\n", status ); + + status = RegSetValueExW( hkey, L"ReportID", 0, REG_DWORD, (void *)&report_id, sizeof(report_id) ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + + status = RegSetValueExW( hkey, L"PolledMode", 0, REG_DWORD, (void *)&polled, sizeof(polled) ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + + status = RegSetValueExW( hkey, L"Descriptor", 0, REG_BINARY, (void *)report_desc, sizeof(report_desc) ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + + status = RegSetValueExW( hkey, L"Attributes", 0, REG_BINARY, (void *)&attributes, sizeof(attributes) ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + + status = RegSetValueExW( hkey, L"Caps", 0, REG_BINARY, (void *)&expect_hidp_caps, sizeof(expect_hidp_caps) ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + + status = RegSetValueExW( hkey, L"Expect", 0, REG_BINARY, NULL, 0 ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + + status = RegSetValueExW( hkey, L"Input", 0, REG_BINARY, NULL, 0 ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + + if (!pnp_driver_start( L"driver_hid.dll" )) goto done; + + set = SetupDiGetClassDevsW( &GUID_DEVINTERFACE_HID, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT ); + ok( set != INVALID_HANDLE_VALUE, "failed to get device list, error %#x\n", GetLastError() ); + for (i = 0; SetupDiEnumDeviceInfo( set, i, &device ); ++i) + { + ret = SetupDiEnumDeviceInterfaces( set, &device, &GUID_DEVINTERFACE_HID, 0, &iface ); + ok( ret, "failed to get interface, error %#x\n", GetLastError() ); + ok( IsEqualGUID( &iface.InterfaceClassGuid, &GUID_DEVINTERFACE_HID ), "wrong class %s\n", + debugstr_guid( &iface.InterfaceClassGuid ) ); + ok( iface.Flags == SPINT_ACTIVE, "got flags %#x\n", iface.Flags ); + + iface_detail->cbSize = sizeof(*iface_detail); + ret = SetupDiGetDeviceInterfaceDetailW( set, &iface, iface_detail, sizeof(buffer), NULL, NULL ); + ok( ret, "failed to get interface path, error %#x\n", GetLastError() ); + + if (wcsstr( iface_detail->DevicePath, L"\\\\?\\hid#winetest#1" )) break; + } + SetupDiDestroyDeviceInfoList( set ); + + file = CreateFileW( iface_detail->DevicePath, FILE_READ_ACCESS | FILE_WRITE_ACCESS, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL ); + ok( file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError() ); + + ret = HidD_GetPreparsedData( file, &preparsed_data ); + ok( ret, "HidD_GetPreparsedData failed with error %u\n", GetLastError() ); + + kdr = (struct hidp_kdr *)preparsed_data; + todo_wine + ok( !strncmp( kdr->magic, expect_kdr.magic, 8 ), "got %s expected %s\n", + debugstr_an(kdr->magic, 8), debugstr_an(expect_kdr.magic, 8) ); + + if (!strncmp( kdr->magic, expect_kdr.magic, 8 )) + { + check_member( *kdr, expect_kdr, "%04x", usage ); + check_member( *kdr, expect_kdr, "%04x", usage_page ); + check_member( *kdr, expect_kdr, "%#x", unknown[0] ); + check_member( *kdr, expect_kdr, "%#x", unknown[1] ); + check_member( *kdr, expect_kdr, "%d", input_caps_start ); + check_member( *kdr, expect_kdr, "%d", input_caps_count ); + check_member( *kdr, expect_kdr, "%d", input_caps_end ); + check_member( *kdr, expect_kdr, "%d", input_report_byte_length ); + check_member( *kdr, expect_kdr, "%d", output_caps_start ); + check_member( *kdr, expect_kdr, "%d", output_caps_count ); + check_member( *kdr, expect_kdr, "%d", output_caps_end ); + check_member( *kdr, expect_kdr, "%d", output_report_byte_length ); + check_member( *kdr, expect_kdr, "%d", feature_caps_start ); + check_member( *kdr, expect_kdr, "%d", feature_caps_count ); + check_member( *kdr, expect_kdr, "%d", feature_caps_end ); + check_member( *kdr, expect_kdr, "%d", feature_report_byte_length ); + check_member( *kdr, expect_kdr, "%d", caps_size ); + check_member( *kdr, expect_kdr, "%d", number_link_collection_nodes ); + + for (i = 0; i < ARRAY_SIZE(expect_caps); ++i) + { + winetest_push_context( "caps[%d]", i ); + check_member( kdr->caps[i], expect_caps[i], "%04x", usage_page ); + check_member( kdr->caps[i], expect_caps[i], "%d", report_id ); + check_member( kdr->caps[i], expect_caps[i], "%d", start_bit ); + check_member( kdr->caps[i], expect_caps[i], "%d", bit_size ); + check_member( kdr->caps[i], expect_caps[i], "%d", report_count ); + check_member( kdr->caps[i], expect_caps[i], "%d", start_byte ); + check_member( kdr->caps[i], expect_caps[i], "%d", total_bits ); + check_member( kdr->caps[i], expect_caps[i], "%#x", bit_field ); + check_member( kdr->caps[i], expect_caps[i], "%d", end_byte ); + check_member( kdr->caps[i], expect_caps[i], "%d", link_collection ); + check_member( kdr->caps[i], expect_caps[i], "%04x", link_usage_page ); + check_member( kdr->caps[i], expect_caps[i], "%04x", link_usage ); + check_member( kdr->caps[i], expect_caps[i], "%#x", flags ); + check_member( kdr->caps[i], expect_caps[i], "%#x", padding[0] ); + check_member( kdr->caps[i], expect_caps[i], "%#x", padding[1] ); + check_member( kdr->caps[i], expect_caps[i], "%#x", padding[2] ); + check_member( kdr->caps[i], expect_caps[i], "%#x", padding[3] ); + check_member( kdr->caps[i], expect_caps[i], "%#x", padding[4] ); + check_member( kdr->caps[i], expect_caps[i], "%#x", padding[5] ); + check_member( kdr->caps[i], expect_caps[i], "%#x", padding[6] ); + check_member( kdr->caps[i], expect_caps[i], "%#x", padding[7] ); + check_member( kdr->caps[i], expect_caps[i], "%04x", usage_min ); + check_member( kdr->caps[i], expect_caps[i], "%04x", usage_max ); + check_member( kdr->caps[i], expect_caps[i], "%d", string_min ); + check_member( kdr->caps[i], expect_caps[i], "%d", string_max ); + check_member( kdr->caps[i], expect_caps[i], "%d", designator_min ); + check_member( kdr->caps[i], expect_caps[i], "%d", designator_max ); + check_member( kdr->caps[i], expect_caps[i], "%#x", data_index_min ); + check_member( kdr->caps[i], expect_caps[i], "%#x", data_index_max ); + check_member( kdr->caps[i], expect_caps[i], "%d", null_value ); + check_member( kdr->caps[i], expect_caps[i], "%d", unknown ); + check_member( kdr->caps[i], expect_caps[i], "%d", logical_min ); + check_member( kdr->caps[i], expect_caps[i], "%d", logical_max ); + check_member( kdr->caps[i], expect_caps[i], "%d", physical_min ); + check_member( kdr->caps[i], expect_caps[i], "%d", physical_max ); + check_member( kdr->caps[i], expect_caps[i], "%#x", units ); + check_member( kdr->caps[i], expect_caps[i], "%#x", units_exp ); + winetest_pop_context(); + } + + for (i = 0; i < ARRAY_SIZE(expect_nodes); ++i) + { + struct hidp_kdr_node *nodes = (struct hidp_kdr_node *)((char *)kdr->caps + kdr->caps_size); + winetest_push_context( "nodes[%d]", i ); + check_member( nodes[i], expect_nodes[i], "%04x", usage ); + check_member( nodes[i], expect_nodes[i], "%04x", usage_page ); + check_member( nodes[i], expect_nodes[i], "%d", parent ); + check_member( nodes[i], expect_nodes[i], "%d", number_of_children ); + check_member( nodes[i], expect_nodes[i], "%d", next_sibling ); + check_member( nodes[i], expect_nodes[i], "%d", first_child ); + check_member( nodes[i], expect_nodes[i], "%#x", collection_type ); + winetest_pop_context(); + } + } + + HidD_FreePreparsedData( preparsed_data ); + + CloseHandle( file ); + +done: + pnp_driver_stop(); + SetCurrentDirectoryW( cwd ); +} + START_TEST( hid ) { HANDLE mapping; @@ -2741,6 +3210,7 @@ START_TEST( hid ) ok( okfile != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError() ); subtest( "driver_hid" ); + test_hidp_kdr(); test_hid_driver( 0, FALSE ); test_hid_driver( 1, FALSE ); test_hid_driver( 0, TRUE ); -- 2.33.0

1 4

[PATCH 1/7] winebus.sys: Move process_hid_report helper around.
by Rémi Bernon 15 Sep '21

15 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/main.c | 124 ++++++++++++++++++++-------------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index c6d7859dcfa..72e1f7ded5d 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -442,6 +442,68 @@ static DWORD check_bus_option(const UNICODE_STRING *option, DWORD default_value) return default_value; } +static NTSTATUS deliver_last_report(struct device_extension *ext, DWORD buffer_length, BYTE* buffer, ULONG_PTR *out_length) +{ + if (buffer_length < ext->last_report_size) + { + *out_length = 0; + return STATUS_BUFFER_TOO_SMALL; + } + else + { + if (ext->last_report) + memcpy(buffer, ext->last_report, ext->last_report_size); + *out_length = ext->last_report_size; + return STATUS_SUCCESS; + } +} + +void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) +{ + struct device_extension *ext = (struct device_extension*)device->DeviceExtension; + IRP *irp; + LIST_ENTRY *entry; + + if (!length || !report) + return; + + EnterCriticalSection(&ext->cs); + if (length > ext->buffer_size) + { + HeapFree(GetProcessHeap(), 0, ext->last_report); + ext->last_report = HeapAlloc(GetProcessHeap(), 0, length); + if (!ext->last_report) + { + ERR_(hid_report)("Failed to alloc last report\n"); + ext->buffer_size = 0; + ext->last_report_size = 0; + ext->last_report_read = TRUE; + LeaveCriticalSection(&ext->cs); + return; + } + else + ext->buffer_size = length; + } + + memcpy(ext->last_report, report, length); + ext->last_report_size = length; + ext->last_report_read = FALSE; + + while ((entry = RemoveHeadList(&ext->irp_queue)) != &ext->irp_queue) + { + IO_STACK_LOCATION *irpsp; + TRACE_(hid_report)("Processing Request\n"); + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irpsp = IoGetCurrentIrpStackLocation(irp); + irp->IoStatus.Status = deliver_last_report(ext, + irpsp->Parameters.DeviceIoControl.OutputBufferLength, + irp->UserBuffer, &irp->IoStatus.Information); + ext->last_report_read = TRUE; + IoCompleteRequest(irp, IO_NO_INCREMENT); + } + LeaveCriticalSection(&ext->cs); +} + static NTSTATUS handle_IRP_MN_QUERY_DEVICE_RELATIONS(IRP *irp) { NTSTATUS status = irp->IoStatus.Status; @@ -794,22 +856,6 @@ static NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) return pdo_pnp_dispatch(device, irp); } -static NTSTATUS deliver_last_report(struct device_extension *ext, DWORD buffer_length, BYTE* buffer, ULONG_PTR *out_length) -{ - if (buffer_length < ext->last_report_size) - { - *out_length = 0; - return STATUS_BUFFER_TOO_SMALL; - } - else - { - if (ext->last_report) - memcpy(buffer, ext->last_report, ext->last_report_size); - *out_length = ext->last_report_size; - return STATUS_SUCCESS; - } -} - static NTSTATUS hid_get_device_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD buffer_len) { struct device_extension *ext = (struct device_extension *)device->DeviceExtension; @@ -996,52 +1042,6 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) return status; } -void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) -{ - struct device_extension *ext = (struct device_extension*)device->DeviceExtension; - IRP *irp; - LIST_ENTRY *entry; - - if (!length || !report) - return; - - EnterCriticalSection(&ext->cs); - if (length > ext->buffer_size) - { - HeapFree(GetProcessHeap(), 0, ext->last_report); - ext->last_report = HeapAlloc(GetProcessHeap(), 0, length); - if (!ext->last_report) - { - ERR_(hid_report)("Failed to alloc last report\n"); - ext->buffer_size = 0; - ext->last_report_size = 0; - ext->last_report_read = TRUE; - LeaveCriticalSection(&ext->cs); - return; - } - else - ext->buffer_size = length; - } - - memcpy(ext->last_report, report, length); - ext->last_report_size = length; - ext->last_report_read = FALSE; - - while ((entry = RemoveHeadList(&ext->irp_queue)) != &ext->irp_queue) - { - IO_STACK_LOCATION *irpsp; - TRACE_(hid_report)("Processing Request\n"); - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); - irpsp = IoGetCurrentIrpStackLocation(irp); - irp->IoStatus.Status = deliver_last_report(ext, - irpsp->Parameters.DeviceIoControl.OutputBufferLength, - irp->UserBuffer, &irp->IoStatus.Information); - ext->last_report_read = TRUE; - IoCompleteRequest(irp, IO_NO_INCREMENT); - } - LeaveCriticalSection(&ext->cs); -} - BOOL is_xbox_gamepad(WORD vid, WORD pid) { int i; -- 2.33.0

1 6

[PATCH 1/2] winemac.drv: Use window drag notifications when available
by Tim Clem 15 Sep '21

15 Sep '21

When running on macOS 10.12+, there are private notification center messages we can use to reliably detect when a window is being dragged by its titlebar. These are less finicky than the current combination of an undocumented event subtype and a left mouse up. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- dlls/winemac.drv/cocoa_app.h | 1 + dlls/winemac.drv/cocoa_app.m | 93 +++++++++++++++++++++++++----------- 2 files changed, 66 insertions(+), 28 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 7abea0990e9..0b70a2fd55b 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -131,6 +131,7 @@ @interface WineApplicationController : NSObject <NSApplicationDelegate> BOOL beenActive; NSMutableSet* windowsBeingDragged; + BOOL useDragNotifications; } @property (nonatomic) CGEventSourceKeyboardType keyboardType; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index e296d4b4af0..fe10ee8c41d 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -27,6 +27,12 @@ static NSString* const WineAppWaitQueryResponseMode = @"WineAppWaitQueryResponseMode"; +// Private notifications that are reliably dispatched when a window is moved by dragging its titlebar. +// The object of the notification is the window being dragged. +// Available in macOS 10.12+ +static NSString* const NSWindowWillStartDraggingNotification = @"NSWindowWillStartDraggingNotification"; +static NSString* const NSWindowDidEndDraggingNotification = @"NSWindowDidEndDraggingNotification"; + int macdrv_err_on; @@ -181,6 +187,15 @@ - (id) init windowsBeingDragged = [[NSMutableSet alloc] init]; + // On macOS 10.12+, use notifications to more reliably detect when windows are being dragged. + if ([NSProcessInfo instancesRespondToSelector:@selector(isOperatingSystemAtLeastVersion:)]) + { + NSOperatingSystemVersion requiredVersion = { 10, 12, 0 }; + useDragNotifications = [[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:requiredVersion]; + } + else + useDragNotifications = NO; + if (!requests || !requestsManipQueue || !eventQueues || !eventQueuesLock || !keyWindows || !originalDisplayModes || !latentDisplayModes || !warpRecords) { @@ -1554,32 +1569,28 @@ - (void) windowWillOrderOut:(WineWindow*)window } } - - (void) handleWindowDrag:(NSEvent*)anEvent begin:(BOOL)begin + - (void) handleWindowDrag:(WineWindow*)window begin:(BOOL)begin { - WineWindow* window = (WineWindow*)[anEvent window]; - if ([window isKindOfClass:[WineWindow class]]) - { - macdrv_event* event; - int eventType; - - if (begin) - { - [windowsBeingDragged addObject:window]; - eventType = WINDOW_DRAG_BEGIN; - } - else - { - [windowsBeingDragged removeObject:window]; - eventType = WINDOW_DRAG_END; - } - [self updateCursorClippingState]; + macdrv_event* event; + int eventType; - event = macdrv_create_event(eventType, window); - if (eventType == WINDOW_DRAG_BEGIN) - event->window_drag_begin.no_activate = [NSEvent wine_commandKeyDown]; - [window.queue postEvent:event]; - macdrv_release_event(event); + if (begin) + { + [windowsBeingDragged addObject:window]; + eventType = WINDOW_DRAG_BEGIN; } + else + { + [windowsBeingDragged removeObject:window]; + eventType = WINDOW_DRAG_END; + } + [self updateCursorClippingState]; + + event = macdrv_create_event(eventType, window); + if (eventType == WINDOW_DRAG_BEGIN) + event->window_drag_begin.no_activate = [NSEvent wine_commandKeyDown]; + [window.queue postEvent:event]; + macdrv_release_event(event); } - (void) handleMouseMove:(NSEvent*)anEvent @@ -1736,8 +1747,13 @@ - (void) handleMouseButton:(NSEvent*)theEvent WineWindow* windowBroughtForward = nil; BOOL process = FALSE; - if (type == NSEventTypeLeftMouseUp && [windowsBeingDragged count]) - [self handleWindowDrag:theEvent begin:NO]; + if (!useDragNotifications && + type == NSEventTypeLeftMouseUp && + [windowsBeingDragged count] && + [window isKindOfClass:[WineWindow class]]) + { + [self handleWindowDrag:window begin:NO]; + } if ([window isKindOfClass:[WineWindow class]] && type == NSEventTypeLeftMouseDown && @@ -2085,15 +2101,16 @@ - (BOOL) handleEvent:(NSEvent*)anEvent [window postKeyEvent:anEvent]; } } - else if (type == NSEventTypeAppKitDefined) + else if (!useDragNotifications && type == NSEventTypeAppKitDefined) { + WineWindow *window = (WineWindow *)[anEvent window]; short subtype = [anEvent subtype]; // These subtypes are not documented but they appear to mean // "a window is being dragged" and "a window is no longer being // dragged", respectively. - if (subtype == 20 || subtype == 21) - [self handleWindowDrag:anEvent begin:(subtype == 20)]; + if ((subtype == 20 || subtype == 21) && [window isKindOfClass:[WineWindow class]]) + [self handleWindowDrag:window begin:(subtype == 20)]; } return ret; @@ -2155,6 +2172,26 @@ - (void) setupObservations [self updateCursorClippingState]; }]; + if (useDragNotifications) { + [nc addObserverForName:NSWindowWillStartDraggingNotification + object:nil + queue:[NSOperationQueue mainQueue] + usingBlock:^(NSNotification *note){ + NSWindow* window = [note object]; + if ([window isKindOfClass:[WineWindow class]]) + [self handleWindowDrag:(WineWindow *)window begin:YES]; + }]; + + [nc addObserverForName:NSWindowDidEndDraggingNotification + object:nil + queue:[NSOperationQueue mainQueue] + usingBlock:^(NSNotification *note){ + NSWindow* window = [note object]; + if ([window isKindOfClass:[WineWindow class]]) + [self handleWindowDrag:(WineWindow *)window begin:NO]; + }]; + } + [nc addObserver:self selector:@selector(keyboardSelectionDidChange) name:NSTextInputContextKeyboardSelectionDidChangeNotification -- 2.32.0

2 2

[PATCH 1/4] user32/tests: Fix occasional failure in test_messages() message sequences.
by Connor McAdams 15 Sep '21

15 Sep '21

Some window messages in the WmShowPopupExtremeLocationSeq message sequence aren't always sent on Win8+. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d61c813b492..35351035120 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1108,8 +1108,8 @@ static const struct message WmShowPopupExtremeLocationSeq[] = { { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { HCBT_SETFOCUS, hook }, { WM_SETFOCUS, sent|defwinproc }, - { WM_NCPAINT, sent|wparam, 1 }, - { WM_ERASEBKGND, sent }, + { WM_NCPAINT, sent|wparam|optional, 1 }, /* Not always sent on Win8+ */ + { WM_ERASEBKGND, sent|optional }, /* Not always sent on Win8+ */ { WM_WINDOWPOSCHANGED, sent }, /* occasionally received on test machines */ { WM_NCPAINT, sent|optional }, -- 2.25.1

2 5

[PATCH] advpack: Do not export DllMain.
by Zebediah Figura 15 Sep '21

15 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/advpack/advpack.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 2f4698aa47b..f30446946fa 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -11,7 +11,6 @@ @ stdcall DelNodeRunDLL32A(ptr ptr str long) @ stdcall DelNodeRunDLL32W(ptr ptr wstr long) @ stdcall DelNodeW(wstr long) -@ stdcall -private DllMain(long long ptr) @ stdcall DoInfInstall(ptr) @ stdcall ExecuteCab(ptr ptr ptr) ExecuteCabA @ stdcall ExecuteCabA(ptr ptr ptr) -- 2.33.0

1 0

[PATCH v2 1/2] ntdll: Use posix_fallocate(2/3) instead of fallocate(2).
by Chip Davis 14 Sep '21

14 Sep '21

From: Charles Davis <cdavis5x(a)gmail.com> The fallocate(2) call only exists on Linux. posix_fallocate() is more portable. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- v2: Don't fall back to fallocate(2). --- configure.ac | 10 +--------- dlls/ntdll/unix/file.c | 9 +++++---- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index fec39b6f2ac..cc8a4b79aaf 100644 --- a/configure.ac +++ b/configure.ac @@ -2183,6 +2183,7 @@ AC_CHECK_FUNCS(\ poll \ port_create \ posix_fadvise \ + posix_fallocate \ prctl \ proc_pidinfo \ readlink \ @@ -2274,15 +2275,6 @@ then AC_DEFINE(HAVE_SCHED_SETAFFINITY, 1, [Define to 1 if you have the `sched_setaffinity' function.]) fi -AC_CACHE_CHECK([for fallocate],wine_cv_have_fallocate, - AC_LINK_IFELSE([AC_LANG_PROGRAM( -[[#define _GNU_SOURCE -#include <fcntl.h>]], [[fallocate(-1, 0, 0, 0);]])],[wine_cv_have_fallocate=yes],[wine_cv_have_fallocate=no])) -if test "$wine_cv_have_fallocate" = "yes" -then - AC_DEFINE(HAVE_FALLOCATE, 1, [Define to 1 if you have the `fallocate' function.]) -fi - dnl **** Check for types **** AC_C_INLINE diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 046338b2a82..e10c79cb846 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4574,11 +4574,12 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, status = STATUS_INVALID_PARAMETER; else { -#ifdef HAVE_FALLOCATE - if (fallocate( fd, 0, 0, (off_t)info->ValidDataLength.QuadPart ) == -1) +#ifdef HAVE_POSIX_ALLOCATE + int err; + if ((err = posix_fallocate( fd, 0, (off_t)info->ValidDataLength.QuadPart )) != 0) { - if (errno == EOPNOTSUPP) WARN( "fallocate not supported on this filesystem\n" ); - else status = errno_to_status( errno ); + if (err == EOPNOTSUPP) WARN( "posix_fallocate not supported on this filesystem\n" ); + else status = errno_to_status( err ); } #else FIXME( "setting valid data length not supported\n" ); -- 2.33.0

1 2

[PATCH 1/2] ntdll: Use posix_fallocate(2/3) instead of fallocate(2).
by Chip Davis 14 Sep '21

14 Sep '21

From: Charles Davis <cdavis5x(a)gmail.com> The fallocate(2) call only exists on Linux. posix_fallocate() is more portable. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- configure.ac | 1 + dlls/ntdll/unix/file.c | 25 ++++++++++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index fec39b6f2ac..53656685bff 100644 --- a/configure.ac +++ b/configure.ac @@ -2183,6 +2183,7 @@ AC_CHECK_FUNCS(\ poll \ port_create \ posix_fadvise \ + posix_fallocate \ prctl \ proc_pidinfo \ readlink \ diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 833266ddf3f..4286b81aa1f 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -135,6 +135,19 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #define MAX_DOS_DRIVES 26 +#ifndef HAVE_POSIX_FALLOCATE +static int posix_fallocate( int fd, off_t offset, off_t len ) +{ +#ifdef HAVE_FALLOCATE + if (fallocate( fd, 0, offset, len ) < 0) + return errno; + return 0; +#else + return ENOSYS; +#endif +} +#endif /* HAVE_POSIX_FALLOCATE */ + /* just in case... */ #undef VFAT_IOCTL_READDIR_BOTH #undef EXT2_IOC_GETFLAGS @@ -4574,15 +4587,13 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, status = STATUS_INVALID_PARAMETER; else { -#ifdef HAVE_FALLOCATE - if (fallocate( fd, 0, 0, (off_t)info->ValidDataLength.QuadPart ) == -1) + int err; + if ((err = posix_fallocate( fd, 0, (off_t)info->ValidDataLength.QuadPart )) != 0) { - if (errno == EOPNOTSUPP) WARN( "fallocate not supported on this filesystem\n" ); - else status = errno_to_status( errno ); + if (err == ENOSYS) FIXME( "setting valid data length not supported\n" ); + else if (err == EOPNOTSUPP) WARN( "posix_fallocate not supported on this filesystem\n" ); + else status = errno_to_status( err ); } -#else - FIXME( "setting valid data length not supported\n" ); -#endif } if (needs_close) close( fd ); } -- 2.33.0

2 2

[PATCH] msxml3/tests: Add missing return value check (Coverity).
by Nikolay Sivov 14 Sep '21

14 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/tests/domdoc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 063f9433a77..a0bcca2d4e9 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7468,6 +7468,7 @@ static void test_XSLPattern(void) ok(hr == S_OK, "query=%s, failed with 0x%08x\n", ptr->query, hr); len = 0; hr = IXMLDOMNodeList_get_length(list, &len); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(len != 0, "query=%s, empty list\n", ptr->query); if (len) { if (ptr->todo) { -- 2.33.0

1 0

[PATCH] kernel32/tests: Fix sprintf() arguments (Coverity).
by Nikolay Sivov 14 Sep '21

14 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 3003ff63f5a..0bce88716d0 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4444,7 +4444,7 @@ static void test_AllocConsole(void) if (skip_nt) return; winetest_get_mainargs(&argv); - sprintf(buf, "\"%s\" console alloc_console", argv[0], GetCurrentProcessId()); + sprintf(buf, "\"%s\" console alloc_console", argv[0]); res = CreateProcessA(NULL, buf, NULL, NULL, FALSE, CREATE_NEW_CONSOLE, NULL, NULL, &si, &info); ok(res, "CreateProcess failed: %u\n", GetLastError()); CloseHandle(info.hThread); -- 2.33.0

2 1

[PATCH] widl: Remove arguments from writing calls that don't use them (Coverity).
by Nikolay Sivov 14 Sep '21

14 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tools/widl/header.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 1a69b298e7d..bee7306f413 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -192,11 +192,11 @@ static void write_namespace_end(FILE *header, struct namespace *namespace) { if(is_global_namespace(namespace)) { if(use_abi_namespace) - write_line(header, -1, "}", namespace->name); + write_line(header, -1, "}"); return; } - write_line(header, -1, "}", namespace->name); + write_line(header, -1, "}"); write_namespace_end(header, namespace->parent); } -- 2.33.0

1 0

[PATCH] services/tests: Fix printf-style helper format (Coverity).
by Nikolay Sivov 14 Sep '21

14 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/services/tests/service.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 4eebbc432df..93eff0e36f0 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -26,6 +26,12 @@ #include "wine/test.h" +#if !defined(__WINE_USE_MSVCRT) || defined(__MINGW32__) +#define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) +#else +#define __WINE_PRINTF_ATTR(fmt,args) +#endif + static SERVICE_STATUS_HANDLE (WINAPI *pRegisterServiceCtrlHandlerExA)(LPCSTR,LPHANDLER_FUNCTION_EX,LPVOID); static HANDLE pipe_handle = INVALID_HANDLE_VALUE; @@ -56,6 +62,7 @@ static inline void service_event(const char *event) send_msg("EVENT", event); } +static void WINAPIV service_ok(int cnd, const char *msg, ...) __WINE_PRINTF_ATTR(2,3); static void WINAPIV service_ok(int cnd, const char *msg, ...) { __ms_va_list valist; @@ -135,7 +142,7 @@ static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPAR BOOL r; MONITORINFOEXA mi; - service_ok(hmon != NULL, "Unexpected hmon=%#x\n", hmon); + service_ok(hmon != NULL, "Unexpected hmon %p\n", hmon); monitor_count++; -- 2.33.0

1 0

[PATCH] server: Don't wait for low level hook result when queueing hardware message.
by Piotr Caban 14 Sep '21

14 Sep '21

Without the change graphic drivers are blocking until low level hooks are processed when injecting keyboard and mouse events. That may cause deadlocks. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- server/queue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

3 6

[PATCH] vbscript: Support date and time literals.
by Robert Wilhelm 14 Sep '21

14 Sep '21

Date literals, which are enclosed in number signs in vbscript, will be lexed as string, pushed throught parser and compiler and finally converted to VT_Date Variant in interpreter using VariantChangeType. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51503 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 18 +++++++++++++++++ dlls/vbscript/lex.c | 39 ++++++++++++++++++++++++++++++++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 16 ++++++++++++++- dlls/vbscript/tests/lang.vbs | 1 + dlls/vbscript/vbscript.h | 1 + 7 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 0d1960d8ca1..ae962ff73cf 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -530,6 +530,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return compile_call_expression(ctx, (call_expression_t*)expr, TRUE); case EXPR_CONCAT: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_concat); + case EXPR_DATE: + return push_instr_str(ctx, OP_date, ((string_expression_t*)expr)->value); case EXPR_DIV: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_div); case EXPR_DOT: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 11d95e57758..db3e41aae2f 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1637,6 +1637,24 @@ static HRESULT interp_string(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_date(exec_ctx_t *ctx) +{ + VARIANT v,date; + HRESULT hres; + + TRACE("\n"); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(ctx->instr->arg1.str); + if(!V_BSTR(&v)) + return E_OUTOFMEMORY; + + hres = VariantChangeType(&date, &v, 0, VT_DATE); + if(FAILED(hres)) + return hres; + return stack_push(ctx, &date); +} + static HRESULT interp_int(exec_ctx_t *ctx) { const LONG arg = ctx->instr->arg1.lng; diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 357cad7158c..28bbda331a9 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -204,6 +204,43 @@ static int parse_string_literal(parser_ctx_t *ctx, const WCHAR **ret) return tString; } +static int parse_date_literal(parser_ctx_t *ctx, const WCHAR **ret) +{ + const WCHAR *ptr = ++ctx->ptr; + WCHAR *rptr; + int len = 0; + + while(ctx->ptr < ctx->end) { + if(*ctx->ptr == '\n' || *ctx->ptr == '\r') { + FIXME("newline inside date literal\n"); + return 0; + } + + if(*ctx->ptr == '#') + break; + ctx->ptr++; + } + + if(ctx->ptr == ctx->end) { + FIXME("unterminated date literal\n"); + return 0; + } + + len += ctx->ptr-ptr; + + *ret = rptr = parser_alloc(ctx, (len+1)*sizeof(WCHAR)); + if(!rptr) + return 0; + + while(ptr < ctx->ptr) { + *rptr++ = *ptr++; + } + + *rptr = 0; + ctx->ptr++; + return tDate; +} + static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) { BOOL use_int = TRUE; @@ -429,6 +466,8 @@ static int parse_next_token(void *lval, unsigned *loc, parser_ctx_t *ctx) return tEXPRLBRACKET; case '"': return parse_string_literal(ctx, lval); + case '#': + return parse_date_literal(ctx, lval); case '&': if(*++ctx->ptr == 'h' || *ctx->ptr == 'H') return parse_hex_literal(ctx, lval); diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 2888ea3b546..df7d9c20386 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -23,6 +23,7 @@ typedef enum { EXPR_BRACKETS, EXPR_CALL, EXPR_CONCAT, + EXPR_DATE, EXPR_DIV, EXPR_DOT, EXPR_DOUBLE, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 37b14f05e14..8e20b289966 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -34,6 +34,7 @@ static void source_add_class(parser_ctx_t*,class_decl_t*); static void *new_expression(parser_ctx_t*,expression_type_t,size_t); static expression_t *new_bool_expression(parser_ctx_t*,VARIANT_BOOL); +static expression_t *new_date_expression(parser_ctx_t*,const WCHAR*); static expression_t *new_string_expression(parser_ctx_t*,const WCHAR*); static expression_t *new_long_expression(parser_ctx_t*,expression_type_t,LONG); static expression_t *new_double_expression(parser_ctx_t*,double); @@ -125,7 +126,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %token <string> tNOTHING tEMPTY tNULL %token <string> tCLASS tSET tNEW tPUBLIC tPRIVATE %token <string> tNEXT tON tRESUME tGOTO -%token <string> tIdentifier tString +%token <string> tIdentifier tString tDate %token <string> tDEFAULT tERROR tEXPLICIT tPROPERTY tSTEP %token <integer> tInt %token <dbl> tDouble @@ -416,6 +417,7 @@ LiteralExpression : tTRUE { $$ = new_bool_expression(ctx, VARIANT_TRUE); CHECK_ERROR; } | tFALSE { $$ = new_bool_expression(ctx, VARIANT_FALSE); CHECK_ERROR; } | tString { $$ = new_string_expression(ctx, $1); CHECK_ERROR; } + | tDate { $$ = new_date_expression(ctx, $1); CHECK_ERROR; } | NumericLiteralExpression { $$ = $1; } | tEMPTY { $$ = new_expression(ctx, EXPR_EMPTY, 0); CHECK_ERROR; } | tNULL { $$ = new_expression(ctx, EXPR_NULL, 0); CHECK_ERROR; } @@ -594,6 +596,18 @@ static expression_t *new_string_expression(parser_ctx_t *ctx, const WCHAR *value return &expr->expr; } +static expression_t *new_date_expression(parser_ctx_t *ctx, const WCHAR *value) +{ + string_expression_t *expr; + + expr = new_expression(ctx, EXPR_DATE, sizeof(*expr)); + if(!expr) + return NULL; + + expr->value = value; + return &expr->expr; +} + static expression_t *new_long_expression(parser_ctx_t *ctx, expression_type_t type, LONG value) { int_expression_t *expr; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index a716cdbc65f..d7865301784 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -107,6 +107,7 @@ Call ok(getVT(&hffFFffFF&) = "VT_I2", "getVT(&hffFFffFF&) is not VT_I2") Call ok(getVT(&hffFFffFE&) = "VT_I2", "getVT(&hffFFffFE &) is not VT_I2") Call ok(getVT(&hffF&) = "VT_I2", "getVT(&hffFF&) is not VT_I2") Call ok(getVT(&hffFF&) = "VT_I4", "getVT(&hffFF&) is not VT_I4") +Call ok(getVT(# 1/1/2011 #) = "VT_DATE", "getVT(# 1/1/2011 #) is not VT_DATE") Call ok(getVT(1e2) = "VT_R8", "getVT(1e2) is not VT_R8") Call ok(getVT(1e0) = "VT_R8", "getVT(1e0) is not VT_R8") Call ok(getVT(0.1e2) = "VT_R8", "getVT(0.1e2) is not VT_R8") diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index afcce5eb9b8..60ec0123f60 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -225,6 +225,7 @@ typedef enum { X(case, 0, ARG_ADDR, 0) \ X(concat, 1, 0, 0) \ X(const, 1, ARG_BSTR, 0) \ + X(date, 1, ARG_STR, 0) \ X(deref, 1, 0, 0) \ X(dim, 1, ARG_BSTR, ARG_UINT) \ X(div, 1, 0, 0) \ -- 2.31.1

3 6

[PATCH 1/2] oleaut32: Fix uninitialized variable access in VarXor() for earlier failure paths (Coverity).
by Nikolay Sivov 14 Sep '21

14 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/variant.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 2c60f920f5e..bd1ff17c707 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -4635,6 +4635,7 @@ HRESULT WINAPI VarXor(LPVARIANT pVarLeft, LPVARIANT pVarRight, LPVARIANT pVarOut return S_OK; } + V_VT(&varLeft) = V_VT(&varRight) = VT_EMPTY; VariantInit(&tempLeft); VariantInit(&tempRight); @@ -4653,8 +4654,6 @@ HRESULT WINAPI VarXor(LPVARIANT pVarLeft, LPVARIANT pVarRight, LPVARIANT pVarOut } /* Copy our inputs so we don't disturb anything */ - V_VT(&varLeft) = V_VT(&varRight) = VT_EMPTY; - hRet = VariantCopy(&varLeft, pVarLeft); if (FAILED(hRet)) goto VarXor_Exit; -- 2.33.0

1 1

[PATCH v4 1/3] winegstreamer: Duplicate source shutdown path into constructor with leak fixes.
by Derek Lesho 14 Sep '21

14 Sep '21

Instead of having _Shutdown and the constructors' failures paths mix together creating confusion about what should be released where, we can designate ::Shutdown/::Release to shutting down fully initialized objects without checks, and keep the partially-created object cleanup code in the constructor. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v4: No changes. --- dlls/winegstreamer/media_source.c | 102 +++++++++++++++++++----------- 1 file changed, 65 insertions(+), 37 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 01ab626254a..7efa3cc06ba 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -733,6 +733,12 @@ static HRESULT new_media_stream(struct media_source *source, object->IMFMediaStream_iface.lpVtbl = &media_stream_vtbl; object->ref = 1; + if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) + { + free(object); + return hr; + } + IMFMediaSource_AddRef(&source->IMFMediaSource_iface); object->parent_source = source; object->stream_id = stream_id; @@ -741,20 +747,11 @@ static HRESULT new_media_stream(struct media_source *source, object->eos = FALSE; object->wg_stream = wg_stream; - if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) - goto fail; - TRACE("Created stream object %p.\n", object); *out_stream = object; return S_OK; - -fail: - WARN("Failed to construct media stream, hr %#x.\n", hr); - - IMFMediaStream_Release(&object->IMFMediaStream_iface); - return hr; } static HRESULT media_stream_init_desc(struct media_stream *stream) @@ -847,10 +844,16 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) goto done; if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler))) + { + IMFStreamDescriptor_Release(stream->descriptor); goto done; + } if (FAILED(hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_types[0]))) + { + IMFStreamDescriptor_Release(stream->descriptor); goto done; + } done: if (type_handler) @@ -1213,19 +1216,13 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) unix_funcs->wg_parser_disconnect(source->wg_parser); - if (source->read_thread) - { - source->read_thread_shutdown = true; - WaitForSingleObject(source->read_thread, INFINITE); - CloseHandle(source->read_thread); - } + source->read_thread_shutdown = true; + WaitForSingleObject(source->read_thread, INFINITE); + CloseHandle(source->read_thread); - if (source->pres_desc) - IMFPresentationDescriptor_Release(source->pres_desc); - if (source->event_queue) - IMFMediaEventQueue_Shutdown(source->event_queue); - if (source->byte_stream) - IMFByteStream_Release(source->byte_stream); + IMFPresentationDescriptor_Release(source->pres_desc); + IMFMediaEventQueue_Shutdown(source->event_queue); + IMFByteStream_Release(source->byte_stream); for (i = 0; i < source->stream_count; i++) { @@ -1233,23 +1230,18 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) stream->state = STREAM_SHUTDOWN; - if (stream->event_queue) - IMFMediaEventQueue_Shutdown(stream->event_queue); - if (stream->descriptor) - IMFStreamDescriptor_Release(stream->descriptor); - if (stream->parent_source) - IMFMediaSource_Release(&stream->parent_source->IMFMediaSource_iface); + IMFMediaEventQueue_Shutdown(stream->event_queue); + IMFStreamDescriptor_Release(stream->descriptor); + IMFMediaSource_Release(&stream->parent_source->IMFMediaSource_iface); IMFMediaStream_Release(&stream->IMFMediaStream_iface); } unix_funcs->wg_parser_destroy(source->wg_parser); - if (source->stream_count) - free(source->streams); + free(source->streams); - if (source->async_commands_queue) - MFUnlockWorkQueue(source->async_commands_queue); + MFUnlockWorkQueue(source->async_commands_queue); return S_OK; } @@ -1274,6 +1266,7 @@ static const IMFMediaSourceVtbl IMFMediaSource_vtbl = static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_source **out_media_source) { IMFStreamDescriptor **descriptors = NULL; + unsigned int stream_count = UINT32_MAX; struct media_source *object; UINT64 total_pres_time = 0; struct wg_parser *parser; @@ -1337,15 +1330,15 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ * leak occurs with native. */ unix_funcs->wg_parser_set_unlimited_buffering(parser); - object->stream_count = unix_funcs->wg_parser_get_stream_count(parser); + stream_count = unix_funcs->wg_parser_get_stream_count(parser); - if (!(object->streams = calloc(object->stream_count, sizeof(*object->streams)))) + if (!(object->streams = calloc(stream_count, sizeof(*object->streams)))) { hr = E_OUTOFMEMORY; goto fail; } - for (i = 0; i < object->stream_count; ++i) + for (i = 0; i < stream_count; ++i) { if (FAILED(hr = new_media_stream(object, unix_funcs->wg_parser_get_stream(parser, i), i, &object->streams[i]))) goto fail; @@ -1353,9 +1346,13 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (FAILED(hr = media_stream_init_desc(object->streams[i]))) { ERR("Failed to finish initialization of media stream %p, hr %x.\n", object->streams[i], hr); - IMFMediaStream_Release(&object->streams[i]->IMFMediaStream_iface); + IMFMediaSource_Release(&object->streams[i]->parent_source->IMFMediaSource_iface); + IMFMediaEventQueue_Release(object->streams[i]->event_queue); + free(object->streams[i]); goto fail; } + + object->stream_count++; } /* init presentation descriptor */ @@ -1392,8 +1389,39 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ fail: WARN("Failed to construct MFMediaSource, hr %#x.\n", hr); - free(descriptors); - IMFMediaSource_Release(&object->IMFMediaSource_iface); + if (descriptors) + { + for(i = 0; i < object->stream_count; i++) + IMFStreamDescriptor_Release(descriptors[i]); + free(descriptors); + } + for (i = 0; i < object->stream_count; i++) + { + struct media_stream *stream = object->streams[i]; + + IMFMediaEventQueue_Release(stream->event_queue); + IMFStreamDescriptor_Release(stream->descriptor); + IMFMediaSource_Release(&stream->parent_source->IMFMediaSource_iface); + + free(stream); + } + free(object->streams); + if (stream_count != UINT32_MAX) + unix_funcs->wg_parser_disconnect(object->wg_parser); + if (object->read_thread) + { + object->read_thread_shutdown = true; + WaitForSingleObject(object->read_thread, INFINITE); + CloseHandle(object->read_thread); + } + if (object->wg_parser) + unix_funcs->wg_parser_destroy(object->wg_parser); + if (object->async_commands_queue) + MFUnlockWorkQueue(object->async_commands_queue); + if (object->event_queue) + IMFMediaEventQueue_Release(object->event_queue); + IMFByteStream_Release(object->byte_stream); + free(object); return hr; } -- 2.33.0

1 2

[PATCH v5 1/3] winex11.drv: Add 'EDID' registry key to every monitor device.
by Eduard Permyakov 14 Sep '21

14 Sep '21

Extended display identification data (EDID) is a set of data that is provided by a display to describe its capabilities to a graphics adapter. EDID data allows a computer to detect the type of monitor that is connected to it. EDID data includes the manufacturer name, the product type, the timings that are supported by the display, the display size, as well as other display characteristics. EDID is defined by a standard published by the Video Electronics Standards Association (VESA). In Windows, every display device has an associated 'EDID' registry key containing this data. Applications can read and parse it to get the display capabilities. In Linux, we can get each monitor's EDID using the RANDR X extension. This patch fixes, for example, monitor detection in the UE-based game 'Industries of Titan'. Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 4 +++- dlls/winex11.drv/display.c | 15 ++++++++++++--- dlls/winex11.drv/x11drv.h | 6 +++++- dlls/winex11.drv/x11drv_main.c | 3 ++- dlls/winex11.drv/xinerama.c | 4 +++- dlls/winex11.drv/xrandr.c | 30 +++++++++++++++++++++++++++++- 6 files changed, 54 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index b517e44e150..71b3a0a5a27 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -265,6 +265,8 @@ static BOOL X11DRV_desktop_get_monitors( ULONG_PTR adapter_id, struct x11drv_mon SetRect( &monitor->rc_work, 0, 0, desktop_width, desktop_height ); query_desktop_work_area( &monitor->rc_work ); monitor->state_flags = DISPLAY_DEVICE_ATTACHED; + monitor->edid_len = 0; + monitor->edid = NULL; if (desktop_width && desktop_height) monitor->state_flags |= DISPLAY_DEVICE_ACTIVE; @@ -273,7 +275,7 @@ static BOOL X11DRV_desktop_get_monitors( ULONG_PTR adapter_id, struct x11drv_mon return TRUE; } -static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors ) +static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors, int count ) { heap_free( monitors ); } diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index b3ff213ae89..ca81f169f9f 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -109,6 +109,8 @@ static const WCHAR monitor_hardware_idW[] = { 'M','O','N','I','T','O','R','\\', 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static const WCHAR driver_date_fmtW[] = {'%','u','-','%','u','-','%','u',0}; +static const WCHAR edidW[] = {'E','D','I','D',0}; +static const WCHAR bad_edidW[] = {'B','A','D','_','E','D','I','D',0}; static struct x11drv_display_device_handler host_handler; struct x11drv_display_device_handler desktop_handler; @@ -257,7 +259,7 @@ RECT get_host_primary_monitor_rect(void) if (gpus) host_handler.free_gpus(gpus); if (adapters) host_handler.free_adapters(adapters); - if (monitors) host_handler.free_monitors(monitors); + if (monitors) host_handler.free_monitors(monitors, monitor_count); return rect; } @@ -611,6 +613,13 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo DEVPROP_TYPE_UINT32, (const BYTE *)&output_id, sizeof(output_id), 0)) goto done; + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, NULL, NULL); + if (monitor->edid) + RegSetValueExW(hkey, edidW, 0, REG_BINARY, monitor->edid, monitor->edid_len); + else + RegSetValueExW(hkey, bad_edidW, 0, REG_BINARY, NULL, 0); + RegCloseKey(hkey); + /* Create driver key */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); RegCloseKey(hkey); @@ -768,7 +777,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) goto done; } - handler->free_monitors(monitors); + handler->free_monitors(monitors, monitor_count); monitors = NULL; video_index++; } @@ -788,5 +797,5 @@ done: if (adapters) handler->free_adapters(adapters); if (monitors) - handler->free_monitors(monitors); + handler->free_monitors(monitors, monitor_count); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e14e131d819..2b0f7be589f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -497,6 +497,7 @@ enum x11drv_atoms XATOM_text_rtf, XATOM_text_richtext, XATOM_text_uri_list, + XATOM_EDID, NB_XATOMS }; @@ -752,6 +753,9 @@ struct x11drv_monitor RECT rc_work; /* StateFlags in DISPLAY_DEVICE struct */ DWORD state_flags; + /* Extended Device Identification Data */ + unsigned long edid_len; + unsigned char *edid; }; /* Required functions for display device registry initialization */ @@ -787,7 +791,7 @@ struct x11drv_display_device_handler void (*free_adapters)(struct x11drv_adapter *adapters); /* free_monitors will be called to free a monitor list from get_monitors */ - void (*free_monitors)(struct x11drv_monitor *monitors); + void (*free_monitors)(struct x11drv_monitor *monitors, int count); /* register_event_handlers will be called to register event handlers. * This function pointer is optional and can be NULL when driver doesn't support it */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 2fac560556b..6e7cb91c5c7 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -220,7 +220,8 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "text/plain", "text/rtf", "text/richtext", - "text/uri-list" + "text/uri-list", + "EDID" }; /*********************************************************************** diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index c9863482534..0e1e07669c2 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -244,6 +244,8 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * monitor[index].rc_work = monitors[i].rcWork; /* Xinerama only reports monitors already attached */ monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; + monitor[index].edid_len = 0; + monitor[index].edid = NULL; if (!IsRectEmpty( &monitors[i].rcMonitor )) monitor[index].state_flags |= DISPLAY_DEVICE_ACTIVE; @@ -256,7 +258,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * return TRUE; } -static void xinerama_free_monitors( struct x11drv_monitor *monitors ) +static void xinerama_free_monitors( struct x11drv_monitor *monitors, int count ) { heap_free( monitors ); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index e7adcec0f2e..0b22d3e39a3 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -68,6 +68,7 @@ MAKE_FUNCPTR(XRRFreeOutputInfo) MAKE_FUNCPTR(XRRFreeScreenResources) MAKE_FUNCPTR(XRRGetCrtcInfo) MAKE_FUNCPTR(XRRGetOutputInfo) +MAKE_FUNCPTR(XRRGetOutputProperty) MAKE_FUNCPTR(XRRGetScreenResources) MAKE_FUNCPTR(XRRGetScreenResourcesCurrent) MAKE_FUNCPTR(XRRGetScreenSizeRange) @@ -112,6 +113,7 @@ static int load_xrandr(void) LOAD_FUNCPTR(XRRFreeScreenResources); LOAD_FUNCPTR(XRRGetCrtcInfo); LOAD_FUNCPTR(XRRGetOutputInfo); + LOAD_FUNCPTR(XRRGetOutputProperty); LOAD_FUNCPTR(XRRGetScreenResources); LOAD_FUNCPTR(XRRGetScreenResourcesCurrent); LOAD_FUNCPTR(XRRGetScreenSizeRange); @@ -466,6 +468,25 @@ static void get_screen_size( XRRScreenResources *resources, unsigned int *width, } } +static void get_edid( RROutput output, unsigned char **prop, unsigned long *len ) +{ + int result; + Atom actual_type; + int actual_format; + unsigned long bytes_after; + + result = pXRRGetOutputProperty( gdi_display, output, x11drv_atom(EDID), 0, 128, FALSE, FALSE, + AnyPropertyType, &actual_type, &actual_format, len, + &bytes_after, prop ); + + if (result != Success) + { + WARN("Could not retrieve EDID property.\n"); + *prop = NULL; + *len = 0; + } +} + static void set_screen_size( int width, int height ) { int screen = default_visual.screen; @@ -1036,6 +1057,7 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * { lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW ); monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; + get_edid( adapter_id, &monitors[monitor_count].edid, &monitors[monitor_count].edid_len ); monitor_count = 1; } /* Active monitors, need to find other monitors with the same coordinates as mirrored */ @@ -1091,6 +1113,9 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * if (is_crtc_primary( primary_rect, crtc_info )) primary_index = monitor_count; + + get_edid( screen_resources->outputs[i], &monitors[monitor_count].edid, + &monitors[monitor_count].edid_len ); monitor_count++; } @@ -1137,8 +1162,11 @@ done: return ret; } -static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) +static void xrandr14_free_monitors( struct x11drv_monitor *monitors, int count ) { + int i; + for (i = 0; i < count; i++) + XFree( monitors[i].edid ); heap_free( monitors ); } -- 2.25.1

2 5

[PATCH v6] winex11.drv: Add 'EDID' registry key to every monitor device.
by Zhiyi Zhang 14 Sep '21

14 Sep '21

From: Eduard Permyakov <epermyakov(a)codeweavers.com> Extended display identification data (EDID) is a set of data that is provided by a display to describe its capabilities to a graphics adapter. EDID data allows a computer to detect the type of monitor that is connected to it. EDID data includes the manufacturer name, the product type, the timings that are supported by the display, the display size, as well as other display characteristics. EDID is defined by a standard published by the Video Electronics Standards Association (VESA). In Windows, every display device has an associated 'EDID' registry key containing this data. Applications can read and parse it to get the display capabilities. In Linux, we can get each monitor's EDID using the RANDR X extension. This patch fixes, for example, monitor detection in the UE-based game 'Industries of Titan'. Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v6: Supersede 213729. Fix some minor style issue. Check NULL before calling XFree() and fix some possible memory leaks. dlls/winex11.drv/desktop.c | 4 +++- dlls/winex11.drv/display.c | 15 +++++++++++--- dlls/winex11.drv/x11drv.h | 6 +++++- dlls/winex11.drv/x11drv_main.c | 1 + dlls/winex11.drv/xinerama.c | 4 +++- dlls/winex11.drv/xrandr.c | 38 +++++++++++++++++++++++++++++++++- 6 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index b517e44e150..71b3a0a5a27 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -265,6 +265,8 @@ static BOOL X11DRV_desktop_get_monitors( ULONG_PTR adapter_id, struct x11drv_mon SetRect( &monitor->rc_work, 0, 0, desktop_width, desktop_height ); query_desktop_work_area( &monitor->rc_work ); monitor->state_flags = DISPLAY_DEVICE_ATTACHED; + monitor->edid_len = 0; + monitor->edid = NULL; if (desktop_width && desktop_height) monitor->state_flags |= DISPLAY_DEVICE_ACTIVE; @@ -273,7 +275,7 @@ static BOOL X11DRV_desktop_get_monitors( ULONG_PTR adapter_id, struct x11drv_mon return TRUE; } -static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors ) +static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors, int count ) { heap_free( monitors ); } diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index b3ff213ae89..ca81f169f9f 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -109,6 +109,8 @@ static const WCHAR monitor_hardware_idW[] = { 'M','O','N','I','T','O','R','\\', 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static const WCHAR driver_date_fmtW[] = {'%','u','-','%','u','-','%','u',0}; +static const WCHAR edidW[] = {'E','D','I','D',0}; +static const WCHAR bad_edidW[] = {'B','A','D','_','E','D','I','D',0}; static struct x11drv_display_device_handler host_handler; struct x11drv_display_device_handler desktop_handler; @@ -257,7 +259,7 @@ RECT get_host_primary_monitor_rect(void) if (gpus) host_handler.free_gpus(gpus); if (adapters) host_handler.free_adapters(adapters); - if (monitors) host_handler.free_monitors(monitors); + if (monitors) host_handler.free_monitors(monitors, monitor_count); return rect; } @@ -611,6 +613,13 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo DEVPROP_TYPE_UINT32, (const BYTE *)&output_id, sizeof(output_id), 0)) goto done; + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, NULL, NULL); + if (monitor->edid) + RegSetValueExW(hkey, edidW, 0, REG_BINARY, monitor->edid, monitor->edid_len); + else + RegSetValueExW(hkey, bad_edidW, 0, REG_BINARY, NULL, 0); + RegCloseKey(hkey); + /* Create driver key */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); RegCloseKey(hkey); @@ -768,7 +777,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) goto done; } - handler->free_monitors(monitors); + handler->free_monitors(monitors, monitor_count); monitors = NULL; video_index++; } @@ -788,5 +797,5 @@ done: if (adapters) handler->free_adapters(adapters); if (monitors) - handler->free_monitors(monitors); + handler->free_monitors(monitors, monitor_count); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index afa06561aaa..5ed2fcf73fb 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -413,6 +413,7 @@ enum x11drv_atoms FIRST_XATOM = XA_LAST_PREDEFINED + 1, XATOM_CLIPBOARD = FIRST_XATOM, XATOM_COMPOUND_TEXT, + XATOM_EDID, XATOM_INCR, XATOM_MANAGER, XATOM_MULTIPLE, @@ -751,6 +752,9 @@ struct x11drv_monitor RECT rc_work; /* StateFlags in DISPLAY_DEVICE struct */ DWORD state_flags; + /* Extended Device Identification Data */ + unsigned long edid_len; + unsigned char *edid; }; /* Required functions for display device registry initialization */ @@ -786,7 +790,7 @@ struct x11drv_display_device_handler void (*free_adapters)(struct x11drv_adapter *adapters); /* free_monitors will be called to free a monitor list from get_monitors */ - void (*free_monitors)(struct x11drv_monitor *monitors); + void (*free_monitors)(struct x11drv_monitor *monitors, int count); /* register_event_handlers will be called to register event handlers. * This function pointer is optional and can be NULL when driver doesn't support it */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 2fac560556b..e8b273d055e 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -138,6 +138,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = { "CLIPBOARD", "COMPOUND_TEXT", + "EDID", "INCR", "MANAGER", "MULTIPLE", diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index c9863482534..0e1e07669c2 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -244,6 +244,8 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * monitor[index].rc_work = monitors[i].rcWork; /* Xinerama only reports monitors already attached */ monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; + monitor[index].edid_len = 0; + monitor[index].edid = NULL; if (!IsRectEmpty( &monitors[i].rcMonitor )) monitor[index].state_flags |= DISPLAY_DEVICE_ACTIVE; @@ -256,7 +258,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * return TRUE; } -static void xinerama_free_monitors( struct x11drv_monitor *monitors ) +static void xinerama_free_monitors( struct x11drv_monitor *monitors, int count ) { heap_free( monitors ); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index e7adcec0f2e..8faece9023a 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -68,6 +68,7 @@ MAKE_FUNCPTR(XRRFreeOutputInfo) MAKE_FUNCPTR(XRRFreeScreenResources) MAKE_FUNCPTR(XRRGetCrtcInfo) MAKE_FUNCPTR(XRRGetOutputInfo) +MAKE_FUNCPTR(XRRGetOutputProperty) MAKE_FUNCPTR(XRRGetScreenResources) MAKE_FUNCPTR(XRRGetScreenResourcesCurrent) MAKE_FUNCPTR(XRRGetScreenSizeRange) @@ -112,6 +113,7 @@ static int load_xrandr(void) LOAD_FUNCPTR(XRRFreeScreenResources); LOAD_FUNCPTR(XRRGetCrtcInfo); LOAD_FUNCPTR(XRRGetOutputInfo); + LOAD_FUNCPTR(XRRGetOutputProperty); LOAD_FUNCPTR(XRRGetScreenResources); LOAD_FUNCPTR(XRRGetScreenResourcesCurrent); LOAD_FUNCPTR(XRRGetScreenSizeRange); @@ -466,6 +468,24 @@ static void get_screen_size( XRRScreenResources *resources, unsigned int *width, } } +static void get_edid( RROutput output, unsigned char **prop, unsigned long *len ) +{ + int result, actual_format; + unsigned long bytes_after; + Atom actual_type; + + result = pXRRGetOutputProperty( gdi_display, output, x11drv_atom(EDID), 0, 128, FALSE, FALSE, + AnyPropertyType, &actual_type, &actual_format, len, + &bytes_after, prop ); + + if (result != Success) + { + WARN("Could not retrieve EDID property for output %#lx.\n", output); + *prop = NULL; + *len = 0; + } +} + static void set_screen_size( int width, int height ) { int screen = default_visual.screen; @@ -1036,6 +1056,7 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * { lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW ); monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; + get_edid( adapter_id, &monitors[monitor_count].edid, &monitors[monitor_count].edid_len ); monitor_count = 1; } /* Active monitors, need to find other monitors with the same coordinates as mirrored */ @@ -1091,6 +1112,9 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * if (is_crtc_primary( primary_rect, crtc_info )) primary_index = monitor_count; + + get_edid( screen_resources->outputs[i], &monitors[monitor_count].edid, + &monitors[monitor_count].edid_len ); monitor_count++; } @@ -1131,14 +1155,26 @@ done: pXRRFreeOutputInfo( enum_output_info ); if (!ret) { + for (i = 0; i < monitor_count; i++) + { + if (monitors[i].edid) + XFree( monitors[i].edid ); + } heap_free( monitors ); ERR("Failed to get monitors\n"); } return ret; } -static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) +static void xrandr14_free_monitors( struct x11drv_monitor *monitors, int count ) { + int i; + + for (i = 0; i < count; i++) + { + if (monitors[i].edid) + XFree( monitors[i].edid ); + } heap_free( monitors ); } -- 2.30.2

1 0

[PATCH v3] ntdll: Implement JobObjectBasicProcessIdList for NtQueryInformationJobObject.
by Gabriel Ivăncescu 14 Sep '21

14 Sep '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/tests/process.c | 9 --------- dlls/ntdll/unix/sync.c | 35 ++++++++++++++++++++++++++++++++--- server/process.c | 25 +++++++++++++++++++++++++ server/protocol.def | 1 + 4 files changed, 58 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b1b76a8..87873d4 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2700,15 +2700,11 @@ static void test_QueryInformationJobObject(void) pid_list->NumberOfProcessIdsInList = 42; ret = QueryInformationJobObject(job, JobObjectBasicProcessIdList, pid_list, FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[1]), &ret_len); - todo_wine ok(!ret, "QueryInformationJobObject expected failure\n"); - todo_wine expect_eq_d(ERROR_MORE_DATA, GetLastError()); if (ret) { - todo_wine expect_eq_d(42, pid_list->NumberOfAssignedProcesses); - todo_wine expect_eq_d(42, pid_list->NumberOfProcessIdsInList); } @@ -2723,17 +2719,12 @@ static void test_QueryInformationJobObject(void) { ULONG_PTR *list = pid_list->ProcessIdList; - todo_wine ok(ret_len == FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[2]), "QueryInformationJobObject returned ret_len=%u\n", ret_len); - todo_wine expect_eq_d(2, pid_list->NumberOfAssignedProcesses); - todo_wine expect_eq_d(2, pid_list->NumberOfProcessIdsInList); - todo_wine expect_eq_d(pi[0].dwProcessId, list[0]); - todo_wine expect_eq_d(pi[1].dwProcessId, list[1]); } } diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index a13e53a..476bc0b 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -791,11 +791,40 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c case JobObjectBasicProcessIdList: { JOBOBJECT_BASIC_PROCESS_ID_LIST *process = info; + DWORD count, i; if (len < sizeof(*process)) return STATUS_INFO_LENGTH_MISMATCH; - memset( process, 0, sizeof(*process) ); - if (ret_len) *ret_len = sizeof(*process); - return STATUS_SUCCESS; + + count = len - FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList); + count /= sizeof(process->ProcessIdList[0]); + + SERVER_START_REQ( get_job_info ) + { + req->handle = wine_server_user_handle(handle); + wine_server_set_reply(req, process->ProcessIdList, count * sizeof(process_id_t)); + if (!(ret = wine_server_call(req))) + { + process->NumberOfAssignedProcesses = reply->active_processes; + process->NumberOfProcessIdsInList = min(count, reply->active_processes); + } + } + SERVER_END_REQ; + + if (ret != STATUS_SUCCESS) return ret; + + if (sizeof(process_id_t) < sizeof(process->ProcessIdList[0])) + { + /* start from the end to not overwrite */ + for (i = process->NumberOfProcessIdsInList; i--;) + { + ULONG_PTR id = ((process_id_t *)(process->ProcessIdList))[i]; + process->ProcessIdList[i] = id; + } + } + + if (ret_len) + *ret_len = FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[process->NumberOfProcessIdsInList]); + return count < process->NumberOfAssignedProcesses ? STATUS_MORE_ENTRIES : STATUS_SUCCESS; } case JobObjectExtendedLimitInformation: { diff --git a/server/process.c b/server/process.c index 0870de5..8109fbe 100644 --- a/server/process.c +++ b/server/process.c @@ -286,6 +286,24 @@ static int process_in_job( struct job *job, struct process *process ) return process->job == job; } +static process_id_t *get_job_pids( struct job *job, process_id_t *pids, process_id_t *end ) +{ + struct process *process; + struct job *j; + + LIST_FOR_EACH_ENTRY( j, &job->child_job_list, struct job, parent_job_entry ) + pids = get_job_pids( j, pids, end ); + + LIST_FOR_EACH_ENTRY( process, &job->process_list, struct process, job_entry ) + { + if (pids == end) break; + if (process->end_time) continue; /* skip processes that ended */ + *pids++ = process->id; + } + + return pids; +} + static void add_job_process( struct job *job, struct process *process ) { struct job *j, *common_parent; @@ -1745,11 +1763,18 @@ DECL_HANDLER(process_in_job) DECL_HANDLER(get_job_info) { struct job *job = get_job_obj( current->process, req->handle, JOB_OBJECT_QUERY ); + process_id_t *pids; + data_size_t len; if (!job) return; reply->total_processes = job->total_processes; reply->active_processes = job->num_processes; + + len = min( get_reply_max_size(), reply->active_processes * sizeof(*pids) ); + if (len && ((pids = set_reply_data_size( len )))) + get_job_pids( job, pids, pids + len / sizeof(*pids) ); + release_object( job ); } diff --git a/server/protocol.def b/server/protocol.def index 02c1f26..92bee43 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3696,6 +3696,7 @@ struct handle_info @REPLY int total_processes; /* total count of processes */ int active_processes; /* count of running processes */ + VARARG(pids,uints); /* list of active pids */ @END -- 2.31.1

2 1

[PATCH] avicap32: Use the correct return type for get_device_desc().
by Zhiyi Zhang 14 Sep '21

14 Sep '21

get_device_desc() should return a NTSTATUS instead of a BOOL. Fix a regression that video capture devices cannot be opened because of the changes in abb1757. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/avicap32/v4l.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avicap32/v4l.c b/dlls/avicap32/v4l.c index ab2694ae041..0b004e17e58 100644 --- a/dlls/avicap32/v4l.c +++ b/dlls/avicap32/v4l.c @@ -119,14 +119,14 @@ static NTSTATUS get_device_desc(void *args) v4l_umbstowcs(version, ret, params->version, ARRAY_SIZE(params->version)); } close(fd); - return is_capture_device; + return is_capture_device ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; } /* errno 515 is used by some webcam drivers for unknown IOCTL commands. */ ERR("Failed to get capabilities for %s: %s\n", device, strerror(errno)); close(fd); - return FALSE; + return STATUS_UNSUCCESSFUL; } const unixlib_entry_t __wine_unix_call_funcs[] = -- 2.30.2

1 0

[PATCH v3 1/3] msvcrt: Improve memset performance using overlapping stores.
by Rémi Bernon 14 Sep '21

14 Sep '21

For n larger than 16 we store 16 bytes on each end of the buffer, eventually overlapping, and then 16 additional bytes for n > 32. Then we can find a 32-byte aligned range overlapping the remaining part of the destination buffer, which is filled 32 bytes at a time in a loop. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/msvcrt/string.c | 59 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 4d09405094d..da7e9612345 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2855,13 +2855,66 @@ void * __cdecl memcpy(void *dst, const void *src, size_t n) return memmove(dst, src, n); } +static void *__cdecl memset_aligned_32(unsigned char *d, uint64_t v, size_t n, void *ret) +{ + while (n >= 32) + { + *(uint64_t *)(d + n - 32) = v; + *(uint64_t *)(d + n - 24) = v; + *(uint64_t *)(d + n - 16) = v; + *(uint64_t *)(d + n - 8) = v; + n -= 32; + } + return ret; +} + /********************************************************************* * memset (MSVCRT.@) */ -void* __cdecl memset(void *dst, int c, size_t n) +void *__cdecl memset(void *dst, int c, size_t n) { - volatile unsigned char *d = dst; /* avoid gcc optimizations */ - while (n--) *d++ = c; + uint64_t v = 0x101010101010101ull * (unsigned char)c; + unsigned char *d = (unsigned char *)dst; + size_t a = 0x20 - ((uintptr_t)d & 0x1f); + + 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; + 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; + if (n <= 64) return dst; + n = (n - a) & ~0x1f; + return memset_aligned_32(d + a, v, n, dst); + } + if (n >= 8) + { + *(uint64_t *)d = v; + *(uint64_t *)(d + n - 8) = v; + return dst; + } + if (n >= 4) + { + *(uint32_t *)d = v; + *(uint32_t *)(d + n - 4) = v; + return dst; + } + if (n >= 2) + { + *(uint16_t *)d = v; + *(uint16_t *)(d + n - 2) = v; + return dst; + } + if (n >= 1) + { + *(uint8_t *)d = v; + return dst; + } return dst; } -- 2.33.0

1 2

[PATCH v2 1/3] msvcrt: Improve memset performance using overlapping stores.
by Rémi Bernon 14 Sep '21

14 Sep '21

For n larger than 16 we store 16 bytes on each end of the buffer, eventually overlapping, and then 16 additional bytes for n > 32. Then we can find a 32-byte aligned range overlapping the remaining part of the destination buffer, which is filled 32 bytes at a time in a loop. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/msvcrt/string.c | 60 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 4d09405094d..b470a875607 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2855,13 +2855,65 @@ void * __cdecl memcpy(void *dst, const void *src, size_t n) return memmove(dst, src, n); } +static void memset_aligned_32(unsigned char *d, uint64_t v, size_t n) +{ + while (n >= 32) + { + *(uint64_t *)(d + n - 32) = v; + *(uint64_t *)(d + n - 24) = v; + *(uint64_t *)(d + n - 16) = v; + *(uint64_t *)(d + n - 8) = v; + n -= 32; + } +} + /********************************************************************* * memset (MSVCRT.@) */ -void* __cdecl memset(void *dst, int c, size_t n) -{ - volatile unsigned char *d = dst; /* avoid gcc optimizations */ - while (n--) *d++ = c; +void *__cdecl memset(void *dst, int c, size_t n) +{ + uint64_t v = 0x101010101010101ull * (unsigned char)c; + unsigned char *d = (unsigned char *)dst; + size_t a = 0x20 - ((uintptr_t)d & 0x1f); + + 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; + 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; + if (n <= 64) return dst; + memset_aligned_32(d + a, v, (n - a) & ~0x1f); + return dst; + } + if (n >= 8) + { + *(uint64_t *)d = v; + *(uint64_t *)(d + n - 8) = v; + return dst; + } + if (n >= 4) + { + *(uint32_t *)d = v; + *(uint32_t *)(d + n - 4) = v; + return dst; + } + if (n >= 2) + { + *(uint16_t *)d = v; + *(uint16_t *)(d + n - 2) = v; + return dst; + } + if (n >= 1) + { + *(uint8_t *)d = v; + return dst; + } return dst; } -- 2.33.0

3 9

[PATCH v2 1/5] wbemprox: Copy correct substring to *namespace in parse_resource().
by Paul Gofman 14 Sep '21

14 Sep '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/wbemprox/wbemlocator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 5e86f2be86d..161d9845ca9 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -139,7 +139,7 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na if (!(*namespace = heap_alloc( (len + 1) * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; else { - memcpy( *namespace, p, len * sizeof(WCHAR) ); + memcpy( *namespace, q, len * sizeof(WCHAR) ); (*namespace)[len] = 0; hr = S_OK; } -- 2.31.1

2 9

[PATCH 1/8] ole32: Simplify GetDisplayName() for class moniker.
by Nikolay Sivov 14 Sep '21

14 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/classmoniker.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 662baa3cd39..8149b8e2edc 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -510,37 +510,30 @@ static HRESULT WINAPI ClassMoniker_RelativePathTo(IMoniker* iface,IMoniker* pmOt return MK_E_NOTBINDABLE; } -/****************************************************************************** - * ClassMoniker_GetDisplayName - ******************************************************************************/ -static HRESULT WINAPI ClassMoniker_GetDisplayName(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - LPOLESTR *ppszDisplayName) +static HRESULT WINAPI ClassMoniker_GetDisplayName(IMoniker *iface, + IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR *name) { - ClassMoniker *This = impl_from_IMoniker(iface); - static const WCHAR wszClsidPrefix[] = L"clsid:"; + ClassMoniker *moniker = impl_from_IMoniker(iface); + static const int name_len = CHARS_IN_GUID + 5 /* prefix */; + const GUID *guid = &moniker->clsid; - TRACE("(%p, %p, %p)\n", pbc, pmkToLeft, ppszDisplayName); + TRACE("%p, %p, %p, %p.\n", iface, pbc, pmkToLeft, name); - if (!ppszDisplayName) + if (!name) return E_POINTER; if (pmkToLeft) return E_INVALIDARG; - *ppszDisplayName = CoTaskMemAlloc(sizeof(wszClsidPrefix) + (CHARS_IN_GUID-2) * sizeof(WCHAR)); - - StringFromGUID2(&This->clsid, *ppszDisplayName+ARRAY_SIZE(wszClsidPrefix)-2, CHARS_IN_GUID); + if (!(*name = CoTaskMemAlloc(name_len * sizeof(WCHAR)))) + return E_OUTOFMEMORY; - /* note: this overwrites the opening curly bracket of the CLSID string generated above */ - memcpy(*ppszDisplayName, wszClsidPrefix, sizeof(wszClsidPrefix)-sizeof(WCHAR)); + swprintf(*name, name_len, L"clsid:%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X:", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], + guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); - /* note: this overwrites the closing curly bracket of the CLSID string generated above */ - (*ppszDisplayName)[ARRAY_SIZE(wszClsidPrefix)-2+CHARS_IN_GUID-2] = ':'; - (*ppszDisplayName)[ARRAY_SIZE(wszClsidPrefix)-2+CHARS_IN_GUID-1] = '\0'; + TRACE("Returning %s\n", debugstr_w(*name)); - TRACE("string is %s\n", debugstr_w(*ppszDisplayName)); return S_OK; } -- 2.33.0

1 7

[PATCH 1/6] dinput8/tests: Control expected READ_REPORT reports from the test executable.
by Rémi Bernon 14 Sep '21

14 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput8/tests/driver_hid.c | 125 ++++++++++++++++++++++++++------ dlls/dinput8/tests/driver_hid.h | 1 + dlls/dinput8/tests/hid.c | 50 +++++++++++++ 3 files changed, 155 insertions(+), 21 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index 91f420d7bf6..cbaa1e89959 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -199,11 +199,97 @@ static void irp_queue_init( struct irp_queue *queue ) InitializeListHead( &queue->list ); } +struct input_queue +{ + KSPIN_LOCK lock; + struct hid_expect *pos; + struct hid_expect *end; + struct hid_expect *buffer; + struct irp_queue pending; +}; + +static void input_queue_init( struct input_queue *queue ) +{ + KeInitializeSpinLock( &queue->lock ); + queue->buffer = ExAllocatePool( PagedPool, EXPECT_QUEUE_BUFFER_SIZE ); + RtlSecureZeroMemory( queue->buffer, EXPECT_QUEUE_BUFFER_SIZE ); + queue->pos = queue->buffer; + queue->end = queue->buffer; + irp_queue_init( &queue->pending ); +} + +static void input_queue_cleanup( struct input_queue *queue ) +{ + ExFreePool( queue->buffer ); +} + +static BOOL input_queue_read_locked( struct input_queue *queue, IRP *irp ) +{ + struct hid_expect *tmp = queue->pos; + if (tmp >= queue->end) return FALSE; + + memcpy( irp->UserBuffer, tmp->report_buf, tmp->ret_length ); + irp->IoStatus.Information = tmp->ret_length; + irp->IoStatus.Status = tmp->ret_status; + if (tmp < queue->end) queue->pos = tmp + 1; + + /* loop on the queue data in polled mode */ + if (polled && queue->pos == queue->end) queue->pos = queue->buffer; + return TRUE; +} + +static NTSTATUS input_queue_read( struct input_queue *queue, IRP *irp ) +{ + NTSTATUS status; + KIRQL irql; + + KeAcquireSpinLock( &queue->lock, &irql ); + if (input_queue_read_locked( queue, irp )) status = STATUS_SUCCESS; + else + { + IoMarkIrpPending( irp ); + irp_queue_push( &queue->pending, irp ); + status = STATUS_PENDING; + } + KeReleaseSpinLock( &queue->lock, irql ); + + return status; +} + +static void input_queue_reset( struct input_queue *queue, void *in_buf, ULONG in_size ) +{ + struct irp_queue completed; + ULONG remaining; + KIRQL irql; + IRP *irp; + + irp_queue_init( &completed ); + + KeAcquireSpinLock( &queue->lock, &irql ); + remaining = queue->end - queue->pos; + queue->pos = queue->buffer; + queue->end = queue->buffer; + memcpy( queue->end, in_buf, in_size ); + queue->end += in_size / sizeof(struct hid_expect); + + while (!polled && queue->pos < queue->end && (irp = irp_queue_pop( &queue->pending ))) + { + input_queue_read_locked( queue, irp ); + irp_queue_push( &completed, irp ); + } + KeReleaseSpinLock( &queue->lock, irql ); + + if (!polled) ok( !remaining, "unread input\n" ); + + while ((irp = irp_queue_pop( &completed ))) IoCompleteRequest( irp, IO_NO_INCREMENT ); +} + +static struct input_queue input_queue; + struct hid_device { BOOL removed; KSPIN_LOCK lock; - struct irp_queue irp_queue; }; static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) @@ -221,7 +307,6 @@ static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) ++got_start_device; impl->removed = FALSE; KeInitializeSpinLock( &impl->lock ); - irp_queue_init( &impl->irp_queue ); IoSetDeviceInterfaceState( &control_symlink, TRUE ); irp->IoStatus.Status = STATUS_SUCCESS; break; @@ -231,7 +316,7 @@ static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) KeAcquireSpinLock( &impl->lock, &irql ); impl->removed = TRUE; KeReleaseSpinLock( &impl->lock, irql ); - irp_queue_clear( &impl->irp_queue ); + irp_queue_clear( &input_queue.pending ); irp->IoStatus.Status = STATUS_SUCCESS; break; @@ -247,7 +332,7 @@ static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) break; case IRP_MN_REMOVE_DEVICE: - irp_queue_clear( &impl->irp_queue ); + irp_queue_clear( &input_queue.pending ); IoSetDeviceInterfaceState( &control_symlink, FALSE ); irp->IoStatus.Status = STATUS_SUCCESS; break; @@ -275,10 +360,9 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) HID_DEVICE_EXTENSION *ext = device->DeviceExtension; struct hid_device *impl = ext->MiniDeviceExtension; const ULONG in_size = stack->Parameters.DeviceIoControl.InputBufferLength; - const ULONG out_size = stack->Parameters.DeviceIoControl.OutputBufferLength; + ULONG out_size = stack->Parameters.DeviceIoControl.OutputBufferLength; const ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; struct hid_expect expect = {0}; - static BYTE seq = 0; NTSTATUS ret; BOOL removed; KIRQL irql; @@ -358,21 +442,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ULONG expected_size = caps.InputReportByteLength - (report_id ? 0 : 1); ok( !in_size, "got input size %u\n", in_size ); ok( out_size == expected_size, "got output size %u\n", out_size ); - - if (polled) - { - memset( irp->UserBuffer, 0xa5, expected_size ); - if (report_id) ((char *)irp->UserBuffer)[0] = report_id; - ((char *)irp->UserBuffer)[1] = seq++; - irp->IoStatus.Information = 3; - ret = STATUS_SUCCESS; - } - else - { - IoMarkIrpPending( irp ); - irp_queue_push( &impl->irp_queue, irp ); - ret = STATUS_PENDING; - } + ret = input_queue_read( &input_queue, irp ); break; } @@ -535,6 +605,11 @@ static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp ) irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest( irp, IO_NO_INCREMENT ); return STATUS_SUCCESS; + case IOCTL_WINETEST_HID_SEND_INPUT: + input_queue_reset( &input_queue, irp->AssociatedIrp.SystemBuffer, in_size ); + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_SUCCESS; } return hidclass_driver_ioctl( device, irp ); @@ -577,6 +652,7 @@ static NTSTATUS WINAPI driver_close( DEVICE_OBJECT *device, IRP *irp ) static void WINAPI driver_unload( DRIVER_OBJECT *driver ) { + input_queue_cleanup( &input_queue ); expect_queue_cleanup( &expect_queue ); winetest_cleanup(); } @@ -647,6 +723,13 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *registry ) ok( !ret, "ZwQueryValueKey returned %#x\n", ret ); expect_queue_reset( &expect_queue, buffer + info_size, size - info_size ); + input_queue_init( &input_queue ); + RtlInitUnicodeString( &name_str, L"Input" ); + size = info_size + EXPECT_QUEUE_BUFFER_SIZE; + ret = ZwQueryValueKey( hkey, &name_str, KeyValuePartialInformation, buffer, size, &size ); + ok( !ret, "ZwQueryValueKey returned %#x\n", ret ); + input_queue_reset( &input_queue, buffer + info_size, size - info_size ); + driver->DriverExtension->AddDevice = driver_add_device; driver->DriverUnload = driver_unload; driver->MajorFunction[IRP_MJ_PNP] = driver_pnp; diff --git a/dlls/dinput8/tests/driver_hid.h b/dlls/dinput8/tests/driver_hid.h index c9c75c6d081..538d6205ab9 100644 --- a/dlls/dinput8/tests/driver_hid.h +++ b/dlls/dinput8/tests/driver_hid.h @@ -40,6 +40,7 @@ DEFINE_GUID(control_class,0xdeadbeef,0x29ef,0x4538,0xa5,0xfd,0xb6,0x95,0x73,0xa3,0x62,0xc0); #define IOCTL_WINETEST_HID_SET_EXPECT CTL_CODE(FILE_DEVICE_KEYBOARD, 0x800, METHOD_IN_DIRECT, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_HID_SEND_INPUT CTL_CODE(FILE_DEVICE_KEYBOARD, 0x801, METHOD_IN_DIRECT, FILE_ANY_ACCESS) struct hid_expect { diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 85ccc2a05df..0623ad9ae50 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -743,6 +743,25 @@ static void set_hid_expect_( int line, HANDLE file, struct hid_expect *expect, D ok( ret, "IOCTL_WINETEST_HID_SET_EXPECT failed, last error %u\n", GetLastError() ); } +#define send_hid_input( a, b, c ) send_hid_input_( __LINE__, a, b, c ) +static void send_hid_input_( int line, HANDLE file, struct hid_expect *expect, DWORD expect_size ) +{ + const char *source_file; + BOOL ret; + int i; + + source_file = strrchr( __FILE__, '/' ); + if (!source_file) source_file = strrchr( __FILE__, '\\' ); + if (!source_file) source_file = __FILE__; + else source_file++; + + for (i = 0; i < expect_size / sizeof(struct hid_expect); ++i) + snprintf( expect[i].context, ARRAY_SIZE(expect[i].context), "%s:%d", source_file, line ); + + ret = sync_ioctl( file, IOCTL_WINETEST_HID_SEND_INPUT, expect, expect_size, NULL, 0 ); + ok( ret, "IOCTL_WINETEST_HID_SEND_INPUT failed, last error %u\n", GetLastError() ); +} + static void test_hidp_get_input( HANDLE file, int report_id, ULONG report_len, PHIDP_PREPARSED_DATA preparsed ) { struct hid_expect expect[] = @@ -2049,6 +2068,26 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle if (polled) { + struct hid_expect expect[] = + { + { + .code = IOCTL_HID_READ_REPORT, + .report_len = caps.InputReportByteLength - (report_id ? 0 : 1), + .report_buf = {report_id ? report_id : 0x5a,0x5a,0}, + .ret_length = 3, + .ret_status = STATUS_SUCCESS, + }, + { + .code = IOCTL_HID_READ_REPORT, + .report_len = caps.InputReportByteLength - (report_id ? 0 : 1), + .report_buf = {report_id ? report_id : 0x5a,0x5a,1}, + .ret_length = 3, + .ret_status = STATUS_SUCCESS, + }, + }; + + send_hid_input( file, expect, sizeof(expect) ); + memset( report, 0xcd, sizeof(report) ); SetLastError( 0xdeadbeef ); ret = ReadFile( file, report, caps.InputReportByteLength, &value, NULL ); @@ -2541,6 +2580,14 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) .NumberFeatureValueCaps = 6, .NumberFeatureDataIndices = 8, }; + const struct hid_expect expect_in = + { + .code = IOCTL_HID_READ_REPORT, + .report_len = caps.InputReportByteLength - (report_id ? 0 : 1), + .report_buf = {report_id ? report_id : 0x5a,0x5a,0x5a}, + .ret_length = 3, + .ret_status = STATUS_SUCCESS, + }; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; LSTATUS status; @@ -2572,6 +2619,9 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) status = RegSetValueExW( hkey, L"Expect", 0, REG_BINARY, NULL, 0 ); ok( !status, "RegSetValueExW returned %#x\n", status ); + status = RegSetValueExW( hkey, L"Input", 0, REG_BINARY, (void *)&expect_in, polled ? sizeof(expect_in) : 0 ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + if (pnp_driver_start( L"driver_hid.dll" )) test_hid_device( report_id, polled, &caps ); pnp_driver_stop(); -- 2.33.0

1 5

[PATCH 1/4] winebus.sys: Split destroy to a separate stop method.
by Rémi Bernon 14 Sep '21

14 Sep '21

So we can stop the device when it's removed from the ntoskrnl.exe device list, and then destroy it only when it's not referenced anymore. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_iohid.c | 8 +++++ dlls/winebus.sys/bus_sdl.c | 16 +++++---- dlls/winebus.sys/bus_udev.c | 64 +++++++++++++++++++-------------- dlls/winebus.sys/unix_private.h | 1 + dlls/winebus.sys/unixlib.c | 19 +++++++--- 5 files changed, 72 insertions(+), 36 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 18e318f7789..d362906637a 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -167,6 +167,13 @@ static NTSTATUS iohid_device_start(struct unix_device *iface, DEVICE_OBJECT *dev return STATUS_SUCCESS; } +static void iohid_device_stop(struct unix_device *iface) +{ + struct platform_private *private = impl_from_unix_device(iface); + + IOHIDDeviceRegisterInputReportCallback(private->device, NULL, 0, NULL, NULL); +} + static NTSTATUS iohid_device_get_report_descriptor(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *out_length) { @@ -246,6 +253,7 @@ static const struct unix_device_vtbl iohid_device_vtbl = iohid_device_destroy, iohid_device_compare, iohid_device_start, + iohid_device_stop, iohid_device_get_report_descriptor, iohid_device_set_output_report, iohid_device_get_feature_report, diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 8d6df3e1f13..73562fec14f 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -482,12 +482,6 @@ static void sdl_device_destroy(struct unix_device *iface) { struct platform_private *ext = impl_from_unix_device(iface); - pSDL_JoystickClose(ext->sdl_joystick); - if (ext->sdl_controller) - pSDL_GameControllerClose(ext->sdl_controller); - if (ext->sdl_haptic) - pSDL_HapticClose(ext->sdl_haptic); - HeapFree(GetProcessHeap(), 0, ext); } @@ -503,6 +497,15 @@ static NTSTATUS sdl_device_start(struct unix_device *iface, DEVICE_OBJECT *devic return build_report_descriptor(ext); } +static void sdl_device_stop(struct unix_device *iface) +{ + struct platform_private *private = impl_from_unix_device(iface); + + pSDL_JoystickClose(private->sdl_joystick); + if (private->sdl_controller) pSDL_GameControllerClose(private->sdl_controller); + if (private->sdl_haptic) pSDL_HapticClose(private->sdl_haptic); +} + static NTSTATUS sdl_device_get_reportdescriptor(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *out_length) { @@ -579,6 +582,7 @@ static const struct unix_device_vtbl sdl_device_vtbl = sdl_device_destroy, sdl_device_compare, sdl_device_start, + sdl_device_stop, sdl_device_get_reportdescriptor, sdl_device_set_output_report, sdl_device_get_feature_report, diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 3010e50ce98..25a408489a4 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -558,19 +558,6 @@ static void hidraw_device_destroy(struct unix_device *iface) { struct platform_private *private = impl_from_unix_device(iface); - EnterCriticalSection(&udev_cs); - list_remove(&private->unix_device.entry); - LeaveCriticalSection(&udev_cs); - - if (private->report_thread) - { - write(private->control_pipe[1], "q", 1); - WaitForSingleObject(private->report_thread, INFINITE); - close(private->control_pipe[0]); - close(private->control_pipe[1]); - CloseHandle(private->report_thread); - } - close(private->device_fd); udev_device_unref(private->udev_device); @@ -608,6 +595,24 @@ static NTSTATUS hidraw_device_start(struct unix_device *iface, DEVICE_OBJECT *de return STATUS_SUCCESS; } +static void hidraw_device_stop(struct unix_device *iface) +{ + struct platform_private *private = impl_from_unix_device(iface); + + EnterCriticalSection(&udev_cs); + list_remove(&private->unix_device.entry); + LeaveCriticalSection(&udev_cs); + + if (private->report_thread) + { + write(private->control_pipe[1], "q", 1); + WaitForSingleObject(private->report_thread, INFINITE); + close(private->control_pipe[0]); + close(private->control_pipe[1]); + CloseHandle(private->report_thread); + } +} + static NTSTATUS hidraw_device_get_report_descriptor(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *out_length) { @@ -780,6 +785,7 @@ static const struct unix_device_vtbl hidraw_device_vtbl = hidraw_device_destroy, udev_device_compare, hidraw_device_start, + hidraw_device_stop, hidraw_device_get_report_descriptor, hidraw_device_set_output_report, hidraw_device_get_feature_report, @@ -802,19 +808,6 @@ static void lnxev_device_destroy(struct unix_device *iface) { struct wine_input_private *ext = input_impl_from_unix_device(iface); - EnterCriticalSection(&udev_cs); - list_remove(&ext->base.unix_device.entry); - LeaveCriticalSection(&udev_cs); - - if (ext->base.report_thread) - { - write(ext->base.control_pipe[1], "q", 1); - WaitForSingleObject(ext->base.report_thread, INFINITE); - close(ext->base.control_pipe[0]); - close(ext->base.control_pipe[1]); - CloseHandle(ext->base.report_thread); - } - HeapFree(GetProcessHeap(), 0, ext->current_report_buffer); HeapFree(GetProcessHeap(), 0, ext->last_report_buffer); hid_descriptor_free(&ext->desc); @@ -853,6 +846,24 @@ static NTSTATUS lnxev_device_start(struct unix_device *iface, DEVICE_OBJECT *dev return STATUS_SUCCESS; } +static void lnxev_device_stop(struct unix_device *iface) +{ + struct wine_input_private *ext = input_impl_from_unix_device(iface); + + EnterCriticalSection(&udev_cs); + list_remove(&ext->base.unix_device.entry); + LeaveCriticalSection(&udev_cs); + + if (ext->base.report_thread) + { + write(ext->base.control_pipe[1], "q", 1); + WaitForSingleObject(ext->base.report_thread, INFINITE); + close(ext->base.control_pipe[0]); + close(ext->base.control_pipe[1]); + CloseHandle(ext->base.report_thread); + } +} + static NTSTATUS lnxev_device_get_report_descriptor(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *out_length) { @@ -920,6 +931,7 @@ static const struct unix_device_vtbl lnxev_device_vtbl = lnxev_device_destroy, udev_device_compare, lnxev_device_start, + lnxev_device_stop, lnxev_device_get_report_descriptor, lnxev_device_set_output_report, lnxev_device_get_feature_report, diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 767c9335114..2a878cdb583 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -34,6 +34,7 @@ struct unix_device_vtbl void (*destroy)(struct unix_device *iface); int (*compare)(struct unix_device *iface, void *platform_dev); NTSTATUS (*start)(struct unix_device *iface, DEVICE_OBJECT *device); + void (*stop)(struct unix_device *iface); NTSTATUS (*get_report_descriptor)(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *out_length); void (*set_output_report)(struct unix_device *iface, HID_XFER_PACKET *packet, IO_STATUS_BLOCK *io); void (*get_feature_report)(struct unix_device *iface, HID_XFER_PACKET *packet, IO_STATUS_BLOCK *io); diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 67efb794e4f..2407a2af468 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); static struct hid_descriptor mouse_desc; static struct hid_descriptor keyboard_desc; -static void mouse_remove(struct unix_device *iface) +static void mouse_destroy(struct unix_device *iface) { } @@ -58,6 +58,10 @@ static NTSTATUS mouse_start(struct unix_device *iface, DEVICE_OBJECT *device) return STATUS_SUCCESS; } +static void mouse_stop(struct unix_device *iface) +{ +} + static NTSTATUS mouse_get_report_descriptor(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *ret_length) { TRACE("buffer %p, length %u.\n", buffer, length); @@ -92,9 +96,10 @@ static void mouse_set_feature_report(struct unix_device *iface, HID_XFER_PACKET static const struct unix_device_vtbl mouse_vtbl = { - mouse_remove, + mouse_destroy, mouse_compare, mouse_start, + mouse_stop, mouse_get_report_descriptor, mouse_set_output_report, mouse_get_feature_report, @@ -120,7 +125,7 @@ static NTSTATUS mouse_device_create(void *args) return STATUS_SUCCESS; } -static void keyboard_remove(struct unix_device *iface) +static void keyboard_destroy(struct unix_device *iface) { } @@ -141,6 +146,10 @@ static NTSTATUS keyboard_start(struct unix_device *iface, DEVICE_OBJECT *device) return STATUS_SUCCESS; } +static void keyboard_stop(struct unix_device *iface) +{ +} + static NTSTATUS keyboard_get_report_descriptor(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *ret_length) { TRACE("buffer %p, length %u.\n", buffer, length); @@ -175,9 +184,10 @@ static void keyboard_set_feature_report(struct unix_device *iface, HID_XFER_PACK static const struct unix_device_vtbl keyboard_vtbl = { - keyboard_remove, + keyboard_destroy, keyboard_compare, keyboard_start, + keyboard_stop, keyboard_get_report_descriptor, keyboard_set_output_report, keyboard_get_feature_report, @@ -206,6 +216,7 @@ static NTSTATUS keyboard_device_create(void *args) static NTSTATUS unix_device_remove(void *args) { struct unix_device *iface = args; + iface->vtbl->stop(iface); iface->vtbl->destroy(iface); return STATUS_SUCCESS; } -- 2.33.0

1 3

[PATCH v2] ntdll: Implement JobObjectBasicProcessIdList for NtQueryInformationJobObject.
by Gabriel Ivăncescu 14 Sep '21

14 Sep '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/tests/process.c | 9 --------- dlls/ntdll/unix/sync.c | 35 ++++++++++++++++++++++++++++++++--- server/process.c | 25 +++++++++++++++++++++++++ server/protocol.def | 1 + 4 files changed, 58 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b1b76a8..87873d4 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2700,15 +2700,11 @@ static void test_QueryInformationJobObject(void) pid_list->NumberOfProcessIdsInList = 42; ret = QueryInformationJobObject(job, JobObjectBasicProcessIdList, pid_list, FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[1]), &ret_len); - todo_wine ok(!ret, "QueryInformationJobObject expected failure\n"); - todo_wine expect_eq_d(ERROR_MORE_DATA, GetLastError()); if (ret) { - todo_wine expect_eq_d(42, pid_list->NumberOfAssignedProcesses); - todo_wine expect_eq_d(42, pid_list->NumberOfProcessIdsInList); } @@ -2723,17 +2719,12 @@ static void test_QueryInformationJobObject(void) { ULONG_PTR *list = pid_list->ProcessIdList; - todo_wine ok(ret_len == FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[2]), "QueryInformationJobObject returned ret_len=%u\n", ret_len); - todo_wine expect_eq_d(2, pid_list->NumberOfAssignedProcesses); - todo_wine expect_eq_d(2, pid_list->NumberOfProcessIdsInList); - todo_wine expect_eq_d(pi[0].dwProcessId, list[0]); - todo_wine expect_eq_d(pi[1].dwProcessId, list[1]); } } diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index a13e53a..28f7083 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -791,11 +791,40 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c case JobObjectBasicProcessIdList: { JOBOBJECT_BASIC_PROCESS_ID_LIST *process = info; + DWORD count, i; if (len < sizeof(*process)) return STATUS_INFO_LENGTH_MISMATCH; - memset( process, 0, sizeof(*process) ); - if (ret_len) *ret_len = sizeof(*process); - return STATUS_SUCCESS; + + count = len - FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList); + count /= sizeof(process->ProcessIdList[0]); + + SERVER_START_REQ( get_job_info ) + { + req->handle = wine_server_user_handle(handle); + wine_server_set_reply(req, process->ProcessIdList, count * sizeof(process_id_t)); + if (!(ret = wine_server_call(req))) + { + process->NumberOfAssignedProcesses = reply->active_processes; + process->NumberOfProcessIdsInList = min(count, reply->active_processes); + } + } + SERVER_END_REQ; + + if (ret != STATUS_SUCCESS) return ret; + + if (sizeof(process_id_t) < sizeof(process->ProcessIdList[0])) + { + /* start from the end to not overwrite */ + for (i = process->NumberOfProcessIdsInList; i--;) + { + ULONG_PTR id = ((process_id_t *)(process->ProcessIdList))[i]; + process->ProcessIdList[i] = id; + } + } + + if (ret_len) + *ret_len = (char*)(&process->ProcessIdList[process->NumberOfProcessIdsInList]) - (char*)process; + return count < process->NumberOfAssignedProcesses ? STATUS_MORE_ENTRIES : STATUS_SUCCESS; } case JobObjectExtendedLimitInformation: { diff --git a/server/process.c b/server/process.c index 0870de5..8109fbe 100644 --- a/server/process.c +++ b/server/process.c @@ -286,6 +286,24 @@ static int process_in_job( struct job *job, struct process *process ) return process->job == job; } +static process_id_t *get_job_pids( struct job *job, process_id_t *pids, process_id_t *end ) +{ + struct process *process; + struct job *j; + + LIST_FOR_EACH_ENTRY( j, &job->child_job_list, struct job, parent_job_entry ) + pids = get_job_pids( j, pids, end ); + + LIST_FOR_EACH_ENTRY( process, &job->process_list, struct process, job_entry ) + { + if (pids == end) break; + if (process->end_time) continue; /* skip processes that ended */ + *pids++ = process->id; + } + + return pids; +} + static void add_job_process( struct job *job, struct process *process ) { struct job *j, *common_parent; @@ -1745,11 +1763,18 @@ DECL_HANDLER(process_in_job) DECL_HANDLER(get_job_info) { struct job *job = get_job_obj( current->process, req->handle, JOB_OBJECT_QUERY ); + process_id_t *pids; + data_size_t len; if (!job) return; reply->total_processes = job->total_processes; reply->active_processes = job->num_processes; + + len = min( get_reply_max_size(), reply->active_processes * sizeof(*pids) ); + if (len && ((pids = set_reply_data_size( len )))) + get_job_pids( job, pids, pids + len / sizeof(*pids) ); + release_object( job ); } diff --git a/server/protocol.def b/server/protocol.def index 133d6ad..15811db 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3692,6 +3692,7 @@ struct handle_info @REPLY int total_processes; /* total count of processes */ int active_processes; /* count of running processes */ + VARARG(pids,uints); /* list of active pids */ @END -- 2.31.1

2 1

[PATCH 1/6] server: Pass the async result size as part of apc_call_t.
by Zebediah Figura 14 Sep '21

14 Sep '21

Only really an optimization (plus it makes the code a little conceptually simpler). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/unix/file.c | 1 - dlls/ntdll/unix/server.c | 2 +- dlls/ntdll/unix/socket.c | 15 ++++----------- server/async.c | 9 ++++----- server/protocol.def | 2 +- server/trace.c | 2 +- 6 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 712f94ec43f..5da9ca560f6 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4690,7 +4690,6 @@ static NTSTATUS irp_completion( void *user, ULONG_PTR *info, NTSTATUS status ) req->user_arg = wine_server_client_ptr( async ); wine_server_set_reply( req, async->buffer, async->size ); status = virtual_locked_server_call( req ); - *info = reply->size; } SERVER_END_REQ; } diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 986eb6c3250..d0cfd4cd46c 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -378,7 +378,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO case APC_ASYNC_IO: { struct async_fileio *user = wine_server_get_ptr( call->async_io.user ); - ULONG_PTR info = 0; + ULONG_PTR info = call->async_io.result; result->type = call->type; result->async_io.status = user->callback( user, &info, call->async_io.status ); diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 8469def786a..db58d2e5b12 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -565,7 +565,6 @@ static NTSTATUS try_recv( int fd, struct async_recv_ioctl *async, ULONG_PTR *siz static NTSTATUS async_recv_proc( void *user, ULONG_PTR *info, NTSTATUS status ) { struct async_recv_ioctl *async = user; - ULONG_PTR information = 0; int fd, needs_close; TRACE( "%#x\n", status ); @@ -575,19 +574,15 @@ static NTSTATUS async_recv_proc( void *user, ULONG_PTR *info, NTSTATUS status ) if ((status = server_get_unix_fd( async->io.handle, 0, &fd, &needs_close, NULL, NULL ))) return status; - status = try_recv( fd, async, &information ); - TRACE( "got status %#x, %#lx bytes read\n", status, information ); + status = try_recv( fd, async, info ); + TRACE( "got status %#x, %#lx bytes read\n", status, *info ); if (status == STATUS_DEVICE_NOT_READY) status = STATUS_PENDING; if (needs_close) close( fd ); } - if (status != STATUS_PENDING) - { - *info = information; - release_fileio( &async->io ); - } + if (status != STATUS_PENDING) release_fileio( &async->io ); return status; } @@ -704,7 +699,6 @@ static ULONG_PTR fill_poll_output( struct async_poll_ioctl *async, NTSTATUS stat static NTSTATUS async_poll_proc( void *user, ULONG_PTR *info, NTSTATUS status ) { struct async_poll_ioctl *async = user; - ULONG_PTR information = 0; if (status == STATUS_ALERTED) { @@ -716,12 +710,11 @@ static NTSTATUS async_poll_proc( void *user, ULONG_PTR *info, NTSTATUS status ) } SERVER_END_REQ; - information = fill_poll_output( async, status ); + *info = fill_poll_output( async, status ); } if (status != STATUS_PENDING) { - *info = information; free( async->input ); release_fileio( &async->io ); } diff --git a/server/async.c b/server/async.c index 7cffd24a18b..bdc7620e9a1 100644 --- a/server/async.c +++ b/server/async.c @@ -185,11 +185,11 @@ void async_terminate( struct async *async, unsigned int status ) data.type = APC_ASYNC_IO; data.async_io.user = async->data.user; data.async_io.sb = async->data.iosb; + data.async_io.result = iosb ? iosb->result : 0; - /* if the result is nonzero or there is output data, the client needs to - * make an extra request to retrieve them; use STATUS_ALERTED to signal - * this case */ - if (iosb && (iosb->result || iosb->out_data)) + /* if there is output data, the client needs to make an extra request + * to retrieve it; use STATUS_ALERTED to signal this case */ + if (iosb && iosb->out_data) data.async_io.status = STATUS_ALERTED; else data.async_io.status = status; @@ -719,6 +719,5 @@ DECL_HANDLER(get_async_result) iosb->out_data = NULL; } } - reply->size = iosb->result; set_error( iosb->status ); } diff --git a/server/protocol.def b/server/protocol.def index 02c1f269be7..cc1887dae2d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -508,6 +508,7 @@ typedef union unsigned int status; /* I/O status */ client_ptr_t user; /* user pointer */ client_ptr_t sb; /* status block */ + data_size_t result; /* result size */ } async_io; struct { @@ -2156,7 +2157,6 @@ enum message_type @REQ(get_async_result) client_ptr_t user_arg; /* user arg used to identify async */ @REPLY - data_size_t size; /* result size (input or output depending on the operation) */ VARARG(out_data,bytes); /* iosb output data */ @END diff --git a/server/trace.c b/server/trace.c index da8c74cea2b..b11e51e6d81 100644 --- a/server/trace.c +++ b/server/trace.c @@ -181,7 +181,7 @@ static void dump_apc_call( const char *prefix, const apc_call_t *call ) case APC_ASYNC_IO: dump_uint64( "APC_ASYNC_IO,user=", &call->async_io.user ); dump_uint64( ",sb=", &call->async_io.sb ); - fprintf( stderr, ",status=%s", get_status_name(call->async_io.status) ); + fprintf( stderr, ",status=%s,result=%u", get_status_name(call->async_io.status), call->async_io.result ); break; case APC_VIRTUAL_ALLOC: dump_uint64( "APC_VIRTUAL_ALLOC,addr==", &call->virtual_alloc.addr ); -- 2.33.0

1 5

[PATCH v2] d2d1: Fix the stack overflow error caused by d2d_cdt_triangulate().
by Changsheng Chen 14 Sep '21

14 Sep '21

Fix stack overflow in d2d_cdt_triangulate if vertext_count less than 2. Signed-off-by: Changsheng Chen <chenchangsheng(a)uniontech.com> --- dlls/d2d1/geometry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 6da93de3eb4..71b989fe7c1 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2066,7 +2066,7 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) cdt.free_edge = ~0u; cdt.vertices = vertices; - if (!d2d_cdt_triangulate(&cdt, 0, vertex_count, &left_edge, &right_edge)) + if (vertex_count > 1 && !d2d_cdt_triangulate(&cdt, 0, vertex_count, &left_edge, &right_edge)) goto fail; if (!d2d_cdt_insert_segments(&cdt, geometry)) goto fail; -- 2.20.1

1 0

[PATCH v2] d2d1: Fix the stack overflow error caused by d2d_cdt_triangulate().
by Changsheng Chen 14 Sep '21

14 Sep '21

Fix stack overflow in d2d_cdt_triangulate if vertext_count less than 2. Signed-off-by: Changsheng Chen <chenchangsheng(a)uniontech.com> --- dlls/d2d1/geometry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 6da93de3eb4..71b989fe7c1 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2066,7 +2066,7 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) cdt.free_edge = ~0u; cdt.vertices = vertices; - if (!d2d_cdt_triangulate(&cdt, 0, vertex_count, &left_edge, &right_edge)) + if (vertex_count > 1 && !d2d_cdt_triangulate(&cdt, 0, vertex_count, &left_edge, &right_edge)) goto fail; if (!d2d_cdt_insert_segments(&cdt, geometry)) goto fail; -- 2.20.1

1 0

[PATCH vkd3d resend 5/5] vkd3d-shader: Shift the private variable destination mask, not the source.
by Conor McCarthy 14 Sep '21

14 Sep '21

Otherwise if the input is located above position 0 in the private array it will be swizzled incorrectly, e.g. a.yz instead of a.xy in test_tessellation_ds_inputs(). Based on a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 4 ++-- tests/d3d12.c | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 379746b7..6680551b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4632,8 +4632,8 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi } val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, val_id, - vkd3d_write_mask_from_component_count(input_component_count) << component_idx, - VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_SHADER_NO_SWIZZLE, dst->write_mask); + vkd3d_write_mask_from_component_count(input_component_count), + VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_SHADER_NO_SWIZZLE, dst->write_mask >> component_idx); vkd3d_dxbc_compiler_emit_store_reg(compiler, &dst_reg, dst->write_mask, val_id); } diff --git a/tests/d3d12.c b/tests/d3d12.c index 3202c10b..be9017f5 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29132,13 +29132,6 @@ static void test_tessellation_ds_inputs(void) {1.0f, 2.0f, 0.0f, 0.5f, 2.5f, 8.0f, 2.0f, 1.0f}, {1.0f, 2.0f, 1.0f, 0.5f, 2.5f, 8.0f, 2.0f, 1.0f}, }; - static const bool is_todo[4][8] = - { - {false, false, false, false, true, true, false, false}, - {false, false, false, false, true, true, false, false}, - {false, false, false, false, true, true, false, false}, - {false, false, false, false, true, true, false, false}, - }; static const unsigned int stride = sizeof(reference[0]); memset(&desc, 0, sizeof(desc)); @@ -29188,7 +29181,6 @@ static void test_tessellation_ds_inputs(void) float *elems = get_readback_data(&rb, y, 0, 0, stride); for (x = 0; x < 8; ++x) { - todo_if(is_todo[y][x]) ok(compare_float(reference[y][x], elems[x], 0), "Got unexpected value %f for [%u][%u], expected %f.\n", elems[x], y, x, reference[y][x]); } -- 2.32.0

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Apply 'Patch' decoration to builtin patch constant inputs.
by Conor McCarthy 14 Sep '21

14 Sep '21

Prevents a crash in RADV due to an assertion failure when such inputs are present. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6f948c31..d607bc70 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4548,6 +4548,8 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi if (builtin) { input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, storage_class, array_size); + if (reg->type == VKD3DSPR_PATCHCONST) + vkd3d_spirv_build_op_decorate(builder, input_id, SpvDecorationPatch, NULL, 0); } else { -- 2.32.0

1 4

[PATCH v3 1/3] winegstreamer: Duplicate source shutdown path into constructor with leak fixes.
by Derek Lesho 13 Sep '21

13 Sep '21

Instead of having _Shutdown and the constructors' failures paths mix together creating confusion about what should be released where, we can designate ::Shutdown/::Release to shutting down fully initialized objects without checks, and keep the partially-created object cleanup code in the constructor. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v3: Fix the noted oversights in the constructor cleanup path. --- dlls/winegstreamer/media_source.c | 102 +++++++++++++++++++----------- 1 file changed, 65 insertions(+), 37 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 01ab626254a..7efa3cc06ba 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -733,6 +733,12 @@ static HRESULT new_media_stream(struct media_source *source, object->IMFMediaStream_iface.lpVtbl = &media_stream_vtbl; object->ref = 1; + if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) + { + free(object); + return hr; + } + IMFMediaSource_AddRef(&source->IMFMediaSource_iface); object->parent_source = source; object->stream_id = stream_id; @@ -741,20 +747,11 @@ static HRESULT new_media_stream(struct media_source *source, object->eos = FALSE; object->wg_stream = wg_stream; - if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) - goto fail; - TRACE("Created stream object %p.\n", object); *out_stream = object; return S_OK; - -fail: - WARN("Failed to construct media stream, hr %#x.\n", hr); - - IMFMediaStream_Release(&object->IMFMediaStream_iface); - return hr; } static HRESULT media_stream_init_desc(struct media_stream *stream) @@ -847,10 +844,16 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) goto done; if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler))) + { + IMFStreamDescriptor_Release(stream->descriptor); goto done; + } if (FAILED(hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_types[0]))) + { + IMFStreamDescriptor_Release(stream->descriptor); goto done; + } done: if (type_handler) @@ -1213,19 +1216,13 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) unix_funcs->wg_parser_disconnect(source->wg_parser); - if (source->read_thread) - { - source->read_thread_shutdown = true; - WaitForSingleObject(source->read_thread, INFINITE); - CloseHandle(source->read_thread); - } + source->read_thread_shutdown = true; + WaitForSingleObject(source->read_thread, INFINITE); + CloseHandle(source->read_thread); - if (source->pres_desc) - IMFPresentationDescriptor_Release(source->pres_desc); - if (source->event_queue) - IMFMediaEventQueue_Shutdown(source->event_queue); - if (source->byte_stream) - IMFByteStream_Release(source->byte_stream); + IMFPresentationDescriptor_Release(source->pres_desc); + IMFMediaEventQueue_Shutdown(source->event_queue); + IMFByteStream_Release(source->byte_stream); for (i = 0; i < source->stream_count; i++) { @@ -1233,23 +1230,18 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) stream->state = STREAM_SHUTDOWN; - if (stream->event_queue) - IMFMediaEventQueue_Shutdown(stream->event_queue); - if (stream->descriptor) - IMFStreamDescriptor_Release(stream->descriptor); - if (stream->parent_source) - IMFMediaSource_Release(&stream->parent_source->IMFMediaSource_iface); + IMFMediaEventQueue_Shutdown(stream->event_queue); + IMFStreamDescriptor_Release(stream->descriptor); + IMFMediaSource_Release(&stream->parent_source->IMFMediaSource_iface); IMFMediaStream_Release(&stream->IMFMediaStream_iface); } unix_funcs->wg_parser_destroy(source->wg_parser); - if (source->stream_count) - free(source->streams); + free(source->streams); - if (source->async_commands_queue) - MFUnlockWorkQueue(source->async_commands_queue); + MFUnlockWorkQueue(source->async_commands_queue); return S_OK; } @@ -1274,6 +1266,7 @@ static const IMFMediaSourceVtbl IMFMediaSource_vtbl = static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_source **out_media_source) { IMFStreamDescriptor **descriptors = NULL; + unsigned int stream_count = UINT32_MAX; struct media_source *object; UINT64 total_pres_time = 0; struct wg_parser *parser; @@ -1337,15 +1330,15 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ * leak occurs with native. */ unix_funcs->wg_parser_set_unlimited_buffering(parser); - object->stream_count = unix_funcs->wg_parser_get_stream_count(parser); + stream_count = unix_funcs->wg_parser_get_stream_count(parser); - if (!(object->streams = calloc(object->stream_count, sizeof(*object->streams)))) + if (!(object->streams = calloc(stream_count, sizeof(*object->streams)))) { hr = E_OUTOFMEMORY; goto fail; } - for (i = 0; i < object->stream_count; ++i) + for (i = 0; i < stream_count; ++i) { if (FAILED(hr = new_media_stream(object, unix_funcs->wg_parser_get_stream(parser, i), i, &object->streams[i]))) goto fail; @@ -1353,9 +1346,13 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (FAILED(hr = media_stream_init_desc(object->streams[i]))) { ERR("Failed to finish initialization of media stream %p, hr %x.\n", object->streams[i], hr); - IMFMediaStream_Release(&object->streams[i]->IMFMediaStream_iface); + IMFMediaSource_Release(&object->streams[i]->parent_source->IMFMediaSource_iface); + IMFMediaEventQueue_Release(object->streams[i]->event_queue); + free(object->streams[i]); goto fail; } + + object->stream_count++; } /* init presentation descriptor */ @@ -1392,8 +1389,39 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ fail: WARN("Failed to construct MFMediaSource, hr %#x.\n", hr); - free(descriptors); - IMFMediaSource_Release(&object->IMFMediaSource_iface); + if (descriptors) + { + for(i = 0; i < object->stream_count; i++) + IMFStreamDescriptor_Release(descriptors[i]); + free(descriptors); + } + for (i = 0; i < object->stream_count; i++) + { + struct media_stream *stream = object->streams[i]; + + IMFMediaEventQueue_Release(stream->event_queue); + IMFStreamDescriptor_Release(stream->descriptor); + IMFMediaSource_Release(&stream->parent_source->IMFMediaSource_iface); + + free(stream); + } + free(object->streams); + if (stream_count != UINT32_MAX) + unix_funcs->wg_parser_disconnect(object->wg_parser); + if (object->read_thread) + { + object->read_thread_shutdown = true; + WaitForSingleObject(object->read_thread, INFINITE); + CloseHandle(object->read_thread); + } + if (object->wg_parser) + unix_funcs->wg_parser_destroy(object->wg_parser); + if (object->async_commands_queue) + MFUnlockWorkQueue(object->async_commands_queue); + if (object->event_queue) + IMFMediaEventQueue_Release(object->event_queue); + IMFByteStream_Release(object->byte_stream); + free(object); return hr; } -- 2.33.0

2 3

[PATCH 7/8] gdi32: Remove ordinal exports.
by Jacek Caban 13 Sep '21

13 Sep '21

We no longer need them for our winspool and they are not present on Windows. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/driver.c | 134 ------------------------------------------ dlls/gdi32/gdi32.spec | 7 --- 2 files changed, 141 deletions(-)

4 3

[PATCH] d3dx10: Handle null filename for W->A conversion explicitly in D3DX10CreateEffectFromResourceW().
by Nikolay Sivov 13 Sep '21

13 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx10_43/compiler.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx10_43/compiler.c b/dlls/d3dx10_43/compiler.c index 2a306fa8f57..0083ab267f1 100644 --- a/dlls/d3dx10_43/compiler.c +++ b/dlls/d3dx10_43/compiler.c @@ -176,7 +176,7 @@ HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE module, const WCHAR *reso ID3D10EffectPool *effect_pool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, ID3D10Blob **errors, HRESULT *hresult) { - char *filename; + char *filename = NULL; HRSRC resinfo; void *data; DWORD size; @@ -195,10 +195,13 @@ HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE module, const WCHAR *reso if (FAILED(hr = get_resource_data(module, resinfo, &data, &size))) return hr; - len = WideCharToMultiByte(CP_ACP, 0, filenameW, -1, NULL, 0, NULL, NULL); - if (!(filename = heap_alloc(len))) - return E_OUTOFMEMORY; - WideCharToMultiByte(CP_ACP, 0, filenameW, -1, filename, len, NULL, NULL); + if (filenameW) + { + len = WideCharToMultiByte(CP_ACP, 0, filenameW, -1, NULL, 0, NULL, NULL); + if (!(filename = heap_alloc(len))) + return E_OUTOFMEMORY; + WideCharToMultiByte(CP_ACP, 0, filenameW, -1, filename, len, NULL, NULL); + } hr = D3DX10CreateEffectFromMemory(data, size, filename, defines, include, profile, shader_flags, effect_flags, device, effect_pool, pump, effect, errors, hresult); -- 2.33.0

2 1

[PATCH] d3dx10_37/tests: Enable tests.
by Nikolay Sivov 13 Sep '21

13 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 1 + configure.ac | 1 + dlls/d3dx10_37/Makefile.in | 1 + dlls/d3dx10_37/tests/Makefile.in | 6 ++++++ 4 files changed, 9 insertions(+) create mode 100644 dlls/d3dx10_37/tests/Makefile.in diff --git a/configure b/configure index ee1efef77c2..4e92cfbdb0e 100755 --- a/configure +++ b/configure @@ -20375,6 +20375,7 @@ wine_fn_config_makefile dlls/d3dx10_34 enable_d3dx10_34 wine_fn_config_makefile dlls/d3dx10_35 enable_d3dx10_35 wine_fn_config_makefile dlls/d3dx10_36 enable_d3dx10_36 wine_fn_config_makefile dlls/d3dx10_37 enable_d3dx10_37 +wine_fn_config_makefile dlls/d3dx10_37/tests enable_tests wine_fn_config_makefile dlls/d3dx10_38 enable_d3dx10_38 wine_fn_config_makefile dlls/d3dx10_38/tests enable_tests wine_fn_config_makefile dlls/d3dx10_39 enable_d3dx10_39 diff --git a/configure.ac b/configure.ac index 15b7c2add2a..eb970972936 100644 --- a/configure.ac +++ b/configure.ac @@ -3074,6 +3074,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dx10_34) WINE_CONFIG_MAKEFILE(dlls/d3dx10_35) WINE_CONFIG_MAKEFILE(dlls/d3dx10_36) WINE_CONFIG_MAKEFILE(dlls/d3dx10_37) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_37/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_38) WINE_CONFIG_MAKEFILE(dlls/d3dx10_38/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_39) diff --git a/dlls/d3dx10_37/Makefile.in b/dlls/d3dx10_37/Makefile.in index f4ea9ee460c..3d429b53ab0 100644 --- a/dlls/d3dx10_37/Makefile.in +++ b/dlls/d3dx10_37/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_37.dll +IMPORTLIB = d3dx10_37 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_37/tests/Makefile.in b/dlls/d3dx10_37/tests/Makefile.in new file mode 100644 index 00000000000..271d0722f48 --- /dev/null +++ b/dlls/d3dx10_37/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_37.dll +IMPORTS = d3dx10_37 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c -- 2.33.0

2 1

[PATCH 0/5] Fix message sequence tests to support WinEvents.
by Connor McAdams 13 Sep '21

13 Sep '21

This is the beginning of a series of patches to fix message sequence tests so that WinEvent hooks can be re enabled and tested. Currently, they're just ignored. I've added a 'winevent_hook_todo' flag to indicate WinEvents that we don't have support for yet but are not optional. Connor McAdams (5): user32/tests: Mark some winevents optional in the SetParent sequence. user32/tests: Fix SetParent/SetFocus message sequences to support winevents. user32/tests: Add optional message to fix ShowWindow test. user32/tests: Mark some winevents optional in the ShowWindow sequences. user32/tests: Fix ShowWindow() message sequences to support winevents. dlls/user32/tests/msg.c | 156 +++++++++++++++++++++++++++++++++------- 1 file changed, 130 insertions(+), 26 deletions(-) -- 2.25.1

2 10

[PATCH 1/3] winegstreamer: Duplicate source shutdown path into constructor with leak fixes.
by Derek Lesho 13 Sep '21

13 Sep '21

Instead of having _Shutdown and the constructors' failures paths mix together creating confusion about what should be released where, we can designate ::Shutdown/::Release to shutting down fully initialized objects without checks, and keep the partially-created object cleanup code in the constructor. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 99 +++++++++++++++++++------------ 1 file changed, 62 insertions(+), 37 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 01ab626254a..2a0bb83374d 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -733,6 +733,12 @@ static HRESULT new_media_stream(struct media_source *source, object->IMFMediaStream_iface.lpVtbl = &media_stream_vtbl; object->ref = 1; + if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) + { + free(object); + return hr; + } + IMFMediaSource_AddRef(&source->IMFMediaSource_iface); object->parent_source = source; object->stream_id = stream_id; @@ -741,20 +747,11 @@ static HRESULT new_media_stream(struct media_source *source, object->eos = FALSE; object->wg_stream = wg_stream; - if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) - goto fail; - TRACE("Created stream object %p.\n", object); *out_stream = object; return S_OK; - -fail: - WARN("Failed to construct media stream, hr %#x.\n", hr); - - IMFMediaStream_Release(&object->IMFMediaStream_iface); - return hr; } static HRESULT media_stream_init_desc(struct media_stream *stream) @@ -857,6 +854,8 @@ done: IMFMediaTypeHandler_Release(type_handler); for (i = 0; i < type_count; i++) IMFMediaType_Release(stream_types[i]); + if (FAILED(hr)) + IMFStreamDescriptor_Release(stream->descriptor); return hr; } @@ -1213,19 +1212,13 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) unix_funcs->wg_parser_disconnect(source->wg_parser); - if (source->read_thread) - { - source->read_thread_shutdown = true; - WaitForSingleObject(source->read_thread, INFINITE); - CloseHandle(source->read_thread); - } + source->read_thread_shutdown = true; + WaitForSingleObject(source->read_thread, INFINITE); + CloseHandle(source->read_thread); - if (source->pres_desc) - IMFPresentationDescriptor_Release(source->pres_desc); - if (source->event_queue) - IMFMediaEventQueue_Shutdown(source->event_queue); - if (source->byte_stream) - IMFByteStream_Release(source->byte_stream); + IMFPresentationDescriptor_Release(source->pres_desc); + IMFMediaEventQueue_Shutdown(source->event_queue); + IMFByteStream_Release(source->byte_stream); for (i = 0; i < source->stream_count; i++) { @@ -1233,23 +1226,18 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) stream->state = STREAM_SHUTDOWN; - if (stream->event_queue) - IMFMediaEventQueue_Shutdown(stream->event_queue); - if (stream->descriptor) - IMFStreamDescriptor_Release(stream->descriptor); - if (stream->parent_source) - IMFMediaSource_Release(&stream->parent_source->IMFMediaSource_iface); + IMFMediaEventQueue_Shutdown(stream->event_queue); + IMFStreamDescriptor_Release(stream->descriptor); + IMFMediaSource_Release(&stream->parent_source->IMFMediaSource_iface); IMFMediaStream_Release(&stream->IMFMediaStream_iface); } unix_funcs->wg_parser_destroy(source->wg_parser); - if (source->stream_count) - free(source->streams); + free(source->streams); - if (source->async_commands_queue) - MFUnlockWorkQueue(source->async_commands_queue); + MFUnlockWorkQueue(source->async_commands_queue); return S_OK; } @@ -1274,6 +1262,7 @@ static const IMFMediaSourceVtbl IMFMediaSource_vtbl = static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_source **out_media_source) { IMFStreamDescriptor **descriptors = NULL; + unsigned int stream_count = 0; struct media_source *object; UINT64 total_pres_time = 0; struct wg_parser *parser; @@ -1337,15 +1326,15 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ * leak occurs with native. */ unix_funcs->wg_parser_set_unlimited_buffering(parser); - object->stream_count = unix_funcs->wg_parser_get_stream_count(parser); + stream_count = unix_funcs->wg_parser_get_stream_count(parser); - if (!(object->streams = calloc(object->stream_count, sizeof(*object->streams)))) + if (!(object->streams = calloc(stream_count, sizeof(*object->streams)))) { hr = E_OUTOFMEMORY; goto fail; } - for (i = 0; i < object->stream_count; ++i) + for (i = 0; i < stream_count; ++i) { if (FAILED(hr = new_media_stream(object, unix_funcs->wg_parser_get_stream(parser, i), i, &object->streams[i]))) goto fail; @@ -1353,9 +1342,13 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (FAILED(hr = media_stream_init_desc(object->streams[i]))) { ERR("Failed to finish initialization of media stream %p, hr %x.\n", object->streams[i], hr); - IMFMediaStream_Release(&object->streams[i]->IMFMediaStream_iface); + IMFMediaSource_Release(&object->streams[i]->parent_source->IMFMediaSource_iface); + IMFMediaEventQueue_Release(object->streams[i]->event_queue); + free(object->streams[i]); goto fail; } + + object->stream_count++; } /* init presentation descriptor */ @@ -1392,8 +1385,40 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ fail: WARN("Failed to construct MFMediaSource, hr %#x.\n", hr); - free(descriptors); - IMFMediaSource_Release(&object->IMFMediaSource_iface); + if (descriptors) + { + for(i = 0; i < object->stream_count; i++) + IMFStreamDescriptor_Release(descriptors[i]); + free(descriptors); + } + for (i = 0; i < object->stream_count; i++) + { + struct media_stream *stream = object->streams[i]; + + IMFMediaEventQueue_Release(stream->event_queue); + IMFStreamDescriptor_Release(stream->descriptor); + IMFMediaSource_Release(&stream->parent_source->IMFMediaSource_iface); + + free(stream); + } + if (object->streams) + free(object->streams); + if (stream_count) + unix_funcs->wg_parser_disconnect(object->wg_parser); + if (object->read_thread) + { + object->read_thread_shutdown = true; + WaitForSingleObject(object->read_thread, INFINITE); + CloseHandle(object->read_thread); + } + if (object->wg_parser) + unix_funcs->wg_parser_destroy(object->wg_parser); + if (object->async_commands_queue) + MFUnlockWorkQueue(object->async_commands_queue); + if (object->event_queue) + IMFMediaEventQueue_Release(object->event_queue); + IMFByteStream_Release(object->byte_stream); + free(object); return hr; } -- 2.33.0

2 7

[PATCH 1/4] msvcrt: Improve memset performance using overlapping stores.
by Rémi Bernon 13 Sep '21

13 Sep '21

For n larger than 16 we store 16 bytes on each end of the buffer, eventually overlapping, and then 16 additional bytes for n > 32. Then we can find a 32-byte aligned range overlapping the remaining part of the destination buffer, which is filled 32 bytes at a time in a loop. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- So, this is what I was thinking instead of having fully specialized assembly versions. Overall I believe the performance should be better than SSE2 for very small sizes and very large sizes (when ERMS kicks in), but a bit worse for 128 <= n <= 1024. I also don't even think the last patch is really useful, it only helps improving performance for the intermediate sizes, and I would think instead that the ERMS path could cover them instead once it is good enough on most CPUs for that range of size. dlls/msvcrt/string.c | 60 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 4d09405094d..3a7312572ab 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2855,13 +2855,65 @@ void * __cdecl memcpy(void *dst, const void *src, size_t n) return memmove(dst, src, n); } +static void memset_aligned_32(unsigned char *d, uint64_t v, size_t n) +{ + while (n >= 32) + { + *(uint64_t*)(d + n - 32) = v; + *(uint64_t*)(d + n - 24) = v; + *(uint64_t*)(d + n - 16) = v; + *(uint64_t*)(d + n - 8) = v; + n -= 32; + } +} + /********************************************************************* * memset (MSVCRT.@) */ -void* __cdecl memset(void *dst, int c, size_t n) -{ - volatile unsigned char *d = dst; /* avoid gcc optimizations */ - while (n--) *d++ = c; +void *__cdecl memset(void *dst, int c, size_t n) +{ + uint64_t v = 0x101010101010101ull * (unsigned char)c; + unsigned char *d = (unsigned char *)dst; + size_t a = 0x20 - ((uintptr_t)d & 0x1f); + + 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; + 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; + if (n <= 64) return dst; + memset_aligned_32(d + a, v, (n - a) & ~0x1f); + return dst; + } + if (n >= 8) + { + *(uint64_t *)d = v; + *(uint64_t *)(d + n - 8) = v; + return dst; + } + if (n >= 4) + { + *(uint32_t *)d = v; + *(uint32_t *)(d + n - 4) = v; + return dst; + } + if (n >= 2) + { + *(uint16_t *)d = v; + *(uint16_t *)(d + n - 2) = v; + return dst; + } + if (n >= 1) + { + *(uint8_t *)d = v; + return dst; + } return dst; } -- 2.33.0

4 17

[PATCH v2 resent] msvcrt: Add an ermsb-based memset for x86/64.
by Guillaume Charifi 13 Sep '21

13 Sep '21

Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/msvcrt/string.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 4d09405094d..6d1500cb194 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2527,6 +2527,7 @@ int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") \ "popq " SRC_REG "\n\t" \ __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + #endif void * __cdecl sse2_memmove(void *dst, const void *src, size_t n); @@ -2732,6 +2733,64 @@ __ASM_GLOBAL_FUNC( sse2_memmove, MEMMOVE_CLEANUP "ret" ) +#undef DEST_REG +#undef SRC_REG +#undef LEN_REG +#undef TMP_REG + +#ifdef __i386__ + +#define DEST_REG "%edi" +#define SRC_REG "%eax" +#define LEN_REG "%ecx" +#define TMP_REG + +#define MEMSET_INIT \ + "pushl " DEST_REG "\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + "movl 8(%esp), " DEST_REG "\n\t" \ + "movl 12(%esp), " SRC_REG "\n\t" \ + "movl 16(%esp), " LEN_REG "\n\t" + +#define MEMSET_CLEANUP \ + "movl 8(%esp), %eax\n\t" \ + "popl " DEST_REG "\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + +#else + +#define DEST_REG "%rdi" +#define SRC_REG "%rax" +#define LEN_REG "%rcx" +#define TMP_REG "%r9" + +#define MEMSET_INIT \ + "pushq " DEST_REG "\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") \ + "movq %rcx, " DEST_REG "\n\t" \ + "movq %rdx, " SRC_REG "\n\t" \ + "movq %r8, " LEN_REG "\n\t" \ + "movq " DEST_REG ", " TMP_REG "\n\t" + +#define MEMSET_CLEANUP \ + "movq " TMP_REG ", %rax\n\t" \ + "popq " DEST_REG "\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + +#endif + +void * __cdecl ermsb_memset(void *dst, int c, size_t n); +__ASM_GLOBAL_FUNC( ermsb_memset, + MEMSET_INIT + "rep stosb\n\t" + MEMSET_CLEANUP + "ret" ) + +#undef DEST_REG +#undef SRC_REG +#undef LEN_REG +#undef TMP_REG + #endif /********************************************************************* @@ -2860,9 +2919,13 @@ void * __cdecl memcpy(void *dst, const void *src, size_t n) */ void* __cdecl memset(void *dst, int c, size_t n) { +#if defined(__i386__) || defined(__x86_64__) + return ermsb_memset(dst, c, n); +#else volatile unsigned char *d = dst; /* avoid gcc optimizations */ while (n--) *d++ = c; return dst; +#endif } /********************************************************************* -- 2.33.0

2 1

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

13 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 | 40 ++++++++++++++++++++++++++++++++++++++-- 4 files changed, 43 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 8469def786a..b1b90b363ee 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -747,12 +747,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] ); @@ -793,6 +792,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 133d6ad0552..c6da8576f39 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1450,6 +1450,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 6452cfb0dd7..f6f0bf06f2e 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 */ @@ -787,7 +789,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 ); @@ -1382,6 +1390,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; @@ -2839,7 +2848,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; @@ -2880,11 +2913,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 ); @@ -3285,7 +3321,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 resend] ntdll: Implement JobObjectBasicProcessIdList for NtQueryInformationJobObject.
by Gabriel Ivăncescu 13 Sep '21

13 Sep '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Resending as it fell off the list. Anything holding this up or anything I should improve on it? I realize the memcpy thing may be not ideal, but it avoids a pointless allocation + copy. Similar logic is done in user32's list_window_children, where it copies from user_handle_t to HWND in-place, but that can suffer from aliasing issues without memcpy since it's a different type, otherwise should compile to same code when optimized. But if that's not needed I can just use a direct assignment instead. Or is there something else about it that can be improved? dlls/kernel32/tests/process.c | 9 --------- dlls/ntdll/unix/sync.c | 31 ++++++++++++++++++++++++++++--- server/process.c | 34 ++++++++++++++++++++++++++++++++++ server/protocol.def | 9 +++++++++ 4 files changed, 71 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index e729bca..1c056fb 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2700,15 +2700,11 @@ static void test_QueryInformationJobObject(void) pid_list->NumberOfProcessIdsInList = 42; ret = QueryInformationJobObject(job, JobObjectBasicProcessIdList, pid_list, FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[1]), &ret_len); - todo_wine ok(!ret, "QueryInformationJobObject expected failure\n"); - todo_wine expect_eq_d(ERROR_MORE_DATA, GetLastError()); if (ret) { - todo_wine expect_eq_d(42, pid_list->NumberOfAssignedProcesses); - todo_wine expect_eq_d(42, pid_list->NumberOfProcessIdsInList); } @@ -2723,17 +2719,12 @@ static void test_QueryInformationJobObject(void) { ULONG_PTR *list = pid_list->ProcessIdList; - todo_wine ok(ret_len == FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[2]), "QueryInformationJobObject returned ret_len=%u\n", ret_len); - todo_wine expect_eq_d(2, pid_list->NumberOfAssignedProcesses); - todo_wine expect_eq_d(2, pid_list->NumberOfProcessIdsInList); - todo_wine expect_eq_d(pi[0].dwProcessId, list[0]); - todo_wine expect_eq_d(pi[1].dwProcessId, list[1]); } } diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index a13e53a..0594a5e 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -791,11 +791,36 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c case JobObjectBasicProcessIdList: { JOBOBJECT_BASIC_PROCESS_ID_LIST *process = info; + DWORD count, i; if (len < sizeof(*process)) return STATUS_INFO_LENGTH_MISMATCH; - memset( process, 0, sizeof(*process) ); - if (ret_len) *ret_len = sizeof(*process); - return STATUS_SUCCESS; + + count = len - FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList); + count /= sizeof(process->ProcessIdList[0]); + + SERVER_START_REQ( query_job_pids ) + { + req->job = wine_server_user_handle(handle); + wine_server_set_reply(req, process->ProcessIdList, count * sizeof(process_id_t)); + if ((ret = wine_server_call(req)) != STATUS_SUCCESS) + return ret; + process->NumberOfAssignedProcesses = reply->count; + process->NumberOfProcessIdsInList = min(count, reply->count); + } + SERVER_END_REQ; + + if (sizeof(process_id_t) < sizeof(process->ProcessIdList[0])) + { + /* start from the end to not overwrite */ + for (i = process->NumberOfProcessIdsInList; i--;) + { + ULONG_PTR id = ((process_id_t*)(&process->ProcessIdList[0]))[i]; + memcpy(&process->ProcessIdList[i], &id, sizeof(id)); + } + } + + if (ret_len) *ret_len = (char*)(&process->ProcessIdList[process->NumberOfProcessIdsInList]) - (char*)process; + return count < process->NumberOfAssignedProcesses ? STATUS_MORE_ENTRIES : STATUS_SUCCESS; } case JobObjectExtendedLimitInformation: { diff --git a/server/process.c b/server/process.c index 0870de5..48e632a 100644 --- a/server/process.c +++ b/server/process.c @@ -286,6 +286,24 @@ static int process_in_job( struct job *job, struct process *process ) return process->job == job; } +static data_size_t query_job_pids( struct job *job, data_size_t count, data_size_t maxcount, process_id_t *pids ) +{ + struct process *process; + struct job *j; + + LIST_FOR_EACH_ENTRY( j, &job->child_job_list, struct job, parent_job_entry ) + count = query_job_pids( j, count, maxcount, pids ); + + LIST_FOR_EACH_ENTRY( process, &job->process_list, struct process, job_entry ) + { + if (process->end_time) continue; + if (count < maxcount) pids[count] = process->id; + count++; + } + + return count; +} + static void add_job_process( struct job *job, struct process *process ) { struct job *j, *common_parent; @@ -1741,6 +1759,22 @@ DECL_HANDLER(process_in_job) release_object( process ); } +/* get a list of the pids associated with the job */ +DECL_HANDLER(query_job_pids) +{ + struct job *job = get_job_obj( current->process, req->job, JOB_OBJECT_QUERY ); + process_id_t *pids; + data_size_t len; + + if (!job) return; + + reply->count = query_job_pids( job, 0, 0, NULL ); + + len = min( get_reply_max_size(), reply->count * sizeof(*pids) ); + if (len && ((pids = set_reply_data_size( len )))) + query_job_pids( job, 0, len / sizeof(*pids), pids ); +} + /* retrieve information about a job */ DECL_HANDLER(get_job_info) { diff --git a/server/protocol.def b/server/protocol.def index 133d6ad..5d97cb5 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3671,6 +3671,15 @@ struct handle_info @END +/* Query a list of pids associated with the job */ +@REQ(query_job_pids) + obj_handle_t job; /* handle to the job */ +@REPLY + data_size_t count; /* number of processes associated with the job */ + VARARG(pids,uints); /* list of pids */ +@END + + /* Set limit flags on a job */ @REQ(set_job_limits) obj_handle_t handle; /* handle to the job */ -- 2.31.1

2 2

[PATCH 8/8] gdi32: Remove no longer used printer config driver entry points.
by Jacek Caban 13 Sep '21

13 Sep '21

2 1

[PATCH 6/8] winspool: Use DocumentPropertiesW for DocumentPropertiesA.
by Jacek Caban 13 Sep '21

13 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winspool.drv/info.c | 82 ++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 49 deletions(-)

2 1

[PATCH 5/8] winspool: Use configuration file for DocumentPropertiesW.
by Jacek Caban 13 Sep '21

13 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winspool.drv/info.c | 77 ++++++++++++---------------------------- 1 file changed, 23 insertions(+), 54 deletions(-)

2 1

[PATCH 4/8] wineps: Introduce DrvDocumentProperties entry point.
by Jacek Caban 13 Sep '21

13 Sep '21

This is not compatible with native. We should use DrvDevicePropertySheets instead, but that requires support for CPSUI support first. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineps.drv/driver.c | 116 +++++++++++++++++--------------- dlls/wineps.drv/wineps.drv.spec | 1 + 2 files changed, 62 insertions(+), 55 deletions(-)

2 1

[PATCH 3/8] winspool: Use DeviceCapabilitiesW for DeviceCapabilitiesA.
by Jacek Caban 13 Sep '21

13 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winspool.drv/info.c | 67 ++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 24 deletions(-)

2 1

[PATCH 2/8] winspool: Use configuration file for DeviceCapabilitiesW.
by Jacek Caban 13 Sep '21

13 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winspool.drv/info.c | 228 ++++++++++++++++++++++++++------------- 1 file changed, 155 insertions(+), 73 deletions(-)

2 1

[PATCH 1/8] wineps.drv: Export DrvDeviceCapabilities.
by Jacek Caban 13 Sep '21

13 Sep '21

Allows wineps.drv to act as printer configuration interface DLL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineps.drv/driver.c | 101 +++++++++++++++++++++++--------- dlls/wineps.drv/wineps.drv.spec | 3 + include/ddk/winddiui.h | 1 + 3 files changed, 78 insertions(+), 27 deletions(-)

2 1

[PATCH 1/5] wbemprox: Copy correct substring to *namespace in parse_resource().
by Paul Gofman 13 Sep '21

13 Sep '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/wbemprox/wbemlocator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 5e86f2be86d..161d9845ca9 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -139,7 +139,7 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na if (!(*namespace = heap_alloc( (len + 1) * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; else { - memcpy( *namespace, p, len * sizeof(WCHAR) ); + memcpy( *namespace, q, len * sizeof(WCHAR) ); (*namespace)[len] = 0; hr = S_OK; } -- 2.31.1

2 5

[PATCH 1/6] winexinput.sys: Return native product strings on some devices.
by Rémi Bernon 13 Sep '21

13 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winexinput.sys/main.c | 60 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 3832c97ef26..667ce867269 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -32,6 +32,7 @@ #include "ddk/wdm.h" #include "ddk/hidport.h" #include "ddk/hidpddi.h" +#include "ddk/hidtypes.h" #include "wine/asm.h" #include "wine/debug.h" @@ -314,17 +315,76 @@ static NTSTATUS try_complete_pending_read(DEVICE_OBJECT *device, IRP *irp) return IoCallDriver(fdo->bus_device, xinput_irp); } +struct device_strings +{ + const WCHAR *id; + const WCHAR *product; +}; + +static const struct device_strings device_strings[] = +{ + { .id = L"VID_045E&PID_028E&IG_00", .product = L"Controller (XBOX 360 For Windows)" }, + { .id = L"VID_045E&PID_028F&IG_00", .product = L"Controller (XBOX 360 For Windows)" }, + { .id = L"VID_045E&PID_02D1&IG_00", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_02DD&IG_00", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_02E3&IG_00", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_02EA&IG_00", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_02FD&IG_00", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_0719&IG_00", .product = L"Controller (XBOX 360 For Windows)" }, +}; + +static const WCHAR *find_product_string(const WCHAR *device_id) +{ + const WCHAR *match_id = wcsrchr(device_id, '\\') + 1; + DWORD i; + + for (i = 0; i < ARRAY_SIZE(device_strings); ++i) + if (!wcsicmp(device_strings[i].id, match_id)) + return device_strings[i].product; + + return NULL; +} + static NTSTATUS WINAPI gamepad_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); ULONG output_len = stack->Parameters.DeviceIoControl.OutputBufferLength; ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; struct func_device *fdo = fdo_from_DEVICE_OBJECT(device); + struct device *impl = impl_from_DEVICE_OBJECT(device); + const WCHAR *str = NULL; TRACE("device %p, irp %p, code %#x, bus_device %p.\n", device, irp, code, fdo->bus_device); switch (code) { + case IOCTL_HID_GET_STRING: + switch ((ULONG_PTR)stack->Parameters.DeviceIoControl.Type3InputBuffer) + { + case HID_STRING_ID_IPRODUCT: + str = find_product_string(impl->device_id); + break; + } + + if (!str) + { + IoSkipCurrentIrpStackLocation(irp); + return IoCallDriver(fdo->bus_device, irp); + } + + irp->IoStatus.Information = (wcslen(str) + 1) * sizeof(WCHAR); + if (output_len < irp->IoStatus.Information) + { + irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_BUFFER_TOO_SMALL; + } + + wcscpy(irp->UserBuffer, str); + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + case IOCTL_HID_GET_DEVICE_DESCRIPTOR: { HID_DESCRIPTOR *descriptor = (HID_DESCRIPTOR *)irp->UserBuffer; -- 2.33.0

1 5

[PATCH] msi: Don't leak the file handle on error in cabinet_close_file_info().
by Hans Leidekker 13 Sep '21

13 Sep '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/media.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index cc4648481ba..af6e83b893e 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -507,16 +507,23 @@ static INT_PTR cabinet_close_file_info(FDINOTIFICATIONTYPE fdint, data->mi->is_continuous = FALSE; if (!DosDateTimeToFileTime(pfdin->date, pfdin->time, &ft)) + { + CloseHandle(handle); return -1; + } if (!LocalFileTimeToFileTime(&ft, &ftLocal)) + { + CloseHandle(handle); return -1; + } if (!SetFileTime(handle, &ftLocal, 0, &ftLocal)) + { + CloseHandle(handle); return -1; + } CloseHandle(handle); - - data->cb(data->package, data->curfile, MSICABEXTRACT_FILEEXTRACTED, NULL, NULL, - data->user); + data->cb(data->package, data->curfile, MSICABEXTRACT_FILEEXTRACTED, NULL, NULL, data->user); msi_free(data->curfile); data->curfile = NULL; -- 2.30.2

1 0

[PATCH 1/4] winexinput.sys: Register known XBox controllers hardware ids.
by Rémi Bernon 13 Sep '21

13 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- * Send the patches separately from the others, they should not conflict * Force the &MI_00 suffix on all gamepad devices where we cannot figure the correct interface number (SDL and IOHID bus). dlls/winexinput.sys/winexinput.inf | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/winexinput.sys/winexinput.inf b/dlls/winexinput.sys/winexinput.inf index 2f388c190ca..a2b74863c63 100644 --- a/dlls/winexinput.sys/winexinput.inf +++ b/dlls/winexinput.sys/winexinput.inf @@ -8,6 +8,19 @@ Wine=mfg_section [mfg_section] Wine XInput compatible device=device_section,WINEBUS\WINE_COMP_XINPUT +Xbox Controller=device_section,WINEBUS\VID_045E&PID_0202&MI_00 +Xbox Controller S=device_section,WINEBUS\VID_045E&PID_0285&MI_00 +Xbox Controller S=device_section,WINEBUS\VID_045E&PID_0289&MI_00 +Xbox360 Controller=device_section,WINEBUS\VID_045E&PID_028E&MI_00 +Xbox360 Wireless Controller=device_section,WINEBUS\VID_045E&PID_028F&MI_00 +Xbox One Controller=device_section,WINEBUS\VID_045E&PID_02D1&MI_00 +Xbox One Controller (Covert Forces/Firmware 2015)=device_section,WINEBUS\VID_045E&PID_02DD&MI_00 +Xbox One X Controller=device_section,WINEBUS\VID_045E&PID_02E0&MI_00 +Xbox One Elite Controller=device_section,WINEBUS\VID_045E&PID_02E3&MI_00 +Wireless XBox Controller Dongle=device_section,WINEBUS\VID_045E&PID_02E6&MI_00 +Xbox One S Controller=device_section,WINEBUS\VID_045E&PID_02EA&MI_00 +Xbox One S Controller (Firmware 2017)=device_section,WINEBUS\VID_045E&PID_02FD&MI_00 +Xbox 360 Wireless Adapter=device_section,WINEBUS\VID_045E&PID_0719&MI_00 [device_section.Services] AddService = xinput,0x2,svc_section -- 2.33.0

1 4

[PATCH 1/8] dinput8/tests: Fix inverted winetest_win_skip condition.
by Rémi Bernon 13 Sep '21

13 Sep '21

And change skipped test message. It's not really useful and it will fail the tests if the main test summary doesn't match the number of skipped messages. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- In order for the skipped tests to be counted correctly we would need a new winetest_add_skipped helper in wine/test.h and that would cause all tests to be rebuilt. This is simpler and I don't think driver skipped test count matter so much. It could also be added later. dlls/dinput8/tests/driver_hid.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.h b/dlls/dinput8/tests/driver_hid.h index 8fad343157d..42d12a0cf27 100644 --- a/dlls/dinput8/tests/driver_hid.h +++ b/dlls/dinput8/tests/driver_hid.h @@ -326,7 +326,7 @@ static inline void winetest_vskip( const char *msg, __ms_va_list args ) { if (winetest_add_line() < winetest_mute_threshold) { - winetest_print_context( "Tests skipped: " ); + winetest_print_context( "Driver tests skipped: " ); kvprintf( msg, args ); InterlockedIncrement( &skipped ); } @@ -347,7 +347,7 @@ static inline void WINAPIV winetest_win_skip( const char *msg, ... ) { __ms_va_list args; __ms_va_start( args, msg ); - if (running_under_wine) winetest_vskip( msg, args ); + if (!running_under_wine) winetest_vskip( msg, args ); else winetest_vok( 0, msg, args ); __ms_va_end( args ); } -- 2.33.0

1 7

[PATCH v2] d2d1: Fix the stack overflow error caused by d2d_cdt_triangulate().
by Changsheng Chen 13 Sep '21

13 Sep '21

1 0

[v2 PATCH] rpcrt4/tests: Always run tests that don't require special permissions.
by Nikolay Sivov 13 Sep '21

13 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fix tests on Wine dlls/rpcrt4/tests/rpc.c | 105 +++++++++++++++++++++++----------------- 1 file changed, 61 insertions(+), 44 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 8ae63a140e7..413a715e16d 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -78,35 +78,49 @@ static BOOL Uuid_Comparison_Grid[11][11] = { { TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE } }; -static void UuidConversionAndComparison(void) { +static void test_UuidEqual(void) +{ + UUID Uuid1, Uuid2, *PUuid1, *PUuid2; + RPC_STATUS status; + int i1, i2; + + /* Uuid Equality */ + for (i1 = 0; i1 < 11; i1++) + { + for (i2 = 0; i2 < 11; i2++) + { + if (i1 < 10) + { + Uuid1 = Uuid_Table[i1]; + PUuid1 = &Uuid1; + } + else + PUuid1 = NULL; + + if (i2 < 10) + { + Uuid2 = Uuid_Table[i2]; + PUuid2 = &Uuid2; + } + else + PUuid2 = NULL; + ok(UuidEqual(PUuid1, PUuid2, &status) == Uuid_Comparison_Grid[i1][i2], "UUID Equality\n" ); + } + } +} + +static void test_UuidFromString(void) +{ CHAR strx[100], x; LPSTR str = strx; WCHAR wstrx[100], wx; LPWSTR wstr = wstrx; - UUID Uuid1, Uuid2, *PUuid1, *PUuid2; + UUID Uuid1, Uuid2; RPC_STATUS rslt; int i1,i2; - /* Uuid Equality */ - for (i1 = 0; i1 < 11; i1++) - for (i2 = 0; i2 < 11; i2++) { - if (i1 < 10) { - Uuid1 = Uuid_Table[i1]; - PUuid1 = &Uuid1; - } else { - PUuid1 = NULL; - } - if (i2 < 10) { - Uuid2 = Uuid_Table[i2]; - PUuid2 = &Uuid2; - } else { - PUuid2 = NULL; - } - ok( (UuidEqual(PUuid1, PUuid2, &rslt) == Uuid_Comparison_Grid[i1][i2]), "UUID Equality\n" ); - } - /* Uuid to String to Uuid (char) */ for (i1 = 0; i1 < 10; i1++) { Uuid1 = Uuid_Table[i1]; @@ -141,7 +155,7 @@ static void UuidConversionAndComparison(void) { } } -static void TestDceErrorInqText (void) +static void test_DceErrorInqTextA(void) { char bufferInvalid [1024]; char buffer [1024]; /* The required size is not documented but would @@ -649,17 +663,10 @@ static void test_RpcStringBindingParseA(void) ok(options == NULL, "options was %p instead of NULL\n", options); } -static void test_RpcExceptionFilter(const char *func_name) +static void test_RpcExceptionFilter(void) { + int retval, retval2; ULONG exception; - int retval; - int (WINAPI *pRpcExceptionFilter)(ULONG) = (void *)GetProcAddress(GetModuleHandleA("rpcrt4.dll"), func_name); - - if (!pRpcExceptionFilter) - { - win_skip("%s not exported\n", func_name); - return; - } for (exception = 0; exception < STATUS_REG_NAT_CONSUMPTION; exception++) { @@ -668,7 +675,8 @@ static void test_RpcExceptionFilter(const char *func_name) if (exception == 0x40000005) exception = 0x80000000; if (exception == 0x80000005) exception = 0xc0000000; - retval = pRpcExceptionFilter(exception); + retval = RpcExceptionFilter(exception); + retval2 = I_RpcExceptionFilter(exception); switch (exception) { case STATUS_DATATYPE_MISALIGNMENT: @@ -679,17 +687,25 @@ static void test_RpcExceptionFilter(const char *func_name) case STATUS_INSTRUCTION_MISALIGNMENT: case STATUS_STACK_OVERFLOW: case STATUS_POSSIBLE_DEADLOCK: - ok(retval == EXCEPTION_CONTINUE_SEARCH, "%s(0x%x) should have returned %d instead of %d\n", - func_name, exception, EXCEPTION_CONTINUE_SEARCH, retval); + ok(retval == EXCEPTION_CONTINUE_SEARCH, "RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_CONTINUE_SEARCH, retval); + ok(retval2 == EXCEPTION_CONTINUE_SEARCH, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_CONTINUE_SEARCH, retval); break; case STATUS_GUARD_PAGE_VIOLATION: case STATUS_IN_PAGE_ERROR: case STATUS_HANDLE_NOT_CLOSABLE: - trace("%s(0x%x) returned %d\n", func_name, exception, retval); + todo_wine + { + ok(!retval, "Unexpected return value %d.\n", retval); + ok(!retval2, "Unexpected return value %d.\n", retval2); + } break; default: - ok(retval == EXCEPTION_EXECUTE_HANDLER, "%s(0x%x) should have returned %d instead of %d\n", - func_name, exception, EXCEPTION_EXECUTE_HANDLER, retval); + ok(retval == EXCEPTION_EXECUTE_HANDLER, "RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_EXECUTE_HANDLER, retval); + ok(retval2 == EXCEPTION_EXECUTE_HANDLER, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_EXECUTE_HANDLER, retval); } } } @@ -1235,22 +1251,23 @@ START_TEST( rpc ) static unsigned char np_address[] = "."; BOOL firewall_enabled = is_firewall_enabled(); + test_UuidEqual(); + test_UuidFromString(); + test_UuidCreate(); + test_UuidCreateSequential(); + test_DceErrorInqTextA(); + test_I_RpcMapWin32Status(); + test_RpcStringBindingParseA(); + test_RpcExceptionFilter(); + if (firewall_enabled && !is_process_elevated()) { skip("no privileges, skipping tests to avoid firewall dialog\n"); return; } - UuidConversionAndComparison(); - TestDceErrorInqText(); test_towers(); - test_I_RpcMapWin32Status(); - test_RpcStringBindingParseA(); - test_RpcExceptionFilter("I_RpcExceptionFilter"); - test_RpcExceptionFilter("RpcExceptionFilter"); test_RpcStringBindingFromBinding(); - test_UuidCreate(); - test_UuidCreateSequential(); test_RpcBindingFree(); test_RpcIfInqId(); test_RpcServerInqDefaultPrincName(); -- 2.33.0

1 0

[PATCH] rpcrt4/tests: Always run tests that don't require special permissions.
by Nikolay Sivov 13 Sep '21

13 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/rpcrt4/tests/rpc.c | 102 +++++++++++++++++++++++----------------- 1 file changed, 58 insertions(+), 44 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 8ae63a140e7..11c3bf51d79 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -78,35 +78,49 @@ static BOOL Uuid_Comparison_Grid[11][11] = { { TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE } }; -static void UuidConversionAndComparison(void) { +static void test_UuidEqual(void) +{ + UUID Uuid1, Uuid2, *PUuid1, *PUuid2; + RPC_STATUS status; + int i1, i2; + + /* Uuid Equality */ + for (i1 = 0; i1 < 11; i1++) + { + for (i2 = 0; i2 < 11; i2++) + { + if (i1 < 10) + { + Uuid1 = Uuid_Table[i1]; + PUuid1 = &Uuid1; + } + else + PUuid1 = NULL; + + if (i2 < 10) + { + Uuid2 = Uuid_Table[i2]; + PUuid2 = &Uuid2; + } + else + PUuid2 = NULL; + ok(UuidEqual(PUuid1, PUuid2, &status) == Uuid_Comparison_Grid[i1][i2], "UUID Equality\n" ); + } + } +} + +static void test_UuidFromString(void) +{ CHAR strx[100], x; LPSTR str = strx; WCHAR wstrx[100], wx; LPWSTR wstr = wstrx; - UUID Uuid1, Uuid2, *PUuid1, *PUuid2; + UUID Uuid1, Uuid2; RPC_STATUS rslt; int i1,i2; - /* Uuid Equality */ - for (i1 = 0; i1 < 11; i1++) - for (i2 = 0; i2 < 11; i2++) { - if (i1 < 10) { - Uuid1 = Uuid_Table[i1]; - PUuid1 = &Uuid1; - } else { - PUuid1 = NULL; - } - if (i2 < 10) { - Uuid2 = Uuid_Table[i2]; - PUuid2 = &Uuid2; - } else { - PUuid2 = NULL; - } - ok( (UuidEqual(PUuid1, PUuid2, &rslt) == Uuid_Comparison_Grid[i1][i2]), "UUID Equality\n" ); - } - /* Uuid to String to Uuid (char) */ for (i1 = 0; i1 < 10; i1++) { Uuid1 = Uuid_Table[i1]; @@ -141,7 +155,7 @@ static void UuidConversionAndComparison(void) { } } -static void TestDceErrorInqText (void) +static void test_DceErrorInqTextA(void) { char bufferInvalid [1024]; char buffer [1024]; /* The required size is not documented but would @@ -649,17 +663,10 @@ static void test_RpcStringBindingParseA(void) ok(options == NULL, "options was %p instead of NULL\n", options); } -static void test_RpcExceptionFilter(const char *func_name) +static void test_RpcExceptionFilter(void) { + int retval, retval2; ULONG exception; - int retval; - int (WINAPI *pRpcExceptionFilter)(ULONG) = (void *)GetProcAddress(GetModuleHandleA("rpcrt4.dll"), func_name); - - if (!pRpcExceptionFilter) - { - win_skip("%s not exported\n", func_name); - return; - } for (exception = 0; exception < STATUS_REG_NAT_CONSUMPTION; exception++) { @@ -668,7 +675,8 @@ static void test_RpcExceptionFilter(const char *func_name) if (exception == 0x40000005) exception = 0x80000000; if (exception == 0x80000005) exception = 0xc0000000; - retval = pRpcExceptionFilter(exception); + retval = RpcExceptionFilter(exception); + retval2 = I_RpcExceptionFilter(exception); switch (exception) { case STATUS_DATATYPE_MISALIGNMENT: @@ -679,17 +687,22 @@ static void test_RpcExceptionFilter(const char *func_name) case STATUS_INSTRUCTION_MISALIGNMENT: case STATUS_STACK_OVERFLOW: case STATUS_POSSIBLE_DEADLOCK: - ok(retval == EXCEPTION_CONTINUE_SEARCH, "%s(0x%x) should have returned %d instead of %d\n", - func_name, exception, EXCEPTION_CONTINUE_SEARCH, retval); + ok(retval == EXCEPTION_CONTINUE_SEARCH, "RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_CONTINUE_SEARCH, retval); + ok(retval2 == EXCEPTION_CONTINUE_SEARCH, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_CONTINUE_SEARCH, retval); break; case STATUS_GUARD_PAGE_VIOLATION: case STATUS_IN_PAGE_ERROR: case STATUS_HANDLE_NOT_CLOSABLE: - trace("%s(0x%x) returned %d\n", func_name, exception, retval); + ok(!retval, "Unexpected return value %d.\n", retval); + ok(!retval2, "Unexpected return value %d.\n", retval2); break; default: - ok(retval == EXCEPTION_EXECUTE_HANDLER, "%s(0x%x) should have returned %d instead of %d\n", - func_name, exception, EXCEPTION_EXECUTE_HANDLER, retval); + ok(retval == EXCEPTION_EXECUTE_HANDLER, "RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_EXECUTE_HANDLER, retval); + ok(retval2 == EXCEPTION_EXECUTE_HANDLER, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_EXECUTE_HANDLER, retval); } } } @@ -1235,22 +1248,23 @@ START_TEST( rpc ) static unsigned char np_address[] = "."; BOOL firewall_enabled = is_firewall_enabled(); + test_UuidEqual(); + test_UuidFromString(); + test_UuidCreate(); + test_UuidCreateSequential(); + test_DceErrorInqTextA(); + test_I_RpcMapWin32Status(); + test_RpcStringBindingParseA(); + test_RpcExceptionFilter(); + if (firewall_enabled && !is_process_elevated()) { skip("no privileges, skipping tests to avoid firewall dialog\n"); return; } - UuidConversionAndComparison(); - TestDceErrorInqText(); test_towers(); - test_I_RpcMapWin32Status(); - test_RpcStringBindingParseA(); - test_RpcExceptionFilter("I_RpcExceptionFilter"); - test_RpcExceptionFilter("RpcExceptionFilter"); test_RpcStringBindingFromBinding(); - test_UuidCreate(); - test_UuidCreateSequential(); test_RpcBindingFree(); test_RpcIfInqId(); test_RpcServerInqDefaultPrincName(); -- 2.33.0

2 1

[PATCH 1/3] ole32: Use access mask from bind context in file moniker's BindToStorage().
by Nikolay Sivov 13 Sep '21

13 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Access mask used originally is invalid to begin with. dlls/ole32/filemoniker.c | 46 +++++++++++++++---------------- dlls/ole32/tests/moniker.c | 55 +++++++++++++++++++++++++++++++++++++- 2 files changed, 75 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index d8c401c8978..d7c2a5a5ea7 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -583,41 +583,37 @@ FileMonikerImpl_BindToObject(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft */ static HRESULT WINAPI FileMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, - REFIID riid, VOID** ppvObject) + REFIID riid, void **object) { - LPOLESTR filePath=0; - IStorage *pstg=0; - HRESULT res; - - TRACE("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvObject); - - if (pmkToLeft==NULL){ + FileMonikerImpl *moniker = impl_from_IMoniker(iface); + BIND_OPTS bind_opts; + HRESULT hr; - if (IsEqualIID(&IID_IStorage, riid)){ + TRACE("(%p,%p,%p,%s,%p)\n", iface, pbc, pmkToLeft, debugstr_guid(riid), object); - /* get the file name */ - IMoniker_GetDisplayName(iface,pbc,pmkToLeft,&filePath); - - res=StgOpenStorage(filePath,NULL,STGM_READWRITE|STGM_SHARE_DENY_WRITE,NULL,0,&pstg); + if (!pbc) + return E_INVALIDARG; - if (SUCCEEDED(res)) - *ppvObject=pstg; + bind_opts.cbStruct = sizeof(bind_opts); + hr = IBindCtx_GetBindOptions(pbc, &bind_opts); + if (FAILED(hr)) + return hr; - CoTaskMemFree(filePath); + if (!pmkToLeft) + { + if (IsEqualIID(&IID_IStorage, riid)) + { + return StgOpenStorage(moniker->filePathName, NULL, bind_opts.grfMode, NULL, 0, (IStorage **)object); } + else if ((IsEqualIID(&IID_IStream, riid)) || (IsEqualIID(&IID_ILockBytes, riid))) + return E_FAIL; else - if ( (IsEqualIID(&IID_IStream, riid)) || (IsEqualIID(&IID_ILockBytes, riid)) ) - return E_FAIL; - else - return E_NOINTERFACE; + return E_NOINTERFACE; } - else { - FIXME("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvObject); + FIXME("(%p,%p,%p,%s,%p)\n", iface, pbc, pmkToLeft, debugstr_guid(riid), object); - return E_NOTIMPL; - } - return res; + return E_NOTIMPL; } /****************************************************************************** diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 6be75f75c28..8d9c0678436 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1980,7 +1980,13 @@ static void test_file_monikers(void) */ {0x20ac, 0x2020, 0x100, 0x101, 0x102, 0x103, 0x104, 0x105, 0x106, 0x107, 0x108, 0x109, 0x10a, 0x10b, 0x10c, 0}, }; - + WCHAR filename[MAX_PATH], path[MAX_PATH]; + BIND_OPTS bind_opts; + IMoniker *moniker; + IStorage *storage; + IBindCtx *bindctx; + STATSTG statstg; + HRESULT hr; int i; trace("ACP is %u\n", GetACP()); @@ -2004,6 +2010,53 @@ static void test_file_monikers(void) test_file_moniker(wszFile[i]); } } + + /* BindToStorage() */ + GetTempPathW(MAX_PATH, path); + GetTempFileNameW(path, L"stg", 1, filename); + + hr = StgCreateStorageEx(filename, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, STGFMT_STORAGE, + 0, NULL, NULL, &IID_IStorage, (void **)&storage); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IStorage_Release(storage); + + hr = CreateFileMoniker(filename, &moniker); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IStorage, (void **)&storage); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = CreateBindCtx(0, &bindctx); + ok(hr == S_OK, "Failed to create bind context, hr %#x.\n", hr); + + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IStorage, (void **)&storage); + ok(hr == STG_E_INVALIDFLAG, "Unexpected hr %#x.\n", hr); + + bind_opts.cbStruct = sizeof(bind_opts); + bind_opts.grfMode = STGM_READWRITE | STGM_SHARE_DENY_WRITE; + hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IStorage, (void **)&storage); + ok(hr == STG_E_INVALIDFLAG, "Unexpected hr %#x.\n", hr); + + bind_opts.grfMode = STGM_READ | STGM_SHARE_DENY_WRITE; + hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IStorage, (void **)&storage); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + memset(&statstg, 0, sizeof(statstg)); + hr = IStorage_Stat(storage, &statstg, STATFLAG_NONAME); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(statstg.grfMode == (STGM_READ | STGM_SHARE_DENY_WRITE), "Unexpected mode %#x.\n", statstg.grfMode); + + IStorage_Release(storage); + IBindCtx_Release(bindctx); + IMoniker_Release(moniker); + + DeleteFileW(filename); } static void test_item_moniker(void) -- 2.33.0

1 2

[PATCH v2 1/5] nsiproxy: Return the IOSB status from nsi_ioctl().
by Zebediah Figura 13 Sep '21

13 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/nsiproxy.sys/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index c4db45dfad2..80a025acfc9 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -159,6 +159,7 @@ static void nsiproxy_get_parameter( IRP *irp ) static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + NTSTATUS status; TRACE( "ioctl %x insize %u outsize %u\n", irpsp->Parameters.DeviceIoControl.IoControlCode, @@ -185,8 +186,9 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) break; } + status = irp->IoStatus.u.Status; IoCompleteRequest( irp, IO_NO_INCREMENT ); - return STATUS_SUCCESS; + return status; } static int add_device( DRIVER_OBJECT *driver ) -- 2.33.0

2 5

[PATCH v4 1/2] oleacc: Check proper GUI thread for window focus.
by Connor McAdams 12 Sep '21

12 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> --- -v4: Switch from checking the GUI thread data of the HWND we're checking to the foreground window's GUI thread data. dlls/oleacc/client.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 3b33be55a21..0c2215fe62e 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -227,6 +227,7 @@ static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARI static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VARIANT *pvarState) { Client *This = impl_from_Client(iface); + GUITHREADINFO info; LONG style; TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarState); @@ -244,7 +245,9 @@ static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VAR V_I4(pvarState) |= STATE_SYSTEM_UNAVAILABLE; else if(IsWindow(This->hwnd)) V_I4(pvarState) |= STATE_SYSTEM_FOCUSABLE; - if(GetFocus() == This->hwnd) + + info.cbSize = sizeof(info); + if(GetGUIThreadInfo(0, &info) && info.hwndFocus == This->hwnd) V_I4(pvarState) |= STATE_SYSTEM_FOCUSED; if(!(style & WS_VISIBLE)) V_I4(pvarState) |= STATE_SYSTEM_INVISIBLE; -- 2.25.1

1 1

[PATCH v2] user32: When converting strings from A->W, ignore handles/resources
by Fabian Maurer 12 Sep '21

12 Sep '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51583 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/tests/msg.c | 3 +++ dlls/user32/winproc.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9867e319d58..3be5ccfd651 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15981,6 +15981,9 @@ static void test_desktop_winproc(void) DestroyWindow(hwnd); + /* Test invalid text with WM_SETTEXT. This must not crash. */ + SendMessageA(GetDesktopWindow(), WM_SETTEXT, 0, (LPARAM)55); + out_unregister: UnregisterClassA("TestDesktopClass", instance); } diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 81fbcab928d..00b79b3b006 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -494,6 +494,8 @@ LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, case LB_ADDFILE: case EM_REPLACESEL: if (!lParam) ret = callback( hwnd, msg, wParam, lParam, result, arg ); + else if (IS_INTRESOURCE(lParam)) /* Check for handles/IDs similar to DEFWND_SetTextA */ + return 0; else { WCHAR *ptr, buffer[512]; -- 2.33.0

2 1

[PATCH] po: Update on Brazilian Portuguese
by Roberto Pungartnik 12 Sep '21

12 Sep '21

1 0

[PATCH] msvcrt: Improve memset performance on i386 and x86_64 architectures.
by Piotr Caban 12 Sep '21

12 Sep '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 126 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+)

3 4

[PATCH v2] msvcrt: Add an ermsb-based memset for x86/64.
by Guillaume Charifi 12 Sep '21

12 Sep '21

Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/msvcrt/string.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 4d09405094d..6d1500cb194 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2527,6 +2527,7 @@ int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") \ "popq " SRC_REG "\n\t" \ __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + #endif void * __cdecl sse2_memmove(void *dst, const void *src, size_t n); @@ -2732,6 +2733,64 @@ __ASM_GLOBAL_FUNC( sse2_memmove, MEMMOVE_CLEANUP "ret" ) +#undef DEST_REG +#undef SRC_REG +#undef LEN_REG +#undef TMP_REG + +#ifdef __i386__ + +#define DEST_REG "%edi" +#define SRC_REG "%eax" +#define LEN_REG "%ecx" +#define TMP_REG + +#define MEMSET_INIT \ + "pushl " DEST_REG "\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + "movl 8(%esp), " DEST_REG "\n\t" \ + "movl 12(%esp), " SRC_REG "\n\t" \ + "movl 16(%esp), " LEN_REG "\n\t" + +#define MEMSET_CLEANUP \ + "movl 8(%esp), %eax\n\t" \ + "popl " DEST_REG "\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + +#else + +#define DEST_REG "%rdi" +#define SRC_REG "%rax" +#define LEN_REG "%rcx" +#define TMP_REG "%r9" + +#define MEMSET_INIT \ + "pushq " DEST_REG "\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") \ + "movq %rcx, " DEST_REG "\n\t" \ + "movq %rdx, " SRC_REG "\n\t" \ + "movq %r8, " LEN_REG "\n\t" \ + "movq " DEST_REG ", " TMP_REG "\n\t" + +#define MEMSET_CLEANUP \ + "movq " TMP_REG ", %rax\n\t" \ + "popq " DEST_REG "\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + +#endif + +void * __cdecl ermsb_memset(void *dst, int c, size_t n); +__ASM_GLOBAL_FUNC( ermsb_memset, + MEMSET_INIT + "rep stosb\n\t" + MEMSET_CLEANUP + "ret" ) + +#undef DEST_REG +#undef SRC_REG +#undef LEN_REG +#undef TMP_REG + #endif /********************************************************************* @@ -2860,9 +2919,13 @@ void * __cdecl memcpy(void *dst, const void *src, size_t n) */ void* __cdecl memset(void *dst, int c, size_t n) { +#if defined(__i386__) || defined(__x86_64__) + return ermsb_memset(dst, c, n); +#else volatile unsigned char *d = dst; /* avoid gcc optimizations */ while (n--) *d++ = c; return dst; +#endif } /********************************************************************* -- 2.33.0

5 6

[PATCH] include: Add icodecapi.idl
by Alistair Leslie-Hughes 12 Sep '21

12 Sep '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/icodecapi.idl | 64 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 include/icodecapi.idl diff --git a/include/Makefile.in b/include/Makefile.in index 43a4fd98a42..eac1c2e0570 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -338,6 +338,7 @@ SOURCES = \ icftypes.idl \ icm.h \ icmpapi.h \ + icodecapi.idl \ idispids.h \ ieautomation.idl \ iextag.idl \ diff --git a/include/icodecapi.idl b/include/icodecapi.idl new file mode 100644 index 00000000000..7954b3fc2f6 --- /dev/null +++ b/include/icodecapi.idl @@ -0,0 +1,64 @@ +/* + * Copyright 2021 Alistair Leslie-Hughes + * + * 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 + * + */ + +import "unknwn.idl"; +import "oaidl.idl"; + +interface IStream; + +struct CodecAPIEventData +{ + GUID guid; + DWORD dataLength; + DWORD reserved[3]; +}; + +[ + uuid(901db4c7-31ce-41a2-85dc-8fa0bf41b8da), + local, + object, + pointer_default(unique) +] +interface ICodecAPI : IUnknown +{ + HRESULT IsSupported ([in] const GUID *api); + HRESULT IsModifiable ([in] const GUID *api); + + HRESULT GetParameterRange ([in] const GUID *api, [out] VARIANT *min, [out] VARIANT *max, [out] VARIANT *delta); + HRESULT GetParameterValues ([in] const GUID *api, [out, size_is(,*count)] VARIANT **values, [out] ULONG *count); + HRESULT GetParameterValues ([in] const GUID *api, [out, size_is(,*count)] VARIANT **values, [out] ULONG *count); + HRESULT GetDefaultValue ([in] const GUID *api, [out] VARIANT *value); + + HRESULT GetValue ([in] const GUID *api, [out] VARIANT *value); + HRESULT SetValue ([in] const GUID *api, [in] VARIANT *value); + + HRESULT RegisterForEvent ([in] const GUID *api, [in] LONG_PTR userData); + HRESULT UnregisterForEvent ([in] const GUID *api); + + HRESULT SetAllDefaults(void); + + HRESULT SetValueWithNotify ([in] const GUID *api, [in] VARIANT *value, [out, size_is(,*count)] GUID **param, [out] ULONG *count); + + HRESULT SetAllDefaultsWithNotify([out, size_is(,*count)] GUID **param, [out] ULONG *count); + + HRESULT GetAllSettings([in] IStream *stream); + HRESULT SetAllSettings([in] IStream *stream); + + HRESULT SetAllSettingsWithNotify([in] IStream* stream, [out, size_is(,*count)] GUID **param, [out] ULONG *count); +} -- 2.33.0

1 0

[PATCH v2 1/3] msi: Set dialog as parent in subsequent dialog
by Fabian Maurer 11 Sep '21

11 Sep '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51576 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msi/dialog.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 703f9d43957..6463c3062ac 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3904,7 +3904,7 @@ static void process_pending_messages( HWND hdlg ) static UINT dialog_run_message_loop( msi_dialog *dialog ) { DWORD style; - HWND hwnd; + HWND hwnd, parent; if( uiThreadId != GetCurrentThreadId() ) return SendMessageW( hMsiHiddenWindow, WM_MSI_DIALOG_CREATE, 0, (LPARAM) dialog ); @@ -3917,9 +3917,11 @@ static UINT dialog_run_message_loop( msi_dialog *dialog ) if (dialog->parent == NULL && (dialog->attributes & msidbDialogAttributesMinimize)) style |= WS_MINIMIZEBOX; + parent = dialog->parent ? dialog->parent->hwnd : 0; + hwnd = CreateWindowW( L"MsiDialogCloseClass", dialog->name, style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - NULL, NULL, NULL, dialog ); + parent, NULL, NULL, dialog ); if( !hwnd ) { ERR("Failed to create dialog %s\n", debugstr_w( dialog->name )); -- 2.33.0

1 2

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 11 Sep '21

11 Sep '21

2 1

[PATCH 00/10] Third step for Dwarf 3/4 support in DbgHelp
by Eric Pouech 11 Sep '21

11 Sep '21

Dwarf3/4 adds a couple of structural modifications: - either 32bit or 64bit internal offsets - some attributes size have been changed across version - some section headers evolution (one more field in line section header) - GCC added some FORM extensions This serie adds support for those, and some more code hardening. This serie should finish covering the structural changes in dwarf3/4, and the loading of dwarf4 modules should (shriek) be possible, even it lots of new features of dwarf4 are not supported yet. Expect though lots of FIXME:s and potential non functional stuff. When this serie is committed, I'd appreciate feeback of running debugging stuff with DBGHELP_DWARF_VERSION env variable set to 4. As wine's modules are still compiled with dwarf2, and distros are moving to dwarf5, the loadable dwarf4 modules are a scarse resource ;-) A+ --- Eric Pouech (10): dbghelp{dwarf}: don't recompute location when said location is complex dbghelp{dwarf}: properly parse 32 vs bit 64bit entities dbghelp{dwarf}: correctly handle attributes according to 32bit or 64bit format dbghelp{dwarf}: Added support for FORM_loc_offset, FORM_sec_offset dbghelp{dwarf}: Added support for FORM_exprloc dbghelp{dwarf}: handle errors in dwarf2_fill_attr by returning a boolean dbghelp{dwarf}: added definitions of some GNU extenstions for FORM:s. dbghelp{dwarf}: Validate that a string is in the section boundary before using it dbghelp{dwarf}: Detect auto reference between a dwarf's DIE and its type dbghelp: Properly parse line number header for DWARF4 debug info dlls/dbghelp/dwarf.c | 148 +++++++++++++++++++++++++++++++++---------- dlls/dbghelp/dwarf.h | 5 ++ 2 files changed, 118 insertions(+), 35 deletions(-)

1 10

[PATCH] ntdll: resolve drive symlink for mapped filename
by Matias Zuniga 11 Sep '21

11 Sep '21

Applications expect a path starting with a drive like '\Device\Harddisk1\' instead of a drive letter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51687 Signed-off-by: Matias Zuniga <matias.nicolas.zc(a)gmail.com> --- dlls/ntdll/unix/virtual.c | 76 ++++++++++++++++++++++++++++++++--- dlls/psapi/tests/psapi_main.c | 5 +-- 2 files changed, 71 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 8a1e35b6387..04eddf0e6f1 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -133,6 +133,8 @@ struct file_view } \ } while (0); +#define SYMBOLIC_LINK_QUERY 0x0001 + /* per-page protection flags */ #define VPROT_READ 0x01 #define VPROT_WRITE 0x02 @@ -4273,34 +4275,96 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, return STATUS_SUCCESS; } +static NTSTATUS read_nt_symlink( UNICODE_STRING *name, WCHAR *target, DWORD size ) +{ + NTSTATUS status; + OBJECT_ATTRIBUTES attr; + HANDLE handle; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = name; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if (!(status = NtOpenSymbolicLinkObject( &handle, SYMBOLIC_LINK_QUERY, &attr ))) + { + UNICODE_STRING targetW; + targetW.Buffer = target; + targetW.MaximumLength = (size - 1) * sizeof(WCHAR); + status = NtQuerySymbolicLinkObject( handle, &targetW, NULL ); + if (!status) target[targetW.Length / sizeof(WCHAR)] = 0; + NtClose( handle ); + } + return status; +} + +static NTSTATUS follow_device_symlink( WCHAR *buffer, SIZE_T max_path_len, WCHAR *name, SIZE_T *current_path_len ) +{ + WCHAR *p = buffer; + NTSTATUS status = STATUS_SUCCESS; + SIZE_T devname_len = 6; // e.g. \??\C: + UNICODE_STRING devname; + DWORD target_len; + + if (*current_path_len >= devname_len * sizeof(WCHAR) && name[devname_len - 1] == ':') { + devname.Buffer = name; + devname.Length = devname_len * sizeof(WCHAR); + if (!(status = read_nt_symlink( &devname, p, (max_path_len - *current_path_len) / sizeof(WCHAR) + devname_len + 1 ))) + { + target_len = lstrlenW(p); + *current_path_len -= devname_len * sizeof(WCHAR); // skip the device name + p += target_len; + + memcpy( p, name + devname_len, *current_path_len ); + *current_path_len += target_len * sizeof(WCHAR); + } + } + else memcpy( p, name, *current_path_len ); + + return status; +} + static NTSTATUS get_memory_section_name( HANDLE process, LPCVOID addr, MEMORY_SECTION_NAME *info, SIZE_T len, SIZE_T *ret_len ) { + SIZE_T current_path_len, max_path_len; + WCHAR *name; NTSTATUS status; if (!info) return STATUS_ACCESS_VIOLATION; + max_path_len = len - sizeof(*info) - sizeof(WCHAR); // dont count null char + if (!(name = malloc( max_path_len ))) return STATUS_NO_MEMORY; SERVER_START_REQ( get_mapping_filename ) { req->process = wine_server_obj_handle( process ); req->addr = wine_server_client_ptr( addr ); if (len > sizeof(*info) + sizeof(WCHAR)) - wine_server_set_reply( req, info + 1, len - sizeof(*info) - sizeof(WCHAR) ); + wine_server_set_reply( req, name, max_path_len ); status = wine_server_call( req ); if (!status || status == STATUS_BUFFER_OVERFLOW) { - if (ret_len) *ret_len = sizeof(*info) + reply->len + sizeof(WCHAR); - if (len < sizeof(*info)) status = STATUS_INFO_LENGTH_MISMATCH; + current_path_len = reply->len; + if (len < sizeof(*info)) + { + status = STATUS_INFO_LENGTH_MISMATCH; + } + else if (!status) status = follow_device_symlink( (WCHAR *)(info + 1), max_path_len, name, &current_path_len); + + if (ret_len) *ret_len = sizeof(*info) + current_path_len + sizeof(WCHAR); if (!status) { info->SectionFileName.Buffer = (WCHAR *)(info + 1); - info->SectionFileName.Length = reply->len; - info->SectionFileName.MaximumLength = reply->len + sizeof(WCHAR); - info->SectionFileName.Buffer[reply->len / sizeof(WCHAR)] = 0; + info->SectionFileName.Length = current_path_len; + info->SectionFileName.MaximumLength = current_path_len + sizeof(WCHAR); + info->SectionFileName.Buffer[current_path_len / sizeof(WCHAR)] = 0; } } } SERVER_END_REQ; + free(name); return status; } diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index c4a740310a4..d6fb8e69384 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -471,7 +471,6 @@ static void test_GetMappedFileName(void) ret = GetMappedFileNameA(GetCurrentProcess(), base, map_name, sizeof(map_name)); ok(ret, "GetMappedFileName error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); - todo_wine ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); SetLastError(0xdeadbeef); @@ -482,7 +481,6 @@ static void test_GetMappedFileName(void) { ok(memcmp(map_nameW, nt_map_name, lstrlenW(map_nameW)) == 0, "map name does not start with a device name: %s\n", map_name); WideCharToMultiByte(CP_ACP, 0, map_nameW, -1, map_name, MAX_PATH, NULL, NULL); - todo_wine ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); } @@ -490,7 +488,6 @@ static void test_GetMappedFileName(void) ret = GetMappedFileNameA(GetCurrentProcess(), base + 0x2000, map_name, sizeof(map_name)); ok(ret, "GetMappedFileName error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); - todo_wine ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); SetLastError(0xdeadbeef); @@ -566,7 +563,7 @@ static void test_GetProcessImageFileName(void) { /* Windows returns 2*strlen-1 */ ok(ret >= strlen(szImgPath), "szImgPath=\"%s\" ret=%d\n", szImgPath, ret); - todo_wine ok(!strcmp(szImgPath, szMapPath), "szImgPath=\"%s\" szMapPath=\"%s\"\n", szImgPath, szMapPath); + ok(!strcmp(szImgPath, szMapPath), "szImgPath=\"%s\" szMapPath=\"%s\"\n", szImgPath, szMapPath); } SetLastError(0xdeadbeef); -- 2.31.1

2 1

Bug 47486 - Monochrome icons with {white, black} color table
by Fabian Maurer 11 Sep '21

11 Sep '21

Hello, this is about https://bugs.winehq.org/show_bug.cgi?id=47486 The program has a monochrome icon with white as the first entry in its color table, which is forbidden according to the comment in the code: > * Note : If the first color in the color table is white followed by > * black, we can't convert it to a monochrome DDB with > * SetDIBits, because black and white would be inverted. But when the bitmap is loaded as color bitmap instead of monochrome icon, the background is rendered white instead of transparent. Is that comment still up to date, and if so, how should we deal with that case? Regards, Fabian Maurer

1 0

Wine staging 6.17 release
by Alistair Leslie-Hughes 10 Sep '21

10 Sep '21

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.17 (604 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * shlwapi: Fix the return value of SHAddDataBlock Added: * None Updated: * wined3d-zero-inf-shaders Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/6] d3d10/tests: Test SystemValueType field.
by Nikolay Sivov 10 Sep '21

10 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/tests/effect.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 60db5ad55be..7923f70ed1e 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3698,18 +3698,25 @@ if (0) hr = ps->lpVtbl->GetOutputSignatureElementDesc(ps, 0, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "SV_Target"), "Unexpected semantic %s.\n", sign.SemanticName); +todo_wine + ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); hr = ps->lpVtbl->GetOutputSignatureElementDesc(ps, 4, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", + sign.SystemValueType); hr = ps->lpVtbl->GetInputSignatureElementDesc(ps, 0, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", + sign.SystemValueType); hr = ps->lpVtbl->GetInputSignatureElementDesc(ps, 4, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); v = effect->lpVtbl->GetVariableByName(effect, "v"); vs = v->lpVtbl->AsShader(v); @@ -3717,18 +3724,24 @@ if (0) hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 0, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", + sign.SystemValueType); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 1, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", + sign.SystemValueType); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 0, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 1, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); /* NULL shader variable */ v = effect->lpVtbl->GetVariableByName(effect, "v0"); @@ -3746,6 +3759,8 @@ if (0) hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 3, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", + sign.SystemValueType); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 0, 0, &sign); ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); @@ -3759,6 +3774,7 @@ if (0) hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 3, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); effect->lpVtbl->Release(effect); -- 2.33.0

3 13

[PATCH] msvcrt: Remove CDECL on static functions where not needed.
by Francois Gouget 10 Sep '21

10 Sep '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msvcrt/locale.c | 4 ++-- dlls/msvcrt/math.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 5a4a701dfc6..4c0fce194bd 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -556,7 +556,7 @@ void CDECL _unlock_locales(void) _unlock(_SETLOCALE_LOCK); } -static void CDECL grab_locinfo(pthreadlocinfo locinfo) +static void grab_locinfo(pthreadlocinfo locinfo) { int i; @@ -578,7 +578,7 @@ static void CDECL grab_locinfo(pthreadlocinfo locinfo) InterlockedIncrement(&locinfo->lc_time_curr->refcount); } -static void CDECL update_thread_locale(thread_data_t *data) +static void update_thread_locale(thread_data_t *data) { if((data->locale_flags & LOCALE_FREE) && ((data->locale_flags & LOCALE_THREAD) || (data->locinfo == MSVCRT_locale->locinfo && data->mbcinfo == MSVCRT_locale->mbcinfo))) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index efdde8e4afb..7f59a4d20d4 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -90,7 +90,7 @@ static inline double fp_barrier(double x) return y; } -static inline double CDECL ret_nan( BOOL update_sw ) +static inline double ret_nan( BOOL update_sw ) { double x = 1.0; if (!update_sw) return -NAN; @@ -2663,7 +2663,7 @@ double CDECL cos( double x ) } /* Copied from musl: src/math/expm1.c */ -static double CDECL __expm1(double x) +static double __expm1(double x) { static const double o_threshold = 7.09782712893383973096e+02, ln2_hi = 6.93147180369123816490e-01, -- 2.30.2

4 3

[PATCH 1/4] ntoskrnl: Report IRP completion via get_next_device_request if possible.
by Zebediah Figura 10 Sep '21

10 Sep '21

Although there is arguably an advantage to saving a server request, the impetus for this patch is make it easier for the server to process the IRP return status before (or at the same time as) it processes the IOSB status. This allows simpler handling of the case where the IRP handler returns STATUS_PENDING but completes the IRP before returning. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 150 +++++++++++++++++++++++++---------- server/device.c | 21 ++--- server/protocol.def | 2 + 3 files changed, 123 insertions(+), 50 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f7a9d8e8efe..b4d038c299b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -76,6 +76,14 @@ static void *ldr_notify_cookie; static PLOAD_IMAGE_NOTIFY_ROUTINE load_image_notify_routines[8]; static unsigned int load_image_notify_routine_count; +struct irp_data +{ + HANDLE handle; + IRP *irp; + BOOL async; + BOOL complete; +}; + static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry *entry ) { const struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, const struct wine_driver, entry ); @@ -419,10 +427,23 @@ static void *create_file_object( HANDLE handle ) DECLARE_CRITICAL_SECTION(irp_completion_cs); +static void free_dispatch_irp( struct irp_data *irp_data ) +{ + IRP *irp = irp_data->irp; + + if (irp->UserBuffer != irp->AssociatedIrp.SystemBuffer) + { + HeapFree( GetProcessHeap(), 0, irp->UserBuffer ); + irp->UserBuffer = NULL; + } + + free( irp_data ); +} + /* transfer result of IRP back to wineserver */ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) { - HANDLE irp_handle = context; + struct irp_data *irp_data = context; void *out_buff = irp->UserBuffer; NTSTATUS status; @@ -431,9 +452,17 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, EnterCriticalSection( &irp_completion_cs ); + irp_data->complete = TRUE; + if (!irp_data->async) + { + /* main loop will report completion via get_next_device_request */ + LeaveCriticalSection( &irp_completion_cs ); + return STATUS_MORE_PROCESSING_REQUIRED; + } + SERVER_START_REQ( set_irp_result ) { - req->handle = wine_server_obj_handle( irp_handle ); + req->handle = wine_server_obj_handle( irp_data->handle ); req->status = irp->IoStatus.u.Status; req->size = irp->IoStatus.Information; if (!NT_ERROR(irp->IoStatus.u.Status)) @@ -444,11 +473,7 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, } SERVER_END_REQ; - if (irp->UserBuffer != irp->AssociatedIrp.SystemBuffer) - { - HeapFree( GetProcessHeap(), 0, irp->UserBuffer ); - irp->UserBuffer = NULL; - } + free_dispatch_irp( irp_data ); LeaveCriticalSection( &irp_completion_cs ); return status; @@ -458,26 +483,36 @@ struct dispatch_context { irp_params_t params; HANDLE handle; - IRP *irp; + struct irp_data *irp_data; ULONG in_size; void *in_buff; }; -static void dispatch_irp( DEVICE_OBJECT *device, IRP *irp, struct dispatch_context *context ) +static NTSTATUS dispatch_irp( DEVICE_OBJECT *device, IRP *irp, struct dispatch_context *context ) { + struct irp_data *irp_data; LARGE_INTEGER count; - IoSetCompletionRoutine( irp, dispatch_irp_completion, context->handle, TRUE, TRUE, TRUE ); + if (!(irp_data = malloc( sizeof(*irp_data) ))) + return STATUS_NO_MEMORY; + irp_data->handle = context->handle; + irp_data->irp = irp; + irp_data->async = FALSE; + irp_data->complete = FALSE; + + IoSetCompletionRoutine( irp, dispatch_irp_completion, irp_data, TRUE, TRUE, TRUE ); + context->irp_data = irp_data; context->handle = 0; KeQueryTickCount( &count ); /* update the global KeTickCount */ - context->irp = irp; device->CurrentIrp = irp; KeEnterCriticalRegion(); IoCallDriver( device, irp ); KeLeaveCriticalRegion(); device->CurrentIrp = NULL; + + return STATUS_SUCCESS; } /* process a create request for a given file */ @@ -520,9 +555,7 @@ static NTSTATUS dispatch_create( struct dispatch_context *context ) irp->UserEvent = NULL; irp->Flags |= IRP_CREATE_OPERATION; - dispatch_irp( device, irp, context ); - - return STATUS_SUCCESS; + return dispatch_irp( device, irp, context ); } /* process a close request for a given file */ @@ -558,9 +591,7 @@ static NTSTATUS dispatch_close( struct dispatch_context *context ) irp->UserEvent = NULL; irp->Flags |= IRP_CLOSE_OPERATION; - dispatch_irp( device, irp, context ); - - return STATUS_SUCCESS; + return dispatch_irp( device, irp, context ); } /* process a read request for a given device */ @@ -600,9 +631,7 @@ static NTSTATUS dispatch_read( struct dispatch_context *context ) irp->Flags |= IRP_READ_OPERATION; irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate out_buff */ - dispatch_irp( device, irp, context ); - - return STATUS_SUCCESS; + return dispatch_irp( device, irp, context ); } /* process a write request for a given device */ @@ -636,9 +665,7 @@ static NTSTATUS dispatch_write( struct dispatch_context *context ) irp->Flags |= IRP_WRITE_OPERATION; irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate in_buff */ - dispatch_irp( device, irp, context ); - - return STATUS_SUCCESS; + return dispatch_irp( device, irp, context ); } /* process a flush request for a given device */ @@ -665,9 +692,7 @@ static NTSTATUS dispatch_flush( struct dispatch_context *context ) irpsp = IoGetNextIrpStackLocation( irp ); irpsp->FileObject = file; - dispatch_irp( device, irp, context ); - - return STATUS_SUCCESS; + return dispatch_irp( device, irp, context ); } /* process an ioctl request for a given device */ @@ -680,6 +705,7 @@ static NTSTATUS dispatch_ioctl( struct dispatch_context *context ) DEVICE_OBJECT *device; FILE_OBJECT *file = wine_server_get_ptr( context->params.ioctl.file ); ULONG out_size = context->params.ioctl.out_size; + NTSTATUS status; if (!file) return STATUS_INVALID_HANDLE; @@ -728,10 +754,10 @@ static NTSTATUS dispatch_ioctl( struct dispatch_context *context ) context->in_buff = NULL; irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate in_buff */ - dispatch_irp( device, irp, context ); + status = dispatch_irp( device, irp, context ); HeapFree( GetProcessHeap(), 0, to_free ); - return STATUS_SUCCESS; + return status; } /* process a volume information request for a given device */ @@ -778,9 +804,7 @@ static NTSTATUS dispatch_volume( struct dispatch_context *context ) context->in_buff = NULL; irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate out_buff */ - dispatch_irp( device, irp, context ); - - return STATUS_SUCCESS; + return dispatch_irp( device, irp, context ); } static NTSTATUS dispatch_free( struct dispatch_context *context ) @@ -874,16 +898,11 @@ PEPROCESS PsInitialSystemProcess = NULL; NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) { HANDLE manager = get_device_manager(); - struct dispatch_context context; + struct dispatch_context context = {.in_size = 4096}; NTSTATUS status = STATUS_SUCCESS; struct wine_driver *driver; HANDLE handles[2]; - context.handle = NULL; - context.irp = NULL; - context.in_size = 4096; - context.in_buff = NULL; - /* Set the system process global before setting up the request thread trickery */ PsInitialSystemProcess = IoGetCurrentProcess(); request_thread = GetCurrentThreadId(); @@ -903,12 +922,47 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) goto done; } + EnterCriticalSection( &irp_completion_cs ); + SERVER_START_REQ( get_next_device_request ) { req->manager = wine_server_obj_handle( manager ); req->prev = wine_server_obj_handle( context.handle ); - req->user_ptr = wine_server_client_ptr( context.irp ); - req->status = status; + + if (context.irp_data) + { + IRP *irp = context.irp_data->irp; + + req->user_ptr = wine_server_client_ptr( irp ); + + if (context.irp_data->complete) + { + /* IRP completed even before we got here; we can report completion now */ + void *out_buff = irp->UserBuffer; + + if (irp->Flags & IRP_WRITE_OPERATION) + out_buff = NULL; /* do not transfer back input buffer */ + + req->prev = wine_server_obj_handle( context.irp_data->handle ); + req->status = irp->IoStatus.u.Status; + req->result = irp->IoStatus.Information; + if (!NT_ERROR(irp->IoStatus.u.Status) && out_buff) + wine_server_add_data( req, out_buff, irp->IoStatus.Information ); + } + else + { + if (status == STATUS_SUCCESS) + status = STATUS_PENDING; + + req->status = status; + } + } + else + { + req->user_ptr = 0; + req->status = status; + } + wine_server_set_reply( req, context.in_buff, context.in_size ); if (!(status = wine_server_call( req ))) { @@ -924,10 +978,26 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) if (status == STATUS_BUFFER_OVERFLOW) context.in_size = reply->in_size; } - context.irp = NULL; } SERVER_END_REQ; + if (context.irp_data) + { + if (context.irp_data->complete) + { + IoCompleteRequest( context.irp_data->irp, IO_NO_INCREMENT ); + free_dispatch_irp( context.irp_data ); + } + else + { + context.irp_data->async = TRUE; + } + } + + LeaveCriticalSection( &irp_completion_cs ); + + context.irp_data = NULL; + switch (status) { case STATUS_SUCCESS: diff --git a/server/device.c b/server/device.c index a2383ecdc7c..b0e417a6473 100644 --- a/server/device.c +++ b/server/device.c @@ -946,22 +946,25 @@ DECL_HANDLER(get_next_device_request) 0, &device_manager_ops ))) return; - if (req->prev) close_handle( current->process, req->prev ); /* avoid an extra round-trip for close */ - /* process result of previous call */ if (manager->current_call) { irp = manager->current_call; irp->user_ptr = req->user_ptr; - if (req->status) - set_irp_result( irp, req->status, NULL, 0, 0 ); - if (irp->canceled) - /* if it was canceled during dispatch, we couldn't queue cancel call without client pointer, - * so we need to do it now */ - cancel_irp_call( irp ); + if (req->prev) + { + set_irp_result( irp, req->status, get_req_data(), get_req_data_size(), req->result ); + close_handle( current->process, req->prev ); /* avoid an extra round-trip for close */ + } else if (irp->async) + { set_async_pending( irp->async ); + if (irp->canceled) + /* if it was canceled during dispatch, we couldn't queue cancel call without client pointer, + * so we need to do it now */ + cancel_irp_call( irp ); + } free_irp_params( irp ); release_object( irp ); @@ -1019,8 +1022,6 @@ DECL_HANDLER(set_irp_result) if ((irp = (struct irp_call *)get_handle_obj( current->process, req->handle, 0, &irp_call_ops ))) { set_irp_result( irp, req->status, get_req_data(), get_req_data_size(), req->size ); - /* we may be still dispatching the IRP. don't bother queuing cancel if it's already complete */ - irp->canceled = 0; close_handle( current->process, req->handle ); /* avoid an extra round-trip for close */ release_object( irp ); } diff --git a/server/protocol.def b/server/protocol.def index 133d6ad0552..fec212a3ea3 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3368,6 +3368,8 @@ struct handle_info obj_handle_t prev; /* handle to the previous irp */ unsigned int status; /* status of the previous irp */ client_ptr_t user_ptr; /* user pointer of the previous irp */ + data_size_t result; /* IOSB result of the previous irp */ + VARARG(data,bytes); /* output data of the previous irp */ @REPLY irp_params_t params; /* irp parameters */ obj_handle_t next; /* handle to the next irp */ -- 2.33.0

2 4

[PATCH 5/5] wined3d: Use wined3d_mask_from_size() in wined3d_fixup_alpha().
by Henri Verbeet 10 Sep '21

10 Sep '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6663e788e9c..08b57cf1a36 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2358,7 +2358,7 @@ static void wined3d_fixup_alpha(const struct wined3d_format *format, const uint8 unsigned int x, y; byte_count = format->byte_count; - alpha_mask = ((1u << format->alpha_size) - 1) << format->alpha_offset; + alpha_mask = wined3d_mask_from_size(format->alpha_size) << format->alpha_offset; switch (byte_count) { -- 2.20.1

1 0

[PATCH 4/5] wined3d: Use WGL_SWAP_COPY_ARB for swapchains with COPY swap effects, if available.
by Henri Verbeet 10 Sep '21

10 Sep '21

Avoiding the (slow) GDI present path. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 7 +++++-- dlls/wined3d/context_gl.c | 30 ++++++++++++++++++------------ dlls/wined3d/swapchain.c | 5 ++++- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 902b9620f30..e5cca225b6f 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4120,8 +4120,8 @@ static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter_gl *adapter_gl, { UINT attrib_count = 0; GLint cfg_count; - int attribs[11]; - int values[11]; + int attribs[12]; + int values[12]; int attribute; attribute = WGL_NUMBER_PIXEL_FORMATS_ARB; @@ -4139,6 +4139,7 @@ static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter_gl *adapter_gl, attribs[attrib_count++] = WGL_PIXEL_TYPE_ARB; attribs[attrib_count++] = WGL_DOUBLE_BUFFER_ARB; attribs[attrib_count++] = WGL_AUX_BUFFERS_ARB; + attribs[attrib_count++] = WGL_SWAP_METHOD_ARB; for (i = 0, adapter_gl->pixel_format_count = 0; i < cfg_count; ++i) { @@ -4160,6 +4161,7 @@ static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter_gl *adapter_gl, cfg->iPixelType = values[8]; cfg->doubleBuffer = values[9]; cfg->auxBuffers = values[10]; + cfg->swap_method = values[11]; cfg->numSamples = 0; /* Check multisample support. */ @@ -4225,6 +4227,7 @@ static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter_gl *adapter_gl, cfg->iPixelType = (pfd.iPixelType == PFD_TYPE_RGBA) ? WGL_TYPE_RGBA_ARB : WGL_TYPE_COLORINDEX_ARB; cfg->doubleBuffer = (pfd.dwFlags & PFD_DOUBLEBUFFER) ? 1 : 0; cfg->auxBuffers = pfd.cAuxBuffers; + cfg->swap_method = WGL_SWAP_UNDEFINED_ARB; cfg->numSamples = 0; TRACE("iPixelFormat=%d, iPixelType=%#x, doubleBuffer=%d, RGBA=%d/%d/%d/%d, " diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index f6d046c410a..0e4b900efe0 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1663,7 +1663,7 @@ static void wined3d_context_gl_enter(struct wined3d_context_gl *context_gl) /* This function takes care of wined3d pixel format selection. */ static int context_choose_pixel_format(const struct wined3d_device *device, HDC hdc, const struct wined3d_format *color_format, const struct wined3d_format *ds_format, - BOOL auxBuffers) + bool aux_buffers, bool swap_effect_copy) { unsigned int cfg_count = wined3d_adapter_gl(device->adapter)->pixel_format_count; unsigned int current_value; @@ -1671,9 +1671,9 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC int iPixelFormat = 0; unsigned int i; - TRACE("device %p, dc %p, color_format %s, ds_format %s, aux_buffers %#x.\n", + TRACE("device %p, dc %p, color_format %s, ds_format %s, aux_buffers %#x, swap_effect_copy %#x.\n", device, hdc, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id), - auxBuffers); + aux_buffers, swap_effect_copy); current_value = 0; for (i = 0; i < cfg_count; ++i) @@ -1705,21 +1705,23 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC continue; value = 1; + if (swap_effect_copy && cfg->swap_method == WGL_SWAP_COPY_ARB) + value += 1; /* We try to locate a format which matches our requirements exactly. In case of * depth it is no problem to emulate 16-bit using e.g. 24-bit, so accept that. */ if (cfg->depthSize == ds_format->depth_size) - value += 1; - if (cfg->stencilSize == ds_format->stencil_size) value += 2; - if (cfg->alphaSize == color_format->alpha_size) + if (cfg->stencilSize == ds_format->stencil_size) value += 4; - /* We like to have aux buffers in backbuffer mode */ - if (auxBuffers && cfg->auxBuffers) + if (cfg->alphaSize == color_format->alpha_size) value += 8; + /* We like to have aux buffers in backbuffer mode */ + if (aux_buffers && cfg->auxBuffers) + value += 16; if (cfg->redSize == color_format->red_size && cfg->greenSize == color_format->green_size && cfg->blueSize == color_format->blue_size) - value += 16; + value += 32; if (value > current_value) { @@ -1898,6 +1900,7 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context_gl, struct wined3d_swapchain_gl *swapchain_gl) { + enum wined3d_swap_effect swap_effect = swapchain_gl->s.state.desc.swap_effect; const struct wined3d_format *colour_format, *ds_format; struct wined3d_context *context = &context_gl->c; const struct wined3d_gl_info *gl_info; @@ -1905,6 +1908,7 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context struct wined3d_adapter *adapter; unsigned int target_bind_flags; struct wined3d_device *device; + bool swap_effect_copy; HGLRC ctx, share_ctx; unsigned int i; @@ -1915,6 +1919,8 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context target = &context->current_rt.texture->resource; target_bind_flags = target->bind_flags; + swap_effect_copy = swap_effect == WINED3D_SWAP_EFFECT_COPY || swap_effect == WINED3D_SWAP_EFFECT_COPY_VSYNC; + if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { static const enum wined3d_format_id ds_formats[] = @@ -1951,7 +1957,7 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context { ds_format = wined3d_get_format(adapter, ds_formats[i], WINED3D_BIND_DEPTH_STENCIL); if ((context_gl->pixel_format = context_choose_pixel_format(device, - context_gl->dc, colour_format, ds_format, TRUE))) + context_gl->dc, colour_format, ds_format, true, swap_effect_copy))) { swapchain_gl->s.ds_format = ds_format; break; @@ -1964,7 +1970,7 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context else { context_gl->pixel_format = context_choose_pixel_format(device, - context_gl->dc, colour_format, swapchain_gl->s.ds_format, TRUE); + context_gl->dc, colour_format, swapchain_gl->s.ds_format, true, swap_effect_copy); } } else @@ -1980,7 +1986,7 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context colour_format = wined3d_get_format(adapter, WINED3DFMT_B8G8R8A8_UNORM, target_bind_flags); ds_format = wined3d_get_format(adapter, WINED3DFMT_UNKNOWN, WINED3D_BIND_DEPTH_STENCIL); context_gl->pixel_format = context_choose_pixel_format(device, - context_gl->dc, colour_format, ds_format, FALSE); + context_gl->dc, colour_format, ds_format, false, swap_effect_copy); } if (!context_gl->pixel_format) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 47158d15aa2..3ae698649cf 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -594,6 +594,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, { struct wined3d_swapchain_gl *swapchain_gl = wined3d_swapchain_gl(swapchain); struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; + const struct wined3d_pixel_format *pixel_format; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; struct wined3d_context *context; @@ -609,7 +610,9 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, TRACE("Presenting DC %p.\n", context_gl->dc); - if (context_gl->dc == swapchain_gl->backup_dc || swapchain_present_is_partial_copy(swapchain, dst_rect)) + pixel_format = &wined3d_adapter_gl(swapchain->device->adapter)->pixel_formats[context_gl->pixel_format]; + if (context_gl->dc == swapchain_gl->backup_dc || (pixel_format->swap_method != WGL_SWAP_COPY_ARB + && swapchain_present_is_partial_copy(swapchain, dst_rect))) { swapchain_blit_gdi(swapchain, context, src_rect, dst_rect); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 33170761f80..9a7c3a70fe4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2846,6 +2846,7 @@ struct wined3d_pixel_format BOOL doubleBuffer; int auxBuffers; int numSamples; + int swap_method; }; enum wined3d_pci_vendor -- 2.20.1

1 0

[PATCH 3/5] wined3d: Use GDI blits for partial presents with COPY swap effects.
by Henri Verbeet 10 Sep '21

10 Sep '21

The GL/Vulkan backbuffer contents are undefined after a buffer swap. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 802116495e5..47158d15aa2 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -568,6 +568,27 @@ static void wined3d_swapchain_gl_rotate(struct wined3d_swapchain *swapchain, str device_invalidate_state(swapchain->device, STATE_FRAMEBUFFER); } +static bool swapchain_present_is_partial_copy(struct wined3d_swapchain *swapchain, const RECT *dst_rect) +{ + enum wined3d_swap_effect swap_effect = swapchain->state.desc.swap_effect; + RECT client_rect; + unsigned int t; + + if (swap_effect != WINED3D_SWAP_EFFECT_COPY && swap_effect != WINED3D_SWAP_EFFECT_COPY_VSYNC) + return false; + + GetClientRect(swapchain->win_handle, &client_rect); + + t = client_rect.right - client_rect.left; + if ((dst_rect->left && dst_rect->right) || abs(dst_rect->right - dst_rect->left) != t) + return true; + t = client_rect.bottom - client_rect.top; + if ((dst_rect->top && dst_rect->bottom) || abs(dst_rect->bottom - dst_rect->top) != t) + return true; + + return false; +} + static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, unsigned int swap_interval, DWORD flags) { @@ -588,7 +609,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, TRACE("Presenting DC %p.\n", context_gl->dc); - if (context_gl->dc == swapchain_gl->backup_dc) + if (context_gl->dc == swapchain_gl->backup_dc || swapchain_present_is_partial_copy(swapchain, dst_rect)) { swapchain_blit_gdi(swapchain, context, src_rect, dst_rect); } @@ -1208,10 +1229,14 @@ static void swapchain_vk_present(struct wined3d_swapchain *swapchain, const RECT context_vk = wined3d_context_vk(context_acquire(swapchain->device, back_buffer, 0)); - wined3d_texture_load_location(back_buffer, 0, &context_vk->c, back_buffer->resource.draw_binding); - - if (swapchain_vk->vk_swapchain) + if (!swapchain_vk->vk_swapchain || swapchain_present_is_partial_copy(swapchain, dst_rect)) + { + swapchain_blit_gdi(swapchain, &context_vk->c, src_rect, dst_rect); + } + else { + wined3d_texture_load_location(back_buffer, 0, &context_vk->c, back_buffer->resource.draw_binding); + if ((vr = wined3d_swapchain_vk_blit(swapchain_vk, context_vk, src_rect, dst_rect, swap_interval))) { if (vr == VK_ERROR_OUT_OF_DATE_KHR || vr == VK_SUBOPTIMAL_KHR) @@ -1228,10 +1253,6 @@ static void swapchain_vk_present(struct wined3d_swapchain *swapchain, const RECT } } } - else - { - swapchain_blit_gdi(swapchain, &context_vk->c, src_rect, dst_rect); - } wined3d_swapchain_vk_rotate(swapchain, context_vk); -- 2.20.1

1 0

[PATCH 2/5] wined3d: Get rid of the "render_to_fbo" field from the wined3d_swapchain structure.
by Henri Verbeet 10 Sep '21

10 Sep '21

It's effectively always true when using ORM_FBO, now that the "AlwaysOffscreen" setting is gone. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 2 +- dlls/wined3d/swapchain.c | 69 +++++++--------------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 16 insertions(+), 57 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 6215da8ce0f..3d24d375bc8 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -435,7 +435,7 @@ BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) /* If the swapchain is rendered to an FBO, the backbuffer is * offscreen, otherwise onscreen */ - return swapchain->render_to_fbo; + return wined3d_settings.offscreen_rendering_mode == ORM_FBO; } void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 693557448fe..802116495e5 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -532,7 +532,7 @@ static void wined3d_swapchain_gl_rotate(struct wined3d_swapchain *swapchain, str unsigned int i; static const DWORD supported_locations = WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_RB_MULTISAMPLE; - if (swapchain->state.desc.backbuffer_count < 2 || !swapchain->render_to_fbo) + if (swapchain->state.desc.backbuffer_count < 2 || wined3d_settings.offscreen_rendering_mode != ORM_FBO) return; texture_prev = wined3d_texture_gl(swapchain->back_buffers[0]); @@ -572,12 +572,10 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, unsigned int swap_interval, DWORD flags) { struct wined3d_swapchain_gl *swapchain_gl = wined3d_swapchain_gl(swapchain); - const struct wined3d_swapchain_desc *desc = &swapchain->state.desc; struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; struct wined3d_context *context; - BOOL render_to_fbo; context = context_acquire(swapchain->device, swapchain->front_buffer, 0); context_gl = wined3d_context_gl(context); @@ -588,51 +586,30 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, return; } - gl_info = context_gl->gl_info; - - swapchain_gl_set_swap_interval(swapchain, context_gl, swap_interval); - TRACE("Presenting DC %p.\n", context_gl->dc); if (context_gl->dc == swapchain_gl->backup_dc) + { swapchain_blit_gdi(swapchain, context, src_rect, dst_rect); - - if (!(render_to_fbo = swapchain->render_to_fbo) - && (src_rect->left || src_rect->top - || src_rect->right != desc->backbuffer_width - || src_rect->bottom != desc->backbuffer_height - || dst_rect->left || dst_rect->top - || dst_rect->right != desc->backbuffer_width - || dst_rect->bottom != desc->backbuffer_height)) - render_to_fbo = TRUE; - - /* Rendering to a window of different size, presenting partial rectangles, - * or rendering to a different window needs help from FBO_blit or a textured - * draw. Render the swapchain to a FBO in the future. - * - * Note that FBO_blit from the backbuffer to the frontbuffer cannot solve - * all these issues - this fails if the window is smaller than the backbuffer. - */ - if (!swapchain->render_to_fbo && render_to_fbo && wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - wined3d_texture_load_location(back_buffer, 0, context, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_invalidate_location(back_buffer, 0, WINED3D_LOCATION_DRAWABLE); - swapchain->render_to_fbo = TRUE; - swapchain_update_draw_bindings(swapchain); } else { + gl_info = context_gl->gl_info; + + swapchain_gl_set_swap_interval(swapchain, context_gl, swap_interval); + wined3d_texture_load_location(back_buffer, 0, context, back_buffer->resource.draw_binding); - } - if (swapchain->render_to_fbo) - swapchain_blit(swapchain, context, src_rect, dst_rect); + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + swapchain_blit(swapchain, context, src_rect, dst_rect); - if (swapchain_gl->context_count > 1) - gl_info->gl_ops.gl.p_glFinish(); + if (swapchain_gl->context_count > 1) + gl_info->gl_ops.gl.p_glFinish(); + + /* call wglSwapBuffers through the gl table to avoid confusing the Steam overlay */ + gl_info->gl_ops.wgl.p_wglSwapBuffers(context_gl->dc); + } - /* call wglSwapBuffers through the gl table to avoid confusing the Steam overlay */ - gl_info->gl_ops.wgl.p_wglSwapBuffers(context_gl->dc); wined3d_context_gl_submit_command_fence(context_gl); wined3d_swapchain_gl_rotate(swapchain, context); @@ -1350,22 +1327,6 @@ static const struct wined3d_swapchain_ops swapchain_no3d_ops = swapchain_gdi_frontbuffer_updated, }; -static void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) -{ - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) - return; - - if (!swapchain->state.desc.backbuffer_count) - { - TRACE("Single buffered rendering.\n"); - swapchain->render_to_fbo = FALSE; - return; - } - - TRACE("Rendering to FBO.\n"); - swapchain->render_to_fbo = TRUE; -} - static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_swapchain *swapchain, enum wined3d_format_id format_id, enum wined3d_multisample_type *type, DWORD *quality) { @@ -1528,7 +1489,6 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc swapchain->state.desc = *desc; wined3d_swapchain_apply_sample_count_override(swapchain, swapchain->state.desc.backbuffer_format, &swapchain->state.desc.multisample_type, &swapchain->state.desc.multisample_quality); - swapchain_update_render_to_fbo(swapchain); TRACE("Creating front buffer.\n"); @@ -2073,7 +2033,6 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha } } - swapchain_update_render_to_fbo(swapchain); swapchain_update_draw_bindings(swapchain); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86c053df0db..33170761f80 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5277,7 +5277,7 @@ struct wined3d_swapchain struct wined3d_texture **back_buffers; struct wined3d_texture *front_buffer; struct wined3d_gamma_ramp orig_gamma; - BOOL render_to_fbo, reapply_mode; + bool reapply_mode; const struct wined3d_format *ds_format; struct wined3d_palette *palette; RECT front_buffer_update; -- 2.20.1

1 0

[PATCH 1/5] wined3d: Do not attempt to restore GL contexts corresponding to wined3d contexts in wined3d_context_gl_cleanup().
by Henri Verbeet 10 Sep '21

10 Sep '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index da7c70a8863..f6d046c410a 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1347,6 +1347,7 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) struct wined3d_so_statistics_query *so_statistics_query; struct wined3d_timestamp_query *timestamp_query; struct wined3d_occlusion_query *occlusion_query; + struct wined3d_context_gl *current; struct fbo_entry *entry, *entry2; struct wined3d_fence *fence; HGLRC restore_ctx; @@ -1356,10 +1357,22 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) restore_ctx = wglGetCurrentContext(); restore_dc = wglGetCurrentDC(); - if (restore_ctx == context_gl->gl_ctx) - restore_ctx = NULL; - else if (context_gl->valid) + if (context_gl->valid && context_gl->gl_ctx != restore_ctx) + { + /* Attempting to restore a GL context corresponding to a wined3d + * context is not particularly useful. Worse, when we're called from + * wined3d_context_gl_destroy(), we subsequently clear the "current + * D3D context" TLS value, which would cause + * wined3d_context_gl_enter() to consider the GL context a non-D3D + * context. */ + if ((current = wined3d_context_gl_get_current()) && current->gl_ctx == restore_ctx) + restore_ctx = NULL; wined3d_context_gl_set_gl_context(context_gl); + } + else + { + restore_ctx = NULL; + } if (context_gl->valid) { -- 2.20.1

1 0

[PATCH v2] wined3d: Allow constant buffers to be forced to be write-mappable.
by Jan Sikorski 10 Sep '21

10 Sep '21

Using a registry setting. Games sometimes use DEFAULT usage and no CPU access combined with UpdateSubresource() for often-changing constants, causing us to interrupt the render pass and transfer through a staging buffer on each update. In such cases forcing the buffers to be mappable greatly increases performance. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- v2 naming --- dlls/wined3d/buffer.c | 9 +++++++-- dlls/wined3d/wined3d_main.c | 5 +++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index da61f36af45..3ea3bf4b180 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1139,6 +1139,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d { const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_R8_UNORM, desc->bind_flags); struct wined3d_resource *resource = &buffer->resource; + unsigned int access; HRESULT hr; TRACE("buffer %p, device %p, desc byte_width %u, usage %s, bind_flags %s, " @@ -1164,8 +1165,12 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d return E_INVALIDARG; } + access = desc->access; + if (desc->bind_flags & WINED3D_BIND_CONSTANT_BUFFER && wined3d_settings.cb_access_map_w) + access |= WINED3D_RESOURCE_ACCESS_MAP_W; + if (FAILED(hr = resource_init(resource, device, WINED3D_RTYPE_BUFFER, format, - WINED3D_MULTISAMPLE_NONE, 0, desc->usage, desc->bind_flags, desc->access, + WINED3D_MULTISAMPLE_NONE, 0, desc->usage, desc->bind_flags, access, desc->byte_width, 1, 1, desc->byte_width, parent, parent_ops, &buffer_resource_ops))) { WARN("Failed to initialize resource, hr %#x.\n", hr); @@ -1179,7 +1184,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d buffer, buffer->resource.size, buffer->resource.usage, buffer->resource.heap_memory); if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING - || wined3d_resource_access_is_managed(desc->access)) + || wined3d_resource_access_is_managed(access)) { /* SWvp and managed buffers always return the same pointer in buffer * maps and retain data in DISCARD maps. Keep a system memory copy of diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 6e93b8dc683..a360eadecc9 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -394,6 +394,11 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.renderer = WINED3D_RENDERER_NO3D; } } + if (!get_config_key_dword(hkey, appkey, "cb_access_map_w", &tmpvalue) && tmpvalue) + { + TRACE("Forcing all constant buffers to be write-mappable.\n"); + wined3d_settings.cb_access_map_w = TRUE; + } } if (appkey) RegCloseKey( appkey ); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86c053df0db..4b9fc8d9ae8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -482,6 +482,7 @@ struct wined3d_settings unsigned int max_sm_cs; enum wined3d_renderer renderer; enum wined3d_shader_backend shader_backend; + BOOL cb_access_map_w; }; extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN; -- 2.30.2

2 1

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

10 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 | 53 ++++++++++++++++++++++++++++++++++++++-- 4 files changed, 56 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 8469def786a..b1b90b363ee 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -747,12 +747,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] ); @@ -793,6 +792,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 133d6ad0552..c6da8576f39 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1450,6 +1450,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 3c5f2612b51..036611e2dd7 100644 --- a/server/sock.c +++ b/server/sock.c @@ -128,12 +128,14 @@ struct poll_req struct async *async; struct iosb *iosb; struct timeout_user *timeout; + int exclusive; unsigned int count; struct poll_socket_output *output; struct { struct sock *sock; int flags; + int main; } sockets[1]; }; @@ -2839,7 +2841,51 @@ 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 struct poll_req *get_main_poll(struct sock *sock) +{ + struct poll_req *req; + + LIST_FOR_EACH_ENTRY(req, &poll_list, struct poll_req, entry) + { + unsigned int i; + + for (i = 0; i < req->count; ++i) + { + if (req->sockets[i].sock == sock + && req->sockets[i].main) + return req; + } + } + + return NULL; +} + +static void poll_handle_exclusive(struct poll_req *req) +{ + unsigned int i; + + for (i = 0; i < req->count; ++i) + { + struct poll_req *main_req = get_main_poll(req->sockets[i].sock); + + if (main_req && main_req->exclusive && req->exclusive) + { + /* Previous exclusive main poll replaced by new exclusive poll. */ + main_req->sockets[i].main = FALSE; + + main_req->iosb->status = STATUS_SUCCESS; + main_req->iosb->out_data = main_req->output; + main_req->iosb->out_size = main_req->count * sizeof(*main_req->output); + async_terminate(main_req->async, STATUS_ALERTED); + + main_req = NULL; + } + + req->sockets[i].main = !main_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; @@ -2880,11 +2926,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 ); @@ -3285,7 +3334,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] wininet: Add handling for remaining special errors to InternetErrorDlg.
by Jacek Caban 10 Sep '21

10 Sep '21

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/dialogs.c | 48 +++++++++++++++++++++++++++++++++-- dlls/wininet/tests/internet.c | 40 ++++------------------------- 2 files changed, 51 insertions(+), 37 deletions(-)

1 0

[PATCH 1/2] dbghelp: set correct parameter name
by Eric Pouech 10 Sep '21

10 Sep '21

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/type.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 23752cfed9f..29d8a5350a5 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -487,13 +487,13 @@ struct enum_types_AtoW PSYM_ENUMERATESYMBOLS_CALLBACKW callback; }; -static BOOL CALLBACK enum_types_AtoW(PSYMBOL_INFO si, ULONG addr, PVOID _et) +static BOOL CALLBACK enum_types_AtoW(PSYMBOL_INFO si, ULONG size, PVOID _et) { struct enum_types_AtoW* et = _et; SYMBOL_INFOW* siW = (SYMBOL_INFOW*)et->buffer; copy_symbolW(siW, si); - return et->callback(siW, addr, et->user); + return et->callback(siW, size, et->user); } /******************************************************************

1 1

[PATCH 6/6] gdi32: Remove no longer needed metafile special case from NtGdiExtTextOutW.
by Jacek Caban 10 Sep '21

10 Sep '21

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

2 1

[PATCH 5/6] gdi32: Directly use ntgdi functions in font.c.
by Jacek Caban 10 Sep '21

10 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 51 +++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 24 deletions(-)

2 1

[PATCH 4/6] gdi32: Fix some ntgdi names.
by Jacek Caban 10 Sep '21

10 Sep '21

2 1

[PATCH 3/6] gdi32/tests: Add GdiTransparentBlt tests.
by Jacek Caban 10 Sep '21

10 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/tests/metafile.c | 254 ++++++++++++++++++++---------------- 1 file changed, 140 insertions(+), 114 deletions(-)

2 1

[PATCH 2/6] gdi32: Use EMR_TRANSPARENTBLT to record GetTransparentBlt.
by Jacek Caban 10 Sep '21

10 Sep '21

And use NtGdiTransparentBlt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 44 +++++++++++++++++++++++----------------- dlls/gdi32/emfdc.c | 11 +++++++++- dlls/gdi32/gdi_private.h | 3 +++ dlls/gdi32/gdidc.c | 17 ++++++++++++++++ include/ntgdi.h | 3 +++ 5 files changed, 58 insertions(+), 20 deletions(-)

2 1

[PATCH 1/6 v2] gdi32/test: Add tests for recording MaskBlt and PlgBlt in EMFs.
by Jacek Caban 10 Sep '21

10 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Using 0 biClrUsed and properly filling mask bits. Thanks, Huw. dlls/gdi32/tests/metafile.c | 185 ++++++++++++++++++++++++++++++++++++ 1 file changed, 185 insertions(+)

2 1

[PATCH 1/4] wined3d: Remove wined3d_texture_copy_sysmem_location().
by Jan Sikorski 10 Sep '21

10 Sep '21

Use wined3d_context_copy_bo_address() instead. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/texture.c | 58 ++++++++---------------------------------- 1 file changed, 11 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f5f7fab49a6..6663e788e9c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -745,52 +745,6 @@ void wined3d_texture_clear_dirty_regions(struct wined3d_texture *texture) } } -static BOOL wined3d_texture_copy_sysmem_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) -{ - unsigned int size = texture->sub_resources[sub_resource_idx].size; - struct wined3d_device *device = texture->resource.device; - const struct wined3d_gl_info *gl_info; - struct wined3d_bo_gl *src_bo, *dst_bo; - struct wined3d_bo_address dst, src; - - if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) - return FALSE; - - wined3d_texture_get_memory(texture, sub_resource_idx, &dst, location); - wined3d_texture_get_memory(texture, sub_resource_idx, &src, - texture->sub_resources[sub_resource_idx].locations); - - if ((dst_bo = (struct wined3d_bo_gl *)dst.buffer_object)) - { - context = context_acquire(device, NULL, 0); - gl_info = wined3d_context_gl(context)->gl_info; - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, dst_bo->id)); - GL_EXTCALL(glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, size, src.addr)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - wined3d_context_gl_reference_bo(wined3d_context_gl(context), dst_bo); - checkGLcall("PBO upload"); - context_release(context); - return TRUE; - } - - if ((src_bo = (struct wined3d_bo_gl *)src.buffer_object)) - { - context = context_acquire(device, NULL, 0); - gl_info = wined3d_context_gl(context)->gl_info; - GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, src_bo->id)); - GL_EXTCALL(glGetBufferSubData(GL_PIXEL_PACK_BUFFER, 0, size, dst.addr)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); - wined3d_context_gl_reference_bo(wined3d_context_gl(context), src_bo); - checkGLcall("PBO download"); - context_release(context); - return TRUE; - } - - memcpy(dst.addr, src.addr, size); - return TRUE; -} - /* Context activation is done by the caller. Context may be NULL in * WINED3D_NO3D mode. */ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, @@ -837,7 +791,17 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, } if ((location & wined3d_texture_sysmem_locations) && (current & wined3d_texture_sysmem_locations)) - ret = wined3d_texture_copy_sysmem_location(texture, sub_resource_idx, context, location); + { + unsigned int size = texture->sub_resources[sub_resource_idx].size; + struct wined3d_bo_address source, destination; + + if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) + return FALSE; + wined3d_texture_get_memory(texture, sub_resource_idx, &source, current); + wined3d_texture_get_memory(texture, sub_resource_idx, &destination, location); + wined3d_context_copy_bo_address(context, &destination, &source, size); + ret = TRUE; + } else ret = texture->texture_ops->texture_load_location(texture, sub_resource_idx, context, location); -- 2.30.2

3 7

[PATCH 1/5] dinput8/tests: Read the HID report descriptor from the registry.
by Rémi Bernon 10 Sep '21

10 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput8/tests/driver_hid.c | 268 ++------------------------------ dlls/dinput8/tests/hid.c | 250 +++++++++++++++++++++++++++++ 2 files changed, 265 insertions(+), 253 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index 1fc52999c84..6bd5611c86c 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -39,6 +39,8 @@ static UNICODE_STRING control_symlink; static unsigned int got_start_device; +static char report_descriptor_buf[4096]; +static DWORD report_descriptor_len; static DWORD report_id; static DWORD polled; @@ -159,253 +161,6 @@ static NTSTATUS WINAPI driver_power( DEVICE_OBJECT *device, IRP *irp ) static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) { -#include "psh_hid_macros.h" -/* Replace REPORT_ID with USAGE_PAGE when id is 0 */ -#define REPORT_ID_OR_USAGE_PAGE(size, id, off) SHORT_ITEM_1((id ? 8 : 0), 1, (id + off)) - const unsigned char report_descriptor[] = - { - USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_JOYSTICK), - COLLECTION(1, Application), - USAGE(1, HID_USAGE_GENERIC_JOYSTICK), - COLLECTION(1, Logical), - REPORT_ID_OR_USAGE_PAGE(1, report_id, 0), - USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_X), - USAGE(1, HID_USAGE_GENERIC_Y), - LOGICAL_MINIMUM(1, -128), - LOGICAL_MAXIMUM(1, 127), - REPORT_SIZE(1, 8), - REPORT_COUNT(1, 2), - INPUT(1, Data|Var|Abs), - - USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), - USAGE_MINIMUM(1, 1), - USAGE_MAXIMUM(1, 8), - LOGICAL_MINIMUM(1, 0), - LOGICAL_MAXIMUM(1, 1), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), - INPUT(1, Data|Var|Abs), - - USAGE_MINIMUM(1, 0x18), - USAGE_MAXIMUM(1, 0x1f), - LOGICAL_MINIMUM(1, 0), - LOGICAL_MAXIMUM(1, 1), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), - INPUT(1, Cnst|Var|Abs), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), - INPUT(1, Cnst|Var|Abs), - /* needs to be 8 bit aligned as next has Buff */ - - USAGE_MINIMUM(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8), - USAGE_MAXIMUM(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0xf), - LOGICAL_MINIMUM(1, 0), - LOGICAL_MAXIMUM(1, 8), - REPORT_COUNT(1, 2), - REPORT_SIZE(1, 8), - INPUT(2, Data|Ary|Rel|Wrap|Lin|Pref|Null|Vol|Buff), - - /* needs to be 8 bit aligned as previous has Buff */ - USAGE(1, 0x20), - LOGICAL_MINIMUM(1, 0), - LOGICAL_MAXIMUM(1, 1), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), - INPUT(1, Data|Var|Abs), - USAGE_MINIMUM(1, 0x21), - USAGE_MAXIMUM(1, 0x22), - REPORT_COUNT(1, 2), - REPORT_SIZE(1, 0), - INPUT(1, Data|Var|Abs), - USAGE(1, 0x23), - REPORT_COUNT(1, 0), - REPORT_SIZE(1, 1), - INPUT(1, Data|Var|Abs), - - USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_HATSWITCH), - LOGICAL_MINIMUM(1, 1), - LOGICAL_MAXIMUM(1, 8), - REPORT_SIZE(1, 4), - REPORT_COUNT(1, 2), - INPUT(1, Data|Var|Abs), - - USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_Z), - LOGICAL_MINIMUM(4, 0x00000000), - LOGICAL_MAXIMUM(4, 0x3fffffff), - PHYSICAL_MINIMUM(4, 0x80000000), - PHYSICAL_MAXIMUM(4, 0x7fffffff), - REPORT_SIZE(1, 32), - REPORT_COUNT(1, 1), - INPUT(1, Data|Var|Abs), - - /* reset physical range to its default interpretation */ - USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_RX), - PHYSICAL_MINIMUM(4, 0), - PHYSICAL_MAXIMUM(4, 0), - REPORT_SIZE(1, 32), - REPORT_COUNT(1, 1), - INPUT(1, Data|Var|Abs), - - USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_RY), - LOGICAL_MINIMUM(4, 0x7fff), - LOGICAL_MAXIMUM(4, 0x0000), - PHYSICAL_MINIMUM(4, 0x0000), - PHYSICAL_MAXIMUM(4, 0x7fff), - REPORT_SIZE(1, 32), - REPORT_COUNT(1, 1), - INPUT(1, Data|Var|Abs), - END_COLLECTION, - - USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_JOYSTICK), - COLLECTION(1, Report), - REPORT_ID_OR_USAGE_PAGE(1, report_id, 1), - USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), - USAGE_MINIMUM(1, 9), - USAGE_MAXIMUM(1, 10), - LOGICAL_MINIMUM(1, 0), - LOGICAL_MAXIMUM(1, 1), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), - INPUT(1, Data|Var|Abs), - END_COLLECTION, - - USAGE_PAGE(1, HID_USAGE_PAGE_LED), - USAGE(1, HID_USAGE_LED_GREEN), - COLLECTION(1, Report), - REPORT_ID_OR_USAGE_PAGE(1, report_id, 0), - USAGE_PAGE(1, HID_USAGE_PAGE_LED), - USAGE(1, 1), - USAGE(1, 2), - USAGE(1, 3), - USAGE(1, 4), - USAGE(1, 5), - USAGE(1, 6), - USAGE(1, 7), - USAGE(1, 8), - LOGICAL_MINIMUM(1, 0), - LOGICAL_MAXIMUM(1, 1), - PHYSICAL_MINIMUM(1, 0), - PHYSICAL_MAXIMUM(1, 1), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), - INPUT(1, Data|Var|Abs), - - USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8c), - USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8d), - USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8e), - USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8f), - LOGICAL_MINIMUM(1, 1), - LOGICAL_MAXIMUM(1, 16), - REPORT_COUNT(1, 2), - REPORT_SIZE(1, 8), - INPUT(1, Data|Ary|Abs), - END_COLLECTION, - - USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), - USAGE(1, HID_USAGE_HAPTICS_SIMPLE_CONTROLLER), - COLLECTION(1, Logical), - REPORT_ID_OR_USAGE_PAGE(1, report_id, 0), - USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), - - USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_LIST), - COLLECTION(1, NamedArray), - USAGE_PAGE(1, HID_USAGE_PAGE_ORDINAL), - USAGE(1, 3), /* HID_USAGE_HAPTICS_WAVEFORM_RUMBLE */ - USAGE(1, 4), /* HID_USAGE_HAPTICS_WAVEFORM_BUZZ */ - LOGICAL_MINIMUM(2, 0x0000), - LOGICAL_MAXIMUM(2, 0xffff), - REPORT_COUNT(1, 2), - REPORT_SIZE(1, 16), - FEATURE(1, Data|Var|Abs|Null), - END_COLLECTION, - - USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), - USAGE(1, HID_USAGE_HAPTICS_DURATION_LIST), - COLLECTION(1, NamedArray), - USAGE_PAGE(1, HID_USAGE_PAGE_ORDINAL), - USAGE(1, 3), /* 0 (HID_USAGE_HAPTICS_WAVEFORM_RUMBLE) */ - USAGE(1, 4), /* 0 (HID_USAGE_HAPTICS_WAVEFORM_BUZZ) */ - LOGICAL_MINIMUM(2, 0x0000), - LOGICAL_MAXIMUM(2, 0xffff), - REPORT_COUNT(1, 2), - REPORT_SIZE(1, 16), - FEATURE(1, Data|Var|Abs|Null), - END_COLLECTION, - - USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), - USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME), - UNIT(2, 0x1001), /* seconds */ - UNIT_EXPONENT(1, -3), /* 10^-3 */ - LOGICAL_MINIMUM(2, 0x8000), - LOGICAL_MAXIMUM(2, 0x7fff), - PHYSICAL_MINIMUM(4, 0x00000000), - PHYSICAL_MAXIMUM(4, 0xffffffff), - REPORT_SIZE(1, 32), - REPORT_COUNT(1, 2), - FEATURE(1, Data|Var|Abs), - /* reset global items */ - UNIT(1, 0), /* None */ - UNIT_EXPONENT(1, 0), - - USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_Z), - LOGICAL_MINIMUM(4, 0x0000), - LOGICAL_MAXIMUM(4, 0x7fff), - PHYSICAL_MINIMUM(4, 0xfff90000), - PHYSICAL_MAXIMUM(4, 0x0003ffff), - REPORT_SIZE(1, 32), - REPORT_COUNT(1, 1), - FEATURE(1, Data|Var|Abs), - END_COLLECTION, - - USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_JOYSTICK), - COLLECTION(1, Report), - REPORT_ID_OR_USAGE_PAGE(1, report_id, 1), - USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), - USAGE_MINIMUM(1, 9), - USAGE_MAXIMUM(1, 10), - LOGICAL_MINIMUM(1, 0), - LOGICAL_MAXIMUM(1, 1), - PHYSICAL_MINIMUM(1, 0), - PHYSICAL_MAXIMUM(1, 1), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), - FEATURE(1, Data|Var|Abs), - END_COLLECTION, - - USAGE_PAGE(1, HID_USAGE_PAGE_LED), - USAGE(1, HID_USAGE_LED_GREEN), - COLLECTION(1, Report), - REPORT_ID_OR_USAGE_PAGE(1, report_id, 0), - USAGE_PAGE(1, HID_USAGE_PAGE_LED), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), - OUTPUT(1, Cnst|Var|Abs), - END_COLLECTION, - - USAGE_PAGE(1, HID_USAGE_PAGE_LED), - USAGE(1, HID_USAGE_LED_RED), - COLLECTION(1, Report), - REPORT_ID_OR_USAGE_PAGE(1, report_id, 1), - USAGE_PAGE(1, HID_USAGE_PAGE_LED), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), - OUTPUT(1, Cnst|Var|Abs), - END_COLLECTION, - END_COLLECTION, - }; -#undef REPORT_ID_OR_USAGE_PAGE -#include "pop_hid_macros.h" - IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); HID_DEVICE_EXTENSION *ext = device->DeviceExtension; struct hid_device *impl = ext->MiniDeviceExtension; @@ -453,7 +208,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) desc->bCountry = 0; desc->bNumDescriptors = 1; desc->DescriptorList[0].bReportType = HID_REPORT_DESCRIPTOR_TYPE; - desc->DescriptorList[0].wReportLength = sizeof(report_descriptor); + desc->DescriptorList[0].wReportLength = report_descriptor_len; irp->IoStatus.Information = sizeof(*desc); } ret = STATUS_SUCCESS; @@ -462,12 +217,12 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) case IOCTL_HID_GET_REPORT_DESCRIPTOR: ok( !in_size, "got input size %u\n", in_size ); - ok( out_size == sizeof(report_descriptor), "got output size %u\n", out_size ); + ok( out_size == report_descriptor_len, "got output size %u\n", out_size ); - if (out_size == sizeof(report_descriptor)) + if (out_size == report_descriptor_len) { - memcpy( irp->UserBuffer, report_descriptor, sizeof(report_descriptor) ); - irp->IoStatus.Information = sizeof(report_descriptor); + memcpy( irp->UserBuffer, report_descriptor_buf, report_descriptor_len ); + irp->IoStatus.Information = report_descriptor_len; } ret = STATUS_SUCCESS; break; @@ -677,7 +432,7 @@ static void WINAPI driver_unload( DRIVER_OBJECT *driver ) NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *registry ) { static const int info_size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ); - char buffer[offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ) + sizeof(DWORD)]; + char buffer[offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ) + sizeof(report_descriptor_buf)]; HID_MINIDRIVER_REGISTRATION params = { .Revision = HID_REVISION, @@ -710,6 +465,13 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *registry ) memcpy( &polled, buffer + info_size, size - info_size ); params.DevicesArePolled = polled; + RtlInitUnicodeString( &name_str, L"Descriptor" ); + size = info_size + sizeof(report_descriptor_buf); + ret = ZwQueryValueKey( hkey, &name_str, KeyValuePartialInformation, buffer, size, &size ); + ok( !ret, "ZwQueryValueKey returned %#x\n", ret ); + memcpy( report_descriptor_buf, buffer + info_size, size - info_size ); + report_descriptor_len = size - info_size; + driver->DriverExtension->AddDevice = driver_add_device; driver->DriverUnload = driver_unload; driver->MajorFunction[IRP_MJ_PNP] = driver_pnp; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index d89974a14ab..ec2575aa9c1 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -2054,6 +2054,253 @@ static void test_hid_device( DWORD report_id, DWORD polled ) static void test_hid_driver( DWORD report_id, DWORD polled ) { +#include "psh_hid_macros.h" +/* Replace REPORT_ID with USAGE_PAGE when id is 0 */ +#define REPORT_ID_OR_USAGE_PAGE(size, id, off) SHORT_ITEM_1((id ? 8 : 0), 1, (id + off)) + const unsigned char report_desc[] = + { + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Application), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Logical), + REPORT_ID_OR_USAGE_PAGE(1, report_id, 0), + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_X), + USAGE(1, HID_USAGE_GENERIC_Y), + LOGICAL_MINIMUM(1, -128), + LOGICAL_MAXIMUM(1, 127), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 2), + INPUT(1, Data|Var|Abs), + + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 1), + USAGE_MAXIMUM(1, 8), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + INPUT(1, Data|Var|Abs), + + USAGE_MINIMUM(1, 0x18), + USAGE_MAXIMUM(1, 0x1f), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + INPUT(1, Cnst|Var|Abs), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + INPUT(1, Cnst|Var|Abs), + /* needs to be 8 bit aligned as next has Buff */ + + USAGE_MINIMUM(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8), + USAGE_MAXIMUM(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0xf), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 8), + REPORT_COUNT(1, 2), + REPORT_SIZE(1, 8), + INPUT(2, Data|Ary|Rel|Wrap|Lin|Pref|Null|Vol|Buff), + + /* needs to be 8 bit aligned as previous has Buff */ + USAGE(1, 0x20), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + INPUT(1, Data|Var|Abs), + USAGE_MINIMUM(1, 0x21), + USAGE_MAXIMUM(1, 0x22), + REPORT_COUNT(1, 2), + REPORT_SIZE(1, 0), + INPUT(1, Data|Var|Abs), + USAGE(1, 0x23), + REPORT_COUNT(1, 0), + REPORT_SIZE(1, 1), + INPUT(1, Data|Var|Abs), + + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_HATSWITCH), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 8), + REPORT_SIZE(1, 4), + REPORT_COUNT(1, 2), + INPUT(1, Data|Var|Abs), + + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_Z), + LOGICAL_MINIMUM(4, 0x00000000), + LOGICAL_MAXIMUM(4, 0x3fffffff), + PHYSICAL_MINIMUM(4, 0x80000000), + PHYSICAL_MAXIMUM(4, 0x7fffffff), + REPORT_SIZE(1, 32), + REPORT_COUNT(1, 1), + INPUT(1, Data|Var|Abs), + + /* reset physical range to its default interpretation */ + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_RX), + PHYSICAL_MINIMUM(4, 0), + PHYSICAL_MAXIMUM(4, 0), + REPORT_SIZE(1, 32), + REPORT_COUNT(1, 1), + INPUT(1, Data|Var|Abs), + + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_RY), + LOGICAL_MINIMUM(4, 0x7fff), + LOGICAL_MAXIMUM(4, 0x0000), + PHYSICAL_MINIMUM(4, 0x0000), + PHYSICAL_MAXIMUM(4, 0x7fff), + REPORT_SIZE(1, 32), + REPORT_COUNT(1, 1), + INPUT(1, Data|Var|Abs), + END_COLLECTION, + + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Report), + REPORT_ID_OR_USAGE_PAGE(1, report_id, 1), + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 9), + USAGE_MAXIMUM(1, 10), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + INPUT(1, Data|Var|Abs), + END_COLLECTION, + + USAGE_PAGE(1, HID_USAGE_PAGE_LED), + USAGE(1, HID_USAGE_LED_GREEN), + COLLECTION(1, Report), + REPORT_ID_OR_USAGE_PAGE(1, report_id, 0), + USAGE_PAGE(1, HID_USAGE_PAGE_LED), + USAGE(1, 1), + USAGE(1, 2), + USAGE(1, 3), + USAGE(1, 4), + USAGE(1, 5), + USAGE(1, 6), + USAGE(1, 7), + USAGE(1, 8), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + INPUT(1, Data|Var|Abs), + + USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8c), + USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8d), + USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8e), + USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8f), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 16), + REPORT_COUNT(1, 2), + REPORT_SIZE(1, 8), + INPUT(1, Data|Ary|Abs), + END_COLLECTION, + + USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), + USAGE(1, HID_USAGE_HAPTICS_SIMPLE_CONTROLLER), + COLLECTION(1, Logical), + REPORT_ID_OR_USAGE_PAGE(1, report_id, 0), + USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), + + USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_LIST), + COLLECTION(1, NamedArray), + USAGE_PAGE(1, HID_USAGE_PAGE_ORDINAL), + USAGE(1, 3), /* HID_USAGE_HAPTICS_WAVEFORM_RUMBLE */ + USAGE(1, 4), /* HID_USAGE_HAPTICS_WAVEFORM_BUZZ */ + LOGICAL_MINIMUM(2, 0x0000), + LOGICAL_MAXIMUM(2, 0xffff), + REPORT_COUNT(1, 2), + REPORT_SIZE(1, 16), + FEATURE(1, Data|Var|Abs|Null), + END_COLLECTION, + + USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), + USAGE(1, HID_USAGE_HAPTICS_DURATION_LIST), + COLLECTION(1, NamedArray), + USAGE_PAGE(1, HID_USAGE_PAGE_ORDINAL), + USAGE(1, 3), /* 0 (HID_USAGE_HAPTICS_WAVEFORM_RUMBLE) */ + USAGE(1, 4), /* 0 (HID_USAGE_HAPTICS_WAVEFORM_BUZZ) */ + LOGICAL_MINIMUM(2, 0x0000), + LOGICAL_MAXIMUM(2, 0xffff), + REPORT_COUNT(1, 2), + REPORT_SIZE(1, 16), + FEATURE(1, Data|Var|Abs|Null), + END_COLLECTION, + + USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), + USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME), + UNIT(2, 0x1001), /* seconds */ + UNIT_EXPONENT(1, -3), /* 10^-3 */ + LOGICAL_MINIMUM(2, 0x8000), + LOGICAL_MAXIMUM(2, 0x7fff), + PHYSICAL_MINIMUM(4, 0x00000000), + PHYSICAL_MAXIMUM(4, 0xffffffff), + REPORT_SIZE(1, 32), + REPORT_COUNT(1, 2), + FEATURE(1, Data|Var|Abs), + /* reset global items */ + UNIT(1, 0), /* None */ + UNIT_EXPONENT(1, 0), + + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_Z), + LOGICAL_MINIMUM(4, 0x0000), + LOGICAL_MAXIMUM(4, 0x7fff), + PHYSICAL_MINIMUM(4, 0xfff90000), + PHYSICAL_MAXIMUM(4, 0x0003ffff), + REPORT_SIZE(1, 32), + REPORT_COUNT(1, 1), + FEATURE(1, Data|Var|Abs), + END_COLLECTION, + + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Report), + REPORT_ID_OR_USAGE_PAGE(1, report_id, 1), + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 9), + USAGE_MAXIMUM(1, 10), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + FEATURE(1, Data|Var|Abs), + END_COLLECTION, + + USAGE_PAGE(1, HID_USAGE_PAGE_LED), + USAGE(1, HID_USAGE_LED_GREEN), + COLLECTION(1, Report), + REPORT_ID_OR_USAGE_PAGE(1, report_id, 0), + USAGE_PAGE(1, HID_USAGE_PAGE_LED), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + OUTPUT(1, Cnst|Var|Abs), + END_COLLECTION, + + USAGE_PAGE(1, HID_USAGE_PAGE_LED), + USAGE(1, HID_USAGE_LED_RED), + COLLECTION(1, Report), + REPORT_ID_OR_USAGE_PAGE(1, report_id, 1), + USAGE_PAGE(1, HID_USAGE_PAGE_LED), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + OUTPUT(1, Cnst|Var|Abs), + END_COLLECTION, + END_COLLECTION, + }; +#undef REPORT_ID_OR_USAGE_PAGE +#include "pop_hid_macros.h" + WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; LSTATUS status; HKEY hkey; @@ -2072,6 +2319,9 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) status = RegSetValueExW( hkey, L"PolledMode", 0, REG_DWORD, (void *)&polled, sizeof(polled) ); ok( !status, "RegSetValueExW returned %#x\n", status ); + status = RegSetValueExW( hkey, L"Descriptor", 0, REG_BINARY, (void *)report_desc, sizeof(report_desc) ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + if (pnp_driver_start( L"driver_hid.dll" )) test_hid_device( report_id, polled ); pnp_driver_stop(); -- 2.33.0

2 7

[PATCH 00/10] Second step for Dwarf3/4 support in dbghelp
by Eric Pouech 10 Sep '21

10 Sep '21

One major change of Dwarf3/4 over Dwarf2 is that the size of some attributes (like addresses among others) is parametrized at the level of a compilation unit. Current dbghelp code stores such CU header parameters at the module's level (assuming it's the same across all CU:s of a module). This serie: - mainly changes the internal data model by attaching those parameters at the CU level (except for .eh_frame section) - it also allows to enable loading of dwarf3/4 debug info if the DBGHELP_DWARF_VERSION environment variable is set to 3 or 4. I don't recommend at this stage using this variable; it's better to delay until next serie (which shall cover the rest of the syntaxic changes in dwarf format; more series afterwards will cover more semantic changes and extensions). A+ --- Eric Pouech (10): dbghelp{dwarf}: Allow tweaking from env variable which DWARF version is to be loaded. dbghelp{dwarf}: introdicting dwarf2_cuhead_s a structure to hold compilation unit parsing info dbghelp{dwarf}: share compilation unit header information dbghelp{dwarf}: add word size parameter to parse_addr() internal function dbghelp{dwarf}: now pass dwarf2_cuhead_t for addr details to swallow_attribute dbghelp{dwarf}: now passing a parse_cuhead_t to compute_location() dbghelp{dwarf}: passing word_size as a parameter to a couple of frame related functions dbghelp{dwarf}: now using word_size from cuhead_t dbghelp{dwarf}: passing dwarf2_cuhead_t to lookuploclist() dbghelp{dwarf}: initialize module's word_size at module load time dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/dwarf.c | 167 ++++++++++++++++++++------------- dlls/dbghelp/symbol.c | 1 + 3 files changed, 103 insertions(+), 66 deletions(-)

2 12

[PATCH 1/2] ole32: Remove unused CoGetCallerTID() stub.
by Nikolay Sivov 10 Sep '21

10 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/ole2stubs.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c index 49130c51584..74b4e864403 100644 --- a/dlls/ole32/ole2stubs.c +++ b/dlls/ole32/ole2stubs.c @@ -81,12 +81,3 @@ HRESULT WINAPI DECLSPEC_HOTPATCH OleRegEnumFormatEtc ( return E_NOTIMPL; } - -/*********************************************************************** - * CoGetCallerTID [OLE32.@] - */ -HRESULT WINAPI CoGetCallerTID(LPDWORD lpdwTID) -{ - FIXME("stub!\n"); - return E_NOTIMPL; -} -- 2.33.0

2 3

[PATCH] uiautomationcore: Add UiaDisconnectProvider stub
by Alex Henrie 10 Sep '21

10 Sep '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51729 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/uiautomationcore/uia_main.c | 6 ++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 42014af6035..2dada95af80 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -89,3 +89,9 @@ HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **pr FIXME("(%p, %p): stub\n", hwnd, provider); return E_NOTIMPL; } + +HRESULT WINAPI UiaDisconnectProvider(IRawElementProviderSimple *provider) +{ + FIXME("(%p): stub\n", provider); + return E_NOTIMPL; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index c9b96ab39ef..656641c4bad 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -56,7 +56,7 @@ @ stub UiaAddEvent @ stdcall UiaClientsAreListening() #@ stub UiaDisconnectAllProviders -#@ stub UiaDisconnectProvider +@ stdcall UiaDisconnectProvider(ptr) @ stub UiaEventAddWindow @ stub UiaEventRemoveWindow @ stub UiaFind -- 2.33.0

1 0

[PATCH 1/2] winexinput.sys: Look for caps in the lower HID report descriptor.
by Rémi Bernon 10 Sep '21

10 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Fixed a leak when HidP_GetButtonCaps / HidP_GetValueCaps failed, split the patches from the other. dlls/winexinput.sys/main.c | 69 ++++++++++++++++++++++++++++++++++---- 1 file changed, 62 insertions(+), 7 deletions(-) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 60f7a8ed5dd..dfe747d6515 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -82,6 +82,14 @@ struct func_device WCHAR instance_id[MAX_DEVICE_ID_LEN]; + HIDP_VALUE_CAPS lx_caps; + HIDP_VALUE_CAPS ly_caps; + HIDP_VALUE_CAPS lt_caps; + HIDP_VALUE_CAPS rx_caps; + HIDP_VALUE_CAPS ry_caps; + HIDP_VALUE_CAPS rt_caps; + HIDP_DEVICE_DESC device_desc; + /* everything below requires holding the cs */ CRITICAL_SECTION cs; ULONG report_len; @@ -442,13 +450,27 @@ static NTSTATUS sync_ioctl(DEVICE_OBJECT *device, DWORD code, void *in_buf, DWOR return io.Status; } +static void check_value_caps(struct func_device *fdo, USHORT usage, HIDP_VALUE_CAPS *caps) +{ + switch (usage) + { + case HID_USAGE_GENERIC_X: fdo->lx_caps = *caps; break; + case HID_USAGE_GENERIC_Y: fdo->ly_caps = *caps; break; + case HID_USAGE_GENERIC_Z: fdo->lt_caps = *caps; break; + case HID_USAGE_GENERIC_RX: fdo->rx_caps = *caps; break; + case HID_USAGE_GENERIC_RY: fdo->ry_caps = *caps; break; + case HID_USAGE_GENERIC_RZ: fdo->rt_caps = *caps; break; + } +} + static NTSTATUS initialize_device(DEVICE_OBJECT *device) { struct func_device *fdo = fdo_from_DEVICE_OBJECT(device); - ULONG i, report_desc_len, report_count; + ULONG i, u, button_count, report_desc_len, report_count; PHIDP_REPORT_DESCRIPTOR report_desc; PHIDP_PREPARSED_DATA preparsed; - HIDP_DEVICE_DESC device_desc; + HIDP_BUTTON_CAPS *button_caps; + HIDP_VALUE_CAPS *value_caps; HIDP_REPORT_IDS *reports; HID_DESCRIPTOR hid_desc; NTSTATUS status; @@ -461,16 +483,49 @@ static NTSTATUS initialize_device(DEVICE_OBJECT *device) if (!(report_desc = malloc(report_desc_len))) return STATUS_NO_MEMORY; status = sync_ioctl(fdo->bus_device, IOCTL_HID_GET_REPORT_DESCRIPTOR, NULL, 0, report_desc, report_desc_len); - if (!status) status = HidP_GetCollectionDescription(report_desc, report_desc_len, PagedPool, &device_desc); + if (!status) status = HidP_GetCollectionDescription(report_desc, report_desc_len, PagedPool, &fdo->device_desc); free(report_desc); if (status != HIDP_STATUS_SUCCESS) return status; - preparsed = device_desc.CollectionDesc->PreparsedData; + preparsed = fdo->device_desc.CollectionDesc->PreparsedData; status = HidP_GetCaps(preparsed, &caps); if (status != HIDP_STATUS_SUCCESS) return status; - reports = device_desc.ReportIDs; - report_count = device_desc.ReportIDsLength; + button_count = 0; + if (!(button_caps = malloc(sizeof(*button_caps) * caps.NumberInputButtonCaps))) return STATUS_NO_MEMORY; + status = HidP_GetButtonCaps(HidP_Input, button_caps, &caps.NumberInputButtonCaps, preparsed); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetButtonCaps returned %#x\n", status); + else for (i = 0; i < caps.NumberInputButtonCaps; i++) + { + if (button_caps[i].UsagePage != HID_USAGE_PAGE_BUTTON) continue; + if (button_caps[i].IsRange) button_count = max(button_count, button_caps[i].Range.UsageMax); + else button_count = max(button_count, button_caps[i].NotRange.Usage); + } + free(button_caps); + if (status != HIDP_STATUS_SUCCESS) return status; + if (button_count < 10) WARN("only %u buttons found\n", button_count); + + if (!(value_caps = malloc(sizeof(*value_caps) * caps.NumberInputValueCaps))) return STATUS_NO_MEMORY; + status = HidP_GetValueCaps(HidP_Input, value_caps, &caps.NumberInputValueCaps, preparsed); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetValueCaps returned %#x\n", status); + else for (i = 0; i < caps.NumberInputValueCaps; i++) + { + HIDP_VALUE_CAPS *caps = value_caps + i; + if (caps->UsagePage != HID_USAGE_PAGE_GENERIC) continue; + if (!caps->IsRange) check_value_caps(fdo, caps->NotRange.Usage, caps); + else for (u = caps->Range.UsageMin; u <=caps->Range.UsageMax; u++) check_value_caps(fdo, u, value_caps + i); + } + free(value_caps); + if (status != HIDP_STATUS_SUCCESS) return status; + if (!fdo->lx_caps.UsagePage) WARN("missing lx axis\n"); + if (!fdo->ly_caps.UsagePage) WARN("missing ly axis\n"); + if (!fdo->lt_caps.UsagePage) WARN("missing lt axis\n"); + if (!fdo->rx_caps.UsagePage) WARN("missing rx axis\n"); + if (!fdo->ry_caps.UsagePage) WARN("missing ry axis\n"); + if (!fdo->rt_caps.UsagePage) WARN("missing rt axis\n"); + + reports = fdo->device_desc.ReportIDs; + report_count = fdo->device_desc.ReportIDsLength; for (i = 0; i < report_count; ++i) if (!reports[i].ReportID || reports[i].InputLength) break; if (i == report_count) i = 0; /* no input report?!, just use first ID */ @@ -478,7 +533,6 @@ static NTSTATUS initialize_device(DEVICE_OBJECT *device) if (!(fdo->report_buf = malloc(fdo->report_len))) return STATUS_NO_MEMORY; fdo->report_buf[0] = reports[i].ReportID; - HidP_FreeCollectionDescription(&device_desc); return STATUS_SUCCESS; } @@ -556,6 +610,7 @@ static NTSTATUS WINAPI fdo_pnp(DEVICE_OBJECT *device, IRP *irp) status = IoCallDriver(fdo->bus_device, irp); IoDetachDevice(fdo->bus_device); RtlDeleteCriticalSection(&fdo->cs); + HidP_FreeCollectionDescription(&fdo->device_desc); free(fdo->report_buf); IoDeleteDevice(device); return status; -- 2.33.0

1 1

[PATCH] ntdll: resolve drive symlink for mapped filename
by Matias Zuniga 10 Sep '21

10 Sep '21

Applications expect a path starting with a drive like '\Device\Harddisk1\' instead of a drive letter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51687 Signed-off-by: Matias Zuniga <matias.nicolas.zc(a)gmail.com> --- dlls/ntdll/unix/virtual.c | 76 ++++++++++++++++++++++++++++++++--- dlls/psapi/tests/psapi_main.c | 5 +-- 2 files changed, 71 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 8a1e35b6387..04eddf0e6f1 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -133,6 +133,8 @@ struct file_view } \ } while (0); +#define SYMBOLIC_LINK_QUERY 0x0001 + /* per-page protection flags */ #define VPROT_READ 0x01 #define VPROT_WRITE 0x02 @@ -4273,34 +4275,96 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, return STATUS_SUCCESS; } +static NTSTATUS read_nt_symlink( UNICODE_STRING *name, WCHAR *target, DWORD size ) +{ + NTSTATUS status; + OBJECT_ATTRIBUTES attr; + HANDLE handle; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = name; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if (!(status = NtOpenSymbolicLinkObject( &handle, SYMBOLIC_LINK_QUERY, &attr ))) + { + UNICODE_STRING targetW; + targetW.Buffer = target; + targetW.MaximumLength = (size - 1) * sizeof(WCHAR); + status = NtQuerySymbolicLinkObject( handle, &targetW, NULL ); + if (!status) target[targetW.Length / sizeof(WCHAR)] = 0; + NtClose( handle ); + } + return status; +} + +static NTSTATUS follow_device_symlink( WCHAR *buffer, SIZE_T max_path_len, WCHAR *name, SIZE_T *current_path_len ) +{ + WCHAR *p = buffer; + NTSTATUS status = STATUS_SUCCESS; + SIZE_T devname_len = 6; // e.g. \??\C: + UNICODE_STRING devname; + DWORD target_len; + + if (*current_path_len >= devname_len * sizeof(WCHAR) && name[devname_len - 1] == ':') { + devname.Buffer = name; + devname.Length = devname_len * sizeof(WCHAR); + if (!(status = read_nt_symlink( &devname, p, (max_path_len - *current_path_len) / sizeof(WCHAR) + devname_len + 1 ))) + { + target_len = lstrlenW(p); + *current_path_len -= devname_len * sizeof(WCHAR); // skip the device name + p += target_len; + + memcpy( p, name + devname_len, *current_path_len ); + *current_path_len += target_len * sizeof(WCHAR); + } + } + else memcpy( p, name, *current_path_len ); + + return status; +} + static NTSTATUS get_memory_section_name( HANDLE process, LPCVOID addr, MEMORY_SECTION_NAME *info, SIZE_T len, SIZE_T *ret_len ) { + SIZE_T current_path_len, max_path_len; + WCHAR *name; NTSTATUS status; if (!info) return STATUS_ACCESS_VIOLATION; + max_path_len = len - sizeof(*info) - sizeof(WCHAR); // dont count null char + if (!(name = malloc( max_path_len ))) return STATUS_NO_MEMORY; SERVER_START_REQ( get_mapping_filename ) { req->process = wine_server_obj_handle( process ); req->addr = wine_server_client_ptr( addr ); if (len > sizeof(*info) + sizeof(WCHAR)) - wine_server_set_reply( req, info + 1, len - sizeof(*info) - sizeof(WCHAR) ); + wine_server_set_reply( req, name, max_path_len ); status = wine_server_call( req ); if (!status || status == STATUS_BUFFER_OVERFLOW) { - if (ret_len) *ret_len = sizeof(*info) + reply->len + sizeof(WCHAR); - if (len < sizeof(*info)) status = STATUS_INFO_LENGTH_MISMATCH; + current_path_len = reply->len; + if (len < sizeof(*info)) + { + status = STATUS_INFO_LENGTH_MISMATCH; + } + else if (!status) status = follow_device_symlink( (WCHAR *)(info + 1), max_path_len, name, &current_path_len); + + if (ret_len) *ret_len = sizeof(*info) + current_path_len + sizeof(WCHAR); if (!status) { info->SectionFileName.Buffer = (WCHAR *)(info + 1); - info->SectionFileName.Length = reply->len; - info->SectionFileName.MaximumLength = reply->len + sizeof(WCHAR); - info->SectionFileName.Buffer[reply->len / sizeof(WCHAR)] = 0; + info->SectionFileName.Length = current_path_len; + info->SectionFileName.MaximumLength = current_path_len + sizeof(WCHAR); + info->SectionFileName.Buffer[current_path_len / sizeof(WCHAR)] = 0; } } } SERVER_END_REQ; + free(name); return status; } diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index c4a740310a4..d6fb8e69384 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -471,7 +471,6 @@ static void test_GetMappedFileName(void) ret = GetMappedFileNameA(GetCurrentProcess(), base, map_name, sizeof(map_name)); ok(ret, "GetMappedFileName error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); - todo_wine ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); SetLastError(0xdeadbeef); @@ -482,7 +481,6 @@ static void test_GetMappedFileName(void) { ok(memcmp(map_nameW, nt_map_name, lstrlenW(map_nameW)) == 0, "map name does not start with a device name: %s\n", map_name); WideCharToMultiByte(CP_ACP, 0, map_nameW, -1, map_name, MAX_PATH, NULL, NULL); - todo_wine ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); } @@ -490,7 +488,6 @@ static void test_GetMappedFileName(void) ret = GetMappedFileNameA(GetCurrentProcess(), base + 0x2000, map_name, sizeof(map_name)); ok(ret, "GetMappedFileName error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); - todo_wine ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); SetLastError(0xdeadbeef); @@ -566,7 +563,7 @@ static void test_GetProcessImageFileName(void) { /* Windows returns 2*strlen-1 */ ok(ret >= strlen(szImgPath), "szImgPath=\"%s\" ret=%d\n", szImgPath, ret); - todo_wine ok(!strcmp(szImgPath, szMapPath), "szImgPath=\"%s\" szMapPath=\"%s\"\n", szImgPath, szMapPath); + ok(!strcmp(szImgPath, szMapPath), "szImgPath=\"%s\" szMapPath=\"%s\"\n", szImgPath, szMapPath); } SetLastError(0xdeadbeef); -- 2.31.1

2 1

[PATCH] winemac.drv: Allow cycling of windows with Cmd+`.
by Tim Clem 09 Sep '21

09 Sep '21

We already set up the Window menu and set the relevant bits in collectionBehavior, but windows must respond YES to -canBecomeKeyWindow in order to actually be activated by Cmd+` window cycling. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- I tested to make sure this doesn't change keyboard events, and it doesn't. Cocoa consumes Cmd+` early, so Windows apps already weren't getting any keypresses related to it. All other window focus behavior is unchanged by this patch, since the disabled and noActivate checks remain in place and take priority. dlls/winemac.drv/cocoa_window.m | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 0926756c875..80cb2693409 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -2358,7 +2358,11 @@ - (BOOL) canBecomeKeyWindow { if (causing_becomeKeyWindow == self) return YES; if (self.disabled || self.noActivate) return NO; - return [self isKeyWindow]; + if ([self isKeyWindow]) return YES; + + // If a window's collectionBehavior says it participates in cycling, + // it must return YES from this method to actually be eligible. + return ![self isExcludedFromWindowsMenu]; } - (BOOL) canBecomeMainWindow -- 2.32.0

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 09 Sep '21

09 Sep '21

2 1

[PATCH] po: Update Dutch translation.
by Floris Renaud 09 Sep '21

09 Sep '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 464 +++++++++++++++++++++++-------------------------------- 1 file changed, 190 insertions(+), 274 deletions(-) diff --git a/po/nl.po b/po/nl.po index ce47892aba7..d803bb95b4a 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-06-04 19:40+0200\n" +"PO-Revision-Date: 2021-09-11 20:20+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -10339,7 +10339,7 @@ msgstr "China Zomertijd" #: dlls/tzres/tzres.rc:128 msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" -msgstr "" +msgstr "(UTC+8:00) Peking, Tsjoengking, Hongkong, Urumqi" #: dlls/tzres/tzres.rc:267 msgid "North Asia Standard Time" @@ -10351,7 +10351,7 @@ msgstr "Noord-Azië Zomertijd" #: dlls/tzres/tzres.rc:269 msgid "(UTC+07:00) Krasnoyarsk" -msgstr "" +msgstr "(UTC+07:00) Krasnojarsk" #: dlls/tzres/tzres.rc:168 msgid "Georgian Standard Time" @@ -10363,17 +10363,15 @@ msgstr "Georgië Zomertijd" #: dlls/tzres/tzres.rc:170 msgid "(UTC+04:00) Tbilisi" -msgstr "" +msgstr "(UTC+04:00) Tbilisi" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 msgid "UTC+12" -msgstr "" +msgstr "UTC+12" #: dlls/tzres/tzres.rc:392 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC+12:00) Coordinated Universal Time+12" -msgstr "UTC" +msgstr "(UTC+12:00 Gecoördineerde Wereldtijd+12" #: dlls/tzres/tzres.rc:252 msgid "Nepal Standard Time" @@ -10385,7 +10383,7 @@ msgstr "Nepal Zomertijd" #: dlls/tzres/tzres.rc:254 msgid "(UTC+05:45) Kathmandu" -msgstr "" +msgstr "(UTC+05:45) Kathmandu" #: dlls/tzres/tzres.rc:90 msgid "Cape Verde Standard Time" @@ -10397,7 +10395,7 @@ msgstr "Kaapverdië Zomertijd" #: dlls/tzres/tzres.rc:92 msgid "(UTC-01:00) Cabo Verde Is." -msgstr "" +msgstr "(UTC-01:00) Kaapverdië" #: dlls/tzres/tzres.rc:183 msgid "Haiti Standard Time" @@ -10409,7 +10407,7 @@ msgstr "Haïti Zomertijd" #: dlls/tzres/tzres.rc:185 msgid "(UTC-05:00) Haiti" -msgstr "" +msgstr "(UTC-05:00) Haïti" #: dlls/tzres/tzres.rc:111 msgid "Central European Standard Time" @@ -10421,7 +10419,7 @@ msgstr "Midden-Europese Zomertijd" #: dlls/tzres/tzres.rc:113 msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" -msgstr "" +msgstr "(UTC+01:00) Sarajevo, Skopje, Warschau, Zagreb" #: dlls/tzres/tzres.rc:234 msgid "Morocco Standard Time" @@ -10433,33 +10431,27 @@ msgstr "Marokko Zomertijd" #: dlls/tzres/tzres.rc:236 msgid "(UTC+01:00) Casablanca" -msgstr "" +msgstr "(UTC+01:00) Casablanca" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 msgid "UTC-08" -msgstr "" +msgstr "UTC-08" #: dlls/tzres/tzres.rc:401 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-08:00) Coordinated Universal Time-08" -msgstr "UTC" +msgstr "(UTC-08:00) Gecoördineerde Wereldtijd-08" #: dlls/tzres/tzres.rc:39 -#, fuzzy -#| msgid "Atlantic Standard Time" msgid "Altai Standard Time" -msgstr "Atlantische Standaard Tijd" +msgstr "Altaj Standaard Tijd" #: dlls/tzres/tzres.rc:40 -#, fuzzy -#| msgid "Atlantic Daylight Time" msgid "Altai Daylight Time" -msgstr "Atlantische tijd Zomertijd" +msgstr "Altaj Zomertijd" #: dlls/tzres/tzres.rc:41 msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" -msgstr "" +msgstr "(UTC+07:00 Barnaoel, Gorno-Altajsk" #: dlls/tzres/tzres.rc:108 msgid "Central Europe Standard Time" @@ -10471,7 +10463,7 @@ msgstr "Centraal Europa Zomertijd" #: dlls/tzres/tzres.rc:110 msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" -msgstr "" +msgstr "(UTC+01:00) Belgrado, Bratislava, Boedapest, Ljubljana, Praag" #: dlls/tzres/tzres.rc:192 msgid "Iran Standard Time" @@ -10483,7 +10475,7 @@ msgstr "Iran Zomertijd" #: dlls/tzres/tzres.rc:194 msgid "(UTC+03:30) Tehran" -msgstr "" +msgstr "(UTC+03:30) Teheran" #: dlls/tzres/tzres.rc:318 msgid "Saint Pierre Standard Time" @@ -10494,26 +10486,20 @@ msgid "Saint Pierre Daylight Time" msgstr "Saint-Pierre Zomertijd" #: dlls/tzres/tzres.rc:320 -#, fuzzy -#| msgid "Saint Pierre Standard Time" msgid "(UTC-03:00) Saint Pierre and Miquelon" -msgstr "Saint-Pierre Standaard Tijd" +msgstr "(UTC-03:00) Saint-Pierre en Miquelon" #: dlls/tzres/tzres.rc:327 -#, fuzzy -#| msgid "Samoa Standard Time" msgid "Sao Tome Standard Time" -msgstr "Samoa Standaard Tijd" +msgstr "Sao Tomé Standaard Tijd" #: dlls/tzres/tzres.rc:328 -#, fuzzy -#| msgid "Samoa Daylight Time" msgid "Sao Tome Daylight Time" -msgstr "Samoa Zomertijd" +msgstr "Sao Tomé Zomertijd" #: dlls/tzres/tzres.rc:329 msgid "(UTC+00:00) Sao Tome" -msgstr "" +msgstr "(UTC+00:00) Sao Tomé" #: dlls/tzres/tzres.rc:249 msgid "Namibia Standard Time" @@ -10525,7 +10511,7 @@ msgstr "Namibië Zomertijd" #: dlls/tzres/tzres.rc:251 msgid "(UTC+02:00) Windhoek" -msgstr "" +msgstr "(UTC+02:00) Windhoek" #: dlls/tzres/tzres.rc:366 msgid "Tonga Standard Time" @@ -10537,7 +10523,7 @@ msgstr "Tonga Zomertijd" #: dlls/tzres/tzres.rc:368 msgid "(UTC+13:00) Nuku'alofa" -msgstr "" +msgstr "(UTC+13:00) Nuku'alofa" #: dlls/tzres/tzres.rc:240 msgid "Mountain Standard Time (Mexico)" @@ -10549,7 +10535,7 @@ msgstr "Mountain Zomertijd (Mexico)" #: dlls/tzres/tzres.rc:242 msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" -msgstr "" +msgstr "(UTC-07:00) Chihuahua, La Paz, Mazatlán" #: dlls/tzres/tzres.rc:171 msgid "GMT Standard Time" @@ -10561,7 +10547,7 @@ msgstr "GMT Zomertijd" #: dlls/tzres/tzres.rc:173 msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" -msgstr "" +msgstr "(UTC+00:00) Dublin, Edinburgh, Lissabon, Londen" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" @@ -10573,7 +10559,7 @@ msgstr "Centraal Azië Zomertijd" #: dlls/tzres/tzres.rc:104 msgid "(UTC+06:00) Astana" -msgstr "" +msgstr "(UTC+06:00) Astana" #: dlls/tzres/tzres.rc:213 msgid "Lord Howe Standard Time" @@ -10585,7 +10571,7 @@ msgstr "Lord Howe Zomertijd" #: dlls/tzres/tzres.rc:215 msgid "(UTC+10:30) Lord Howe Island" -msgstr "" +msgstr "(UTC+10:30) Lord Howe-eiland" #: dlls/tzres/tzres.rc:48 msgid "Arabic Standard Time" @@ -10597,17 +10583,15 @@ msgstr "Arabisch Schiereiland Zomertijd" #: dlls/tzres/tzres.rc:50 msgid "(UTC+03:00) Baghdad" -msgstr "" +msgstr "(UTC+03:00) Bagdad" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 msgid "UTC+13" -msgstr "" +msgstr "UTC+13" #: dlls/tzres/tzres.rc:395 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC+13:00) Coordinated Universal Time+13" -msgstr "UTC" +msgstr "(UTC+13:00) Gecoördineerde Wereldtijd+13" #: dlls/tzres/tzres.rc:216 msgid "Magadan Standard Time" @@ -10619,7 +10603,7 @@ msgstr "Magadan Zomertijd" #: dlls/tzres/tzres.rc:218 msgid "(UTC+11:00) Magadan" -msgstr "" +msgstr "(UTC+11:00) Magadan" #: dlls/tzres/tzres.rc:258 msgid "Newfoundland Standard Time" @@ -10631,23 +10615,19 @@ msgstr "Newfoundland Zomertijd" #: dlls/tzres/tzres.rc:260 msgid "(UTC-03:30) Newfoundland" -msgstr "" +msgstr "(UTC-03:30) Newfoundland" #: dlls/tzres/tzres.rc:345 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "Sudan Standard Time" -msgstr "Jordanië Standaard Tijd" +msgstr "Soedan Standaard Tijd" #: dlls/tzres/tzres.rc:346 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "Sudan Daylight Time" -msgstr "Jordanië Zomertijd" +msgstr "Soedan Zomertijd" #: dlls/tzres/tzres.rc:347 msgid "(UTC+02:00) Khartoum" -msgstr "" +msgstr "(UTC+02:00) Khartoem" #: dlls/tzres/tzres.rc:435 msgid "West Pacific Standard Time" @@ -10659,7 +10639,7 @@ msgstr "West Pacific Zomertijd" #: dlls/tzres/tzres.rc:437 msgid "(UTC+10:00) Guam, Port Moresby" -msgstr "" +msgstr "(UTC+10:00) Guam, Port Moresby" #: dlls/tzres/tzres.rc:279 msgid "Pacific Standard Time" @@ -10671,7 +10651,7 @@ msgstr "Pacific Zomertijd" #: dlls/tzres/tzres.rc:281 msgid "(UTC-08:00) Pacific Time (US & Canada)" -msgstr "" +msgstr "(UTC-08:00) Pacific Time (VS & Canada)" #: dlls/tzres/tzres.rc:69 msgid "Azerbaijan Standard Time" @@ -10683,7 +10663,7 @@ msgstr "Azerbeidzjan Zomertijd" #: dlls/tzres/tzres.rc:71 msgid "(UTC+04:00) Baku" -msgstr "" +msgstr "(UTC+04:00) Bakoe" #: dlls/tzres/tzres.rc:219 msgid "Magallanes Standard Time" @@ -10695,7 +10675,7 @@ msgstr "Magallanes Zomertijd" #: dlls/tzres/tzres.rc:221 msgid "(UTC-03:00) Punta Arenas" -msgstr "" +msgstr "(UTC-03:00) Punta Arenas" #: dlls/tzres/tzres.rc:324 msgid "Samoa Standard Time" @@ -10707,7 +10687,7 @@ msgstr "Samoa Zomertijd" #: dlls/tzres/tzres.rc:326 msgid "(UTC+13:00) Samoa" -msgstr "" +msgstr "(UTC+13:00) Samoa" #: dlls/tzres/tzres.rc:201 msgid "Kaliningrad Standard Time" @@ -10719,7 +10699,7 @@ msgstr "Kaliningrad Zomertijd" #: dlls/tzres/tzres.rc:203 msgid "(UTC+02:00) Kaliningrad" -msgstr "" +msgstr "(UTC+02:00) Kaliningrad" #: dlls/tzres/tzres.rc:282 msgid "Pacific Standard Time (Mexico)" @@ -10731,7 +10711,7 @@ msgstr "Pacific Zomertijd (Mexico)" #: dlls/tzres/tzres.rc:284 msgid "(UTC-08:00) Baja California" -msgstr "" +msgstr "(UTC-08:00) Baja California" #: dlls/tzres/tzres.rc:228 msgid "Middle East Standard Time" @@ -10743,7 +10723,7 @@ msgstr "Midden-Oosten Zomertijd" #: dlls/tzres/tzres.rc:230 msgid "(UTC+02:00) Beirut" -msgstr "" +msgstr "(UTC+02:00) Beiroet" #: dlls/tzres/tzres.rc:360 msgid "Tokyo Standard Time" @@ -10755,7 +10735,7 @@ msgstr "Tokio Zomertijd" #: dlls/tzres/tzres.rc:362 msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" -msgstr "" +msgstr "(UTC+09:00) Osaka, Sapporo, Tokio" #: dlls/tzres/tzres.rc:210 msgid "Line Islands Standard Time" @@ -10767,7 +10747,7 @@ msgstr "Line-eilanden Zomertijd" #: dlls/tzres/tzres.rc:212 msgid "(UTC+14:00) Kiritimati Island" -msgstr "" +msgstr "(UTC+14:00) Kiritimati-eiland" #: dlls/tzres/tzres.rc:129 msgid "Cuba Standard Time" @@ -10779,7 +10759,7 @@ msgstr "Cuba Zomertijd" #: dlls/tzres/tzres.rc:131 msgid "(UTC-05:00) Havana" -msgstr "" +msgstr "(UTC-05:00) Havana" #: dlls/tzres/tzres.rc:198 msgid "Jordan Standard Time" @@ -10791,7 +10771,7 @@ msgstr "Jordanië Zomertijd" #: dlls/tzres/tzres.rc:200 msgid "(UTC+02:00) Amman" -msgstr "" +msgstr "(UTC+02:00) Amman" #: dlls/tzres/tzres.rc:117 msgid "Central Standard Time" @@ -10803,31 +10783,27 @@ msgstr "CST Zomertijd" #: dlls/tzres/tzres.rc:119 msgid "(UTC-06:00) Central Time (US & Canada)" -msgstr "" +msgstr "(UTC-06:00) Central Time (VS & Canada)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 msgid "Russia Time Zone 3" -msgstr "" +msgstr "Rusland tijdzone 3" #: dlls/tzres/tzres.rc:305 msgid "(UTC+04:00) Izhevsk, Samara" -msgstr "" +msgstr "(UTC+04:00) Izhevsk, Samara" #: dlls/tzres/tzres.rc:414 -#, fuzzy -#| msgid "Tonga Standard Time" msgid "Volgograd Standard Time" -msgstr "Tonga Standaard Tijd" +msgstr "Wolgograd Standaard Tijd" #: dlls/tzres/tzres.rc:415 -#, fuzzy -#| msgid "Tonga Daylight Time" msgid "Volgograd Daylight Time" -msgstr "Tonga Zomertijd" +msgstr "Wolgograd Zomertijd" #: dlls/tzres/tzres.rc:416 msgid "(UTC+04:00) Volgograd" -msgstr "" +msgstr "(UTC+04:00) Wolgograd" #: dlls/tzres/tzres.rc:72 msgid "Azores Standard Time" @@ -10839,7 +10815,7 @@ msgstr "Azoren Zomertijd" #: dlls/tzres/tzres.rc:74 msgid "(UTC-01:00) Azores" -msgstr "" +msgstr "(UTC-01:00) Azoren" #: dlls/tzres/tzres.rc:264 msgid "North Asia East Standard Time" @@ -10851,17 +10827,15 @@ msgstr "Noord-Oost Azië Zomertijd" #: dlls/tzres/tzres.rc:266 msgid "(UTC+08:00) Irkutsk" -msgstr "" +msgstr "(UTC+08:00) Irkoetsk" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 msgid "UTC-11" -msgstr "" +msgstr "UTC-11" #: dlls/tzres/tzres.rc:407 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-11:00) Coordinated Universal Time-11" -msgstr "UTC" +msgstr "(UTC-11:00) Gecoördineerde Wereldtijd-11" #: dlls/tzres/tzres.rc:51 msgid "Argentina Standard Time" @@ -10873,23 +10847,19 @@ msgstr "Argentinië Zomertijd" #: dlls/tzres/tzres.rc:53 msgid "(UTC-03:00) City of Buenos Aires" -msgstr "" +msgstr "(UTC-03:00) Buenos Aires (stad)" #: dlls/tzres/tzres.rc:375 -#, fuzzy -#| msgid "Turkey Standard Time" msgid "Turks And Caicos Standard Time" -msgstr "Turkije Standaard Tijd" +msgstr "Turks- en Caicoseilanden Standaard Tijd" #: dlls/tzres/tzres.rc:376 -#, fuzzy -#| msgid "Turkey Daylight Time" msgid "Turks And Caicos Daylight Time" -msgstr "Turkije Zomertijd" +msgstr "Turks- en Caicoseilanden Zomertijd" #: dlls/tzres/tzres.rc:377 msgid "(UTC-05:00) Turks and Caicos" -msgstr "" +msgstr "(UTC-05:00) Turks- en Caicoseilanden" #: dlls/tzres/tzres.rc:222 msgid "Marquesas Standard Time" @@ -10901,7 +10871,7 @@ msgstr "Marquesas Zomertijd" #: dlls/tzres/tzres.rc:224 msgid "(UTC-09:30) Marquesas Islands" -msgstr "" +msgstr "(UTC-09:30) Marquesaseilanden" #: dlls/tzres/tzres.rc:243 msgid "Myanmar Standard Time" @@ -10913,17 +10883,15 @@ msgstr "Myanmar Zomertijd" #: dlls/tzres/tzres.rc:245 msgid "(UTC+06:30) Yangon (Rangoon)" -msgstr "" +msgstr "(UTC+06:30) Yangon (Rangoon)" #: dlls/tzres/tzres.rc:387 dlls/tzres/tzres.rc:388 msgid "Coordinated Universal Time" -msgstr "UTC" +msgstr "Gecoördineerde Wereldtijd" #: dlls/tzres/tzres.rc:389 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC) Coordinated Universal Time" -msgstr "UTC" +msgstr "(UTC) Gecoördineerde Wereldtijd" #: dlls/tzres/tzres.rc:189 msgid "India Standard Time" @@ -10935,7 +10903,7 @@ msgstr "India Zomertijd" #: dlls/tzres/tzres.rc:191 msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" -msgstr "" +msgstr "(UTC+05:30) Madras, Calcutta, Mumbai, New Delhi" #: dlls/tzres/tzres.rc:180 msgid "GTB Standard Time" @@ -10947,7 +10915,7 @@ msgstr "GTB Zomertijd" #: dlls/tzres/tzres.rc:182 msgid "(UTC+02:00) Athens, Bucharest" -msgstr "" +msgstr "(UTC+02:00) Athene, Boekarest" #: dlls/tzres/tzres.rc:372 msgid "Turkey Standard Time" @@ -10959,23 +10927,19 @@ msgstr "Turkije Zomertijd" #: dlls/tzres/tzres.rc:374 msgid "(UTC+03:00) Istanbul" -msgstr "" +msgstr "(UTC+03:00) Istanboel" #: dlls/tzres/tzres.rc:54 -#, fuzzy -#| msgid "Arabian Standard Time" msgid "Astrakhan Standard Time" -msgstr "Arabische Standaard Tijd" +msgstr "Astrachan Standaard Tijd" #: dlls/tzres/tzres.rc:55 -#, fuzzy -#| msgid "Arabian Daylight Time" msgid "Astrakhan Daylight Time" -msgstr "Arabische Zomertijd" +msgstr "Astrachan Zomertijd" #: dlls/tzres/tzres.rc:56 msgid "(UTC+04:00) Astrakhan, Ulyanovsk" -msgstr "" +msgstr "(UTC+04:00) Astrachan, Oeljanovsk" #: dlls/tzres/tzres.rc:162 msgid "Fiji Standard Time" @@ -10987,7 +10951,7 @@ msgstr "Fiji Zomertijd" #: dlls/tzres/tzres.rc:164 msgid "(UTC+12:00) Fiji" -msgstr "" +msgstr "(UTC+12:00) Fiji" #: dlls/tzres/tzres.rc:87 msgid "Canada Central Standard Time" @@ -10999,23 +10963,19 @@ msgstr "Centraal Canada Zomertijd" #: dlls/tzres/tzres.rc:89 msgid "(UTC-06:00) Saskatchewan" -msgstr "" +msgstr "(UTC-06:00) Saskatchewan" #: dlls/tzres/tzres.rc:441 -#, fuzzy -#| msgid "Yakutsk Standard Time" msgid "Yukon Standard Time" -msgstr "Yakutsk Standaard Tijd" +msgstr "Yukon Standaard Tijd" #: dlls/tzres/tzres.rc:442 -#, fuzzy -#| msgid "Yakutsk Daylight Time" msgid "Yukon Daylight Time" -msgstr "Yakutsk Zomertijd" +msgstr "Yukon Zomertijd" #: dlls/tzres/tzres.rc:443 msgid "(UTC-07:00) Yukon" -msgstr "" +msgstr "(UTC-07:00) Yukon" #: dlls/tzres/tzres.rc:351 msgid "Taipei Standard Time" @@ -11027,7 +10987,7 @@ msgstr "Taiwan Zomertijd" #: dlls/tzres/tzres.rc:353 msgid "(UTC+08:00) Taipei" -msgstr "" +msgstr "(UTC+08:00) Taiwan" #: dlls/tzres/tzres.rc:423 msgid "W. Europe Standard Time" @@ -11039,7 +10999,7 @@ msgstr "West-Europa Zomertijd" #: dlls/tzres/tzres.rc:425 msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" -msgstr "" +msgstr "(UTC+01:00) Amsterdam, Berlijn, Bern, Rome, Stockholm, Wenen" #: dlls/tzres/tzres.rc:231 msgid "Montevideo Standard Time" @@ -11051,7 +11011,7 @@ msgstr "Montevideo Zomertijd" #: dlls/tzres/tzres.rc:233 msgid "(UTC-03:00) Montevideo" -msgstr "" +msgstr "(UTC-03:00) Montevideo" #: dlls/tzres/tzres.rc:285 msgid "Pakistan Standard Time" @@ -11063,23 +11023,19 @@ msgstr "Pakistan Zomertijd" #: dlls/tzres/tzres.rc:287 msgid "(UTC+05:00) Islamabad, Karachi" -msgstr "" +msgstr "(UTC+05:00) Islamabad, Karachi" #: dlls/tzres/tzres.rc:363 -#, fuzzy -#| msgid "Tokyo Standard Time" msgid "Tomsk Standard Time" -msgstr "Tokio Standaard Tijd" +msgstr "Tomsk Standaard Tijd" #: dlls/tzres/tzres.rc:364 -#, fuzzy -#| msgid "Tokyo Daylight Time" msgid "Tomsk Daylight Time" -msgstr "Tokio Zomertijd" +msgstr "Tomsk Zomertijd" #: dlls/tzres/tzres.rc:365 msgid "(UTC+07:00) Tomsk" -msgstr "" +msgstr "(UTC+07:00) Tomsk" #: dlls/tzres/tzres.rc:93 msgid "Caucasus Standard Time" @@ -11091,7 +11047,7 @@ msgstr "Kaukasus Zomertijd" #: dlls/tzres/tzres.rc:95 msgid "(UTC+04:00) Yerevan" -msgstr "" +msgstr "(UTC+04:00) Jerevan" #: dlls/tzres/tzres.rc:66 msgid "AUS Eastern Standard Time" @@ -11103,7 +11059,7 @@ msgstr "Oost-Australië Zomertijd" #: dlls/tzres/tzres.rc:68 msgid "(UTC+10:00) Canberra, Melbourne, Sydney" -msgstr "" +msgstr "(UTC+10:00) Canberra, Melbourne, Sydney" #: dlls/tzres/tzres.rc:246 msgid "N. Central Asia Standard Time" @@ -11115,7 +11071,7 @@ msgstr "Noordcentraal-Azië Zomertijd" #: dlls/tzres/tzres.rc:248 msgid "(UTC+07:00) Novosibirsk" -msgstr "" +msgstr "(UTC+07:00) Novosibirsk" #: dlls/tzres/tzres.rc:150 msgid "Eastern Standard Time" @@ -11127,39 +11083,31 @@ msgstr "Oostkust Zomertijd" #: dlls/tzres/tzres.rc:152 msgid "(UTC-05:00) Eastern Time (US & Canada)" -msgstr "" +msgstr "(UTC-05:00) Oostkust (VS & Canada)" #: dlls/tzres/tzres.rc:369 -#, fuzzy -#| msgid "Tasmania Standard Time" msgid "Transbaikal Standard Time" -msgstr "Tasmanië Standaard Tijd" +msgstr "Transbaikal Standaard Tijd" #: dlls/tzres/tzres.rc:370 -#, fuzzy -#| msgid "Tasmania Daylight Time" msgid "Transbaikal Daylight Time" -msgstr "Tasmanië Zomertijd" +msgstr "Transbaikal Zomertijd" #: dlls/tzres/tzres.rc:371 msgid "(UTC+09:00) Chita" -msgstr "" +msgstr "(UTC+09:00) Chita" #: dlls/tzres/tzres.rc:141 -#, fuzzy -#| msgid "W. Europe Standard Time" msgid "E. Europe Standard Time" -msgstr "West-Europa Standaard Tijd" +msgstr "Oost-Europa Standaard Tijd" #: dlls/tzres/tzres.rc:142 -#, fuzzy -#| msgid "W. Europe Daylight Time" msgid "E. Europe Daylight Time" -msgstr "West-Europa Zomertijd" +msgstr "Oost-Europa Zomertijd" #: dlls/tzres/tzres.rc:143 msgid "(UTC+02:00) Chisinau" -msgstr "" +msgstr "(UTC+02:00) Chisinau" #: dlls/tzres/tzres.rc:120 msgid "Central Standard Time (Mexico)" @@ -11171,23 +11119,19 @@ msgstr "CST Zomertijd (Mexico)" #: dlls/tzres/tzres.rc:122 msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" -msgstr "" +msgstr "(UTC-06:00) Guadalajara, Mexico-Stad, Monterrey" #: dlls/tzres/tzres.rc:330 -#, fuzzy -#| msgid "Samoa Standard Time" msgid "Saratov Standard Time" -msgstr "Samoa Standaard Tijd" +msgstr "Saratov Standaard Tijd" #: dlls/tzres/tzres.rc:331 -#, fuzzy -#| msgid "Samoa Daylight Time" msgid "Saratov Daylight Time" -msgstr "Samoa Zomertijd" +msgstr "Saratov Zomertijd" #: dlls/tzres/tzres.rc:332 msgid "(UTC+04:00) Saratov" -msgstr "" +msgstr "(UTC+04:00) Saratov" #: dlls/tzres/tzres.rc:57 msgid "Atlantic Standard Time" @@ -11199,7 +11143,7 @@ msgstr "Atlantische tijd Zomertijd" #: dlls/tzres/tzres.rc:59 msgid "(UTC-04:00) Atlantic Time (Canada)" -msgstr "" +msgstr "(UTC-04:00) Atlantische tijd (Canada)" #: dlls/tzres/tzres.rc:237 msgid "Mountain Standard Time" @@ -11211,7 +11155,7 @@ msgstr "Mountain Zomertijd" #: dlls/tzres/tzres.rc:239 msgid "(UTC-07:00) Mountain Time (US & Canada)" -msgstr "" +msgstr "(UTC-07:00) Mountain Tijd (VS & Canada)" #: dlls/tzres/tzres.rc:381 msgid "US Eastern Standard Time" @@ -11223,35 +11167,31 @@ msgstr "VS Oost Zomertijd" #: dlls/tzres/tzres.rc:383 msgid "(UTC-05:00) Indiana (East)" -msgstr "" +msgstr "(UTC-05:00) Indiana (Oost)" #: dlls/tzres/tzres.rc:321 -#, fuzzy -#| msgid "Alaskan Standard Time" msgid "Sakhalin Standard Time" -msgstr "Alaska Standaard Tijd" +msgstr "Sachalin Standaard Tijd" #: dlls/tzres/tzres.rc:322 -#, fuzzy -#| msgid "Alaskan Daylight Time" msgid "Sakhalin Daylight Time" -msgstr "Alaska Zomertijd" +msgstr "Sachalin Zomertijd" #: dlls/tzres/tzres.rc:323 msgid "(UTC+11:00) Sakhalin" -msgstr "" +msgstr "(UTC+11:00) Sachalin" #: dlls/tzres/tzres.rc:270 msgid "North Korea Standard Time" -msgstr "Noord Korea Standaard Tijd" +msgstr "Noord-Korea Standaard Tijd" #: dlls/tzres/tzres.rc:271 msgid "North Korea Daylight Time" -msgstr "Noord Korea Zomertijd" +msgstr "Noord-Korea Zomertijd" #: dlls/tzres/tzres.rc:272 msgid "(UTC+09:00) Pyongyang" -msgstr "" +msgstr "(UTC+09:00) Pyongyang" #: dlls/tzres/tzres.rc:354 msgid "Tasmania Standard Time" @@ -11263,7 +11203,7 @@ msgstr "Tasmanië Zomertijd" #: dlls/tzres/tzres.rc:356 msgid "(UTC+10:00) Hobart" -msgstr "" +msgstr "(UTC+10:00) Hobart" #: dlls/tzres/tzres.rc:99 msgid "Central America Standard Time" @@ -11275,17 +11215,15 @@ msgstr "Centraal-Amerika Zomertijd" #: dlls/tzres/tzres.rc:101 msgid "(UTC-06:00) Central America" -msgstr "" +msgstr "(UTC-06:00) Centraal-Amerika" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 msgid "UTC-02" -msgstr "" +msgstr "UTC-02" #: dlls/tzres/tzres.rc:398 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-02:00) Coordinated Universal Time-02" -msgstr "UTC" +msgstr "(UTC-02:00) Gecoördineerde Wereldtijd-02" #: dlls/tzres/tzres.rc:384 msgid "US Mountain Standard Time" @@ -11297,7 +11235,7 @@ msgstr "VS Mountain Zomertijd" #: dlls/tzres/tzres.rc:386 msgid "(UTC-07:00) Arizona" -msgstr "" +msgstr "(UTC-07:00) Arizona" #: dlls/tzres/tzres.rc:339 msgid "South Africa Standard Time" @@ -11309,7 +11247,7 @@ msgstr "Zuid-Afrika Zomertijd" #: dlls/tzres/tzres.rc:341 msgid "(UTC+02:00) Harare, Pretoria" -msgstr "" +msgstr "(UTC+02:00) Harare, Pretoria" #: dlls/tzres/tzres.rc:96 msgid "Cen. Australia Standard Time" @@ -11321,17 +11259,15 @@ msgstr "Centraal Australië Zomertijd" #: dlls/tzres/tzres.rc:98 msgid "(UTC+09:30) Adelaide" -msgstr "" +msgstr "(UTC+09:30) Adelaide" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 msgid "UTC-09" -msgstr "" +msgstr "UTC-09" #: dlls/tzres/tzres.rc:404 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-09:00) Coordinated Universal Time-09" -msgstr "UTC" +msgstr "(UTC-09:00) Gecoördineerde Wereldtijd-09" #: dlls/tzres/tzres.rc:342 msgid "Sri Lanka Standard Time" @@ -11343,7 +11279,7 @@ msgstr "Sri Lanka Zomertijd" #: dlls/tzres/tzres.rc:344 msgid "(UTC+05:30) Sri Jayawardenepura" -msgstr "" +msgstr "(UTC+05:30) Sri Jayawardenepura" #: dlls/tzres/tzres.rc:30 msgid "Afghanistan Standard Time" @@ -11355,7 +11291,7 @@ msgstr "Afghanistan Zomertijd" #: dlls/tzres/tzres.rc:32 msgid "(UTC+04:30) Kabul" -msgstr "" +msgstr "(UTC+04:30) Kabul" #: dlls/tzres/tzres.rc:438 msgid "Yakutsk Standard Time" @@ -11367,7 +11303,7 @@ msgstr "Yakutsk Zomertijd" #: dlls/tzres/tzres.rc:440 msgid "(UTC+09:00) Yakutsk" -msgstr "" +msgstr "(UTC+09:00) Yakutsk" #: dlls/tzres/tzres.rc:309 msgid "SA Eastern Standard Time" @@ -11379,7 +11315,7 @@ msgstr "Zuid-Amerika Oost Zomertijd" #: dlls/tzres/tzres.rc:311 msgid "(UTC-03:00) Cayenne, Fortaleza" -msgstr "" +msgstr "(UTC-03:00) Cayenne, Fortaleza" #: dlls/tzres/tzres.rc:42 msgid "Arab Standard Time" @@ -11391,7 +11327,7 @@ msgstr "Arabische Zomertijd" #: dlls/tzres/tzres.rc:44 msgid "(UTC+03:00) Kuwait, Riyadh" -msgstr "" +msgstr "(UTC+03:00) Koeweit, Riyad" #: dlls/tzres/tzres.rc:45 msgid "Arabian Standard Time" @@ -11403,7 +11339,7 @@ msgstr "Arabische Zomertijd" #: dlls/tzres/tzres.rc:47 msgid "(UTC+04:00) Abu Dhabi, Muscat" -msgstr "" +msgstr "(UTC+04:00) Abu Dhabi, Muscat" #: dlls/tzres/tzres.rc:357 msgid "Tocantins Standard Time" @@ -11415,7 +11351,7 @@ msgstr "Tocantins Zomertijd" #: dlls/tzres/tzres.rc:359 msgid "(UTC-03:00) Araguaina" -msgstr "" +msgstr "(UTC-03:00) Araguaína" #: dlls/tzres/tzres.rc:306 msgid "Russian Standard Time" @@ -11427,7 +11363,7 @@ msgstr "Rusland Zomertijd" #: dlls/tzres/tzres.rc:308 msgid "(UTC+03:00) Moscow, St. Petersburg" -msgstr "" +msgstr "(UTC+03:00) Moskou, Sint-Petersburg" #: dlls/tzres/tzres.rc:63 msgid "Aus Central W. Standard Time" @@ -11439,7 +11375,7 @@ msgstr "W-Centraal Australië Zomertijd" #: dlls/tzres/tzres.rc:65 msgid "(UTC+08:45) Eucla" -msgstr "" +msgstr "(UTC+08:45) Eucla" #: dlls/tzres/tzres.rc:294 msgid "Romance Standard Time" @@ -11451,43 +11387,39 @@ msgstr "Rome Zomertijd" #: dlls/tzres/tzres.rc:296 msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" -msgstr "" +msgstr "(UTC+01:00) Brussel, Kopenhagen, Madrid, Parijs" #: dlls/tzres/tzres.rc:159 msgid "Ekaterinburg Standard Time" -msgstr "Ekaterinburg Standaard Tijd" +msgstr "Jekaterinenburg Standaard Tijd" #: dlls/tzres/tzres.rc:160 msgid "Ekaterinburg Daylight Time" -msgstr "Ekaterinburg Zomertijd" +msgstr "Jekaterinenburg Zomertijd" #: dlls/tzres/tzres.rc:161 msgid "(UTC+05:00) Ekaterinburg" -msgstr "" +msgstr "(UTC+05:00) Jekaterinenburg" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 msgid "Russia Time Zone 11" -msgstr "" +msgstr "Rusland tijdzone 11" #: dlls/tzres/tzres.rc:302 msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" -msgstr "" +msgstr "(UTC+12:00) Anadyr, Petropavlovsk-Kamtsjatski" #: dlls/tzres/tzres.rc:432 -#, fuzzy -#| msgid "West Asia Standard Time" msgid "West Bank Standard Time" -msgstr "West-Azië Standaard Tijd" +msgstr "Westelijke Jordaanoever Standaard Tijd" #: dlls/tzres/tzres.rc:433 -#, fuzzy -#| msgid "West Asia Daylight Time" msgid "West Bank Daylight Time" -msgstr "West-Azië Zomertijd" +msgstr "Westelijke Jordaanoever Zomertijd" #: dlls/tzres/tzres.rc:434 msgid "(UTC+02:00) Gaza, Hebron" -msgstr "" +msgstr "(UTC+02:00) Gaza, Hebron" #: dlls/tzres/tzres.rc:348 msgid "Syria Standard Time" @@ -11499,7 +11431,7 @@ msgstr "Syrië Zomertijd" #: dlls/tzres/tzres.rc:350 msgid "(UTC+02:00) Damascus" -msgstr "" +msgstr "(UTC+02:00) Damascus" #: dlls/tzres/tzres.rc:60 msgid "AUS Central Standard Time" @@ -11511,7 +11443,7 @@ msgstr "Centraal-Australië Zomertijd" #: dlls/tzres/tzres.rc:62 msgid "(UTC+09:30) Darwin" -msgstr "" +msgstr "(UTC+09:30) Darwin" #: dlls/tzres/tzres.rc:177 msgid "Greenwich Standard Time" @@ -11523,7 +11455,7 @@ msgstr "Greenwich Zomertijd" #: dlls/tzres/tzres.rc:179 msgid "(UTC+00:00) Monrovia, Reykjavik" -msgstr "" +msgstr "(UTC+00:00) Monrovia, Reykjavik" #: dlls/tzres/tzres.rc:378 msgid "Ulaanbaatar Standard Time" @@ -11535,23 +11467,19 @@ msgstr "Ulaanbaatar Zomertijd" #: dlls/tzres/tzres.rc:380 msgid "(UTC+08:00) Ulaanbaatar" -msgstr "" +msgstr "(UTC+08:00) Ulaanbaatar" #: dlls/tzres/tzres.rc:261 -#, fuzzy -#| msgid "Morocco Standard Time" msgid "Norfolk Standard Time" -msgstr "Marokko Standaard Tijd" +msgstr "Norfolk Standaard Tijd" #: dlls/tzres/tzres.rc:262 -#, fuzzy -#| msgid "Morocco Daylight Time" msgid "Norfolk Daylight Time" -msgstr "Marokko Zomertijd" +msgstr "Norfolk Zomertijd" #: dlls/tzres/tzres.rc:263 msgid "(UTC+11:00) Norfolk Island" -msgstr "" +msgstr "(UTC+11:00) Norfolk-Eiland" #: dlls/tzres/tzres.rc:195 msgid "Israel Standard Time" @@ -11563,7 +11491,7 @@ msgstr "Israël Zomertijd" #: dlls/tzres/tzres.rc:197 msgid "(UTC+02:00) Jerusalem" -msgstr "" +msgstr "(UTC+02:00) Jeruzalem" #: dlls/tzres/tzres.rc:78 msgid "Bangladesh Standard Time" @@ -11575,7 +11503,7 @@ msgstr "Bangladesh Zomertijd" #: dlls/tzres/tzres.rc:80 msgid "(UTC+06:00) Dhaka" -msgstr "" +msgstr "(UTC+06:00) Dhaka" #: dlls/tzres/tzres.rc:312 msgid "SA Pacific Standard Time" @@ -11587,7 +11515,7 @@ msgstr "Zuid-Amerika West Zomertijd" #: dlls/tzres/tzres.rc:314 msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" -msgstr "" +msgstr "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" #: dlls/tzres/tzres.rc:429 msgid "West Asia Standard Time" @@ -11599,7 +11527,7 @@ msgstr "West-Azië Zomertijd" #: dlls/tzres/tzres.rc:431 msgid "(UTC+05:00) Ashgabat, Tashkent" -msgstr "" +msgstr "(UTC+05:00) Asjchabad, Tasjkent" #: dlls/tzres/tzres.rc:33 msgid "Alaskan Standard Time" @@ -11611,7 +11539,7 @@ msgstr "Alaska Zomertijd" #: dlls/tzres/tzres.rc:35 msgid "(UTC-09:00) Alaska" -msgstr "" +msgstr "(UTC-09:00) Alaska" #: dlls/tzres/tzres.rc:288 msgid "Paraguay Standard Time" @@ -11623,7 +11551,7 @@ msgstr "Paraguay Zomertijd" #: dlls/tzres/tzres.rc:290 msgid "(UTC-04:00) Asuncion" -msgstr "" +msgstr "(UTC-04:00) Asuncion" #: dlls/tzres/tzres.rc:132 msgid "Dateline Standard Time" @@ -11635,7 +11563,7 @@ msgstr "Datumgrens Zomertijd" #: dlls/tzres/tzres.rc:134 msgid "(UTC-12:00) International Date Line West" -msgstr "" +msgstr "(UTC-12:00) Internationale westelijke datumgrens" #: dlls/tzres/tzres.rc:207 msgid "Libya Standard Time" @@ -11647,7 +11575,7 @@ msgstr "Libië Zomertijd" #: dlls/tzres/tzres.rc:209 msgid "(UTC+02:00) Tripoli" -msgstr "" +msgstr "(UTC+02:00) Tripoli" #: dlls/tzres/tzres.rc:75 msgid "Bahia Standard Time" @@ -11659,7 +11587,7 @@ msgstr "Bahia Zomertijd" #: dlls/tzres/tzres.rc:77 msgid "(UTC-03:00) Salvador" -msgstr "" +msgstr "(UTC-03:00) Salvador" #: dlls/tzres/tzres.rc:408 msgid "Venezuela Standard Time" @@ -11671,7 +11599,7 @@ msgstr "Venezuela Zomertijd" #: dlls/tzres/tzres.rc:410 msgid "(UTC-04:00) Caracas" -msgstr "" +msgstr "(UTC-04:00) Caracas" #: dlls/tzres/tzres.rc:84 msgid "Bougainville Standard Time" @@ -11683,7 +11611,7 @@ msgstr "Bougainville Zomertijd" #: dlls/tzres/tzres.rc:86 msgid "(UTC+11:00) Bougainville Island" -msgstr "" +msgstr "(UTC+11:00) Bougainville (eiland)" #: dlls/tzres/tzres.rc:186 msgid "Hawaiian Standard Time" @@ -11695,7 +11623,7 @@ msgstr "Hawaï Zomertijd" #: dlls/tzres/tzres.rc:188 msgid "(UTC-10:00) Hawaii" -msgstr "" +msgstr "(UTC-10:00) Hawaï" #: dlls/tzres/tzres.rc:333 msgid "SE Asia Standard Time" @@ -11707,39 +11635,31 @@ msgstr "Zuid-Oost-Azië Zomertijd" #: dlls/tzres/tzres.rc:335 msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" -msgstr "" +msgstr "(UTC+07:00) Bangkok, Hanoi, Jakarta" #: dlls/tzres/tzres.rc:291 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "Qyzylorda Standard Time" -msgstr "Jordanië Standaard Tijd" +msgstr "Qizilorda Standaard Tijd" #: dlls/tzres/tzres.rc:292 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "Qyzylorda Daylight Time" -msgstr "Jordanië Zomertijd" +msgstr "Qizilorda Zomertijd" #: dlls/tzres/tzres.rc:293 msgid "(UTC+05:00) Qyzylorda" -msgstr "" +msgstr "(UTC+05:00) Qizilorda" #: dlls/tzres/tzres.rc:426 -#, fuzzy -#| msgid "Tonga Standard Time" msgid "W. Mongolia Standard Time" -msgstr "Tonga Standaard Tijd" +msgstr "West-Mongolië Standaard Tijd" #: dlls/tzres/tzres.rc:427 -#, fuzzy -#| msgid "Tonga Daylight Time" msgid "W. Mongolia Daylight Time" -msgstr "Tonga Zomertijd" +msgstr "West-Mongolië Zomertijd" #: dlls/tzres/tzres.rc:428 msgid "(UTC+07:00) Hovd" -msgstr "" +msgstr "(UTC+07:00) Hovd" #: dlls/tzres/tzres.rc:255 msgid "New Zealand Standard Time" @@ -11751,7 +11671,7 @@ msgstr "Nieuw-Zeeland Zomertijd" #: dlls/tzres/tzres.rc:257 msgid "(UTC+12:00) Auckland, Wellington" -msgstr "" +msgstr "(UTC+12:00) Auckland, Wellington" #: dlls/tzres/tzres.rc:36 msgid "Aleutian Standard Time" @@ -11763,23 +11683,19 @@ msgstr "Aleoeten Zomertijd" #: dlls/tzres/tzres.rc:38 msgid "(UTC-10:00) Aleutian Islands" -msgstr "" +msgstr "(UTC-10:00) Aleoeten" #: dlls/tzres/tzres.rc:273 -#, fuzzy -#| msgid "Yakutsk Standard Time" msgid "Omsk Standard Time" -msgstr "Yakutsk Standaard Tijd" +msgstr "Omsk Standaard Tijd" #: dlls/tzres/tzres.rc:274 -#, fuzzy -#| msgid "Yakutsk Daylight Time" msgid "Omsk Daylight Time" -msgstr "Yakutsk Zomertijd" +msgstr "Omsk Zomertijd" #: dlls/tzres/tzres.rc:275 msgid "(UTC+06:00) Omsk" -msgstr "" +msgstr "(UTC+06:00) Omsk" #: dlls/tzres/tzres.rc:105 msgid "Central Brazilian Standard Time" @@ -11791,7 +11707,7 @@ msgstr "Centraal Brazilië Zomertijd" #: dlls/tzres/tzres.rc:107 msgid "(UTC-04:00) Cuiaba" -msgstr "" +msgstr "(UTC-04:00) Cuiaba" #: dlls/tzres/tzres.rc:81 msgid "Belarus Standard Time" @@ -11803,7 +11719,7 @@ msgstr "Wit-Rusland Zomertijd" #: dlls/tzres/tzres.rc:83 msgid "(UTC+03:00) Minsk" -msgstr "" +msgstr "(UTC+03:00) Minsk" #: dlls/tzres/tzres.rc:315 msgid "SA Western Standard Time" @@ -11815,7 +11731,7 @@ msgstr "Zuid-Amerika West Zomertijd" #: dlls/tzres/tzres.rc:317 msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" -msgstr "" +msgstr "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" #: dlls/tzres/tzres.rc:174 msgid "Greenland Standard Time" @@ -11827,7 +11743,7 @@ msgstr "Groenland Zomertijd" #: dlls/tzres/tzres.rc:176 msgid "(UTC-03:00) Greenland" -msgstr "" +msgstr "(UTC-03:00) Groenland" #: dlls/tzres/tzres.rc:147 msgid "Easter Island Standard Time" @@ -11839,15 +11755,15 @@ msgstr "Paaseiland Zomertijd" #: dlls/tzres/tzres.rc:149 msgid "(UTC-06:00) Easter Island" -msgstr "" +msgstr "(UTC-06:00) Paaseiland" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 msgid "Russia Time Zone 10" -msgstr "" +msgstr "Rusland tijdzone 10" #: dlls/tzres/tzres.rc:299 msgid "(UTC+11:00) Chokurdakh" -msgstr "" +msgstr "(UTC+11:00) Tsjokoerdach" #: dlls/tzres/tzres.rc:156 msgid "Egypt Standard Time" @@ -11859,7 +11775,7 @@ msgstr "Egypte Zomertijd" #: dlls/tzres/tzres.rc:158 msgid "(UTC+02:00) Cairo" -msgstr "" +msgstr "(UTC+02:00) Caïro" #: dlls/tzres/tzres.rc:153 msgid "Eastern Standard Time (Mexico)" @@ -11871,7 +11787,7 @@ msgstr "EST Zomertijd (Mexico)" #: dlls/tzres/tzres.rc:155 msgid "(UTC-05:00) Chetumal" -msgstr "" +msgstr "(UTC-05:00) Chetumal" #: dlls/tzres/tzres.rc:225 msgid "Mauritius Standard Time" @@ -11883,7 +11799,7 @@ msgstr "Mauritius Zomertijd" #: dlls/tzres/tzres.rc:227 msgid "(UTC+04:00) Port Louis" -msgstr "" +msgstr "(UTC+04:00) Port Louis" #: dlls/tzres/tzres.rc:411 msgid "Vladivostok Standard Time" @@ -11895,7 +11811,7 @@ msgstr "Wladiwostok Zomertijd" #: dlls/tzres/tzres.rc:413 msgid "(UTC+10:00) Vladivostok" -msgstr "" +msgstr "(UTC+10:00) Wladiwostok" #: dlls/tzres/tzres.rc:336 msgid "Singapore Standard Time" @@ -11907,7 +11823,7 @@ msgstr "Singapore Zomertijd" #: dlls/tzres/tzres.rc:338 msgid "(UTC+08:00) Kuala Lumpur, Singapore" -msgstr "" +msgstr "(UTC+08:00) Kuala Lumpur, Singapore" #: dlls/tzres/tzres.rc:204 msgid "Korea Standard Time" @@ -11919,7 +11835,7 @@ msgstr "Korea Zomertijd" #: dlls/tzres/tzres.rc:206 msgid "(UTC+09:00) Seoul" -msgstr "" +msgstr "(UTC+09:00) Seoel" #: dlls/tzres/tzres.rc:123 msgid "Chatham Islands Standard Time" @@ -11931,7 +11847,7 @@ msgstr "Chathameilanden Zomertijd" #: dlls/tzres/tzres.rc:125 msgid "(UTC+12:45) Chatham Islands" -msgstr "" +msgstr "(UTC+12:45) Chathameilanden" #: dlls/tzres/tzres.rc:135 msgid "E. Africa Standard Time" @@ -11943,7 +11859,7 @@ msgstr "Oost-Afrika Zomertijd" #: dlls/tzres/tzres.rc:137 msgid "(UTC+03:00) Nairobi" -msgstr "" +msgstr "(UTC+03:00) Nairobi" #: dlls/tzres/tzres.rc:165 msgid "FLE Standard Time" @@ -11955,7 +11871,7 @@ msgstr "Oost-Europa Zomertijd" #: dlls/tzres/tzres.rc:167 msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" -msgstr "" +msgstr "(UTC+02:00) Helsinki, Kiev, Riga, Sofia, Tallinn, Vilnius" #: dlls/tzres/tzres.rc:144 msgid "E. South America Standard Time" @@ -11967,7 +11883,7 @@ msgstr "Oost Zuid-Amerika Zomertijd" #: dlls/tzres/tzres.rc:146 msgid "(UTC-03:00) Brasilia" -msgstr "" +msgstr "(UTC-03:00) Brasilia" #: dlls/tzres/tzres.rc:114 msgid "Central Pacific Standard Time" @@ -11979,7 +11895,7 @@ msgstr "Central Pacific Zomertijd" #: dlls/tzres/tzres.rc:116 msgid "(UTC+11:00) Solomon Is., New Caledonia" -msgstr "" +msgstr "(UTC+11:00) Salomonseilanden, Nieuw-Caledonië" #: dlls/tzres/tzres.rc:420 msgid "W. Central Africa Standard Time" @@ -11991,7 +11907,7 @@ msgstr "West Centraal-Afrika Zomertijd" #: dlls/tzres/tzres.rc:422 msgid "(UTC+01:00) West Central Africa" -msgstr "" +msgstr "(UTC+01:00) West Centraal-Afrika" #: dlls/tzres/tzres.rc:276 msgid "Pacific SA Standard Time" @@ -12003,7 +11919,7 @@ msgstr "Pacific Zuid-Amerika Zomertijd" #: dlls/tzres/tzres.rc:278 msgid "(UTC-04:00) Santiago" -msgstr "" +msgstr "(UTC-04:00) Santiago" #: dlls/tzres/tzres.rc:138 msgid "E. Australia Standard Time" @@ -12015,7 +11931,7 @@ msgstr "Oost-Australië Zomertijd" #: dlls/tzres/tzres.rc:140 msgid "(UTC+10:00) Brisbane" -msgstr "" +msgstr "(UTC+10:00) Brisbane" #: dlls/tzres/tzres.rc:417 msgid "W. Australia Standard Time" @@ -12027,7 +11943,7 @@ msgstr "West-Australië Zomertijd" #: dlls/tzres/tzres.rc:419 msgid "(UTC+08:00) Perth" -msgstr "" +msgstr "(UTC+08:00) Perth" #: dlls/urlmon/urlmon.rc:32 dlls/wininet/wininet.rc:88 msgid "Security Warning" @@ -14664,15 +14580,15 @@ msgstr "Proto" #: programs/netstat/netstat.rc:32 msgid "Local Address" -msgstr "Locaal adres" +msgstr "Lokaal adres" #: programs/netstat/netstat.rc:33 msgid "Foreign Address" -msgstr "Buitenlands adres" +msgstr "Extern adres" #: programs/netstat/netstat.rc:34 msgid "State" -msgstr "Staat" +msgstr "Status" #: programs/netstat/netstat.rc:35 msgid "Interface Statistics" -- 2.33.0

1 0

[v2 PATCH] wined3d: Handle null semantics in stream output description cache.
by Nikolay Sivov 09 Sep '21

09 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wined3d/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d2147447ee0..07bd7c65ad7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5620,7 +5620,9 @@ static int wined3d_so_desc_compare(const void *key, const struct wine_rb_entry * if ((ret = (a->stream_idx - b->stream_idx))) return ret; - if ((ret = strcmp(a->semantic_name, b->semantic_name))) + if ((ret = (!a->semantic_name - !b->semantic_name))) + return ret; + if (a->semantic_name && (ret = strcmp(a->semantic_name, b->semantic_name))) return ret; if ((ret = (a->semantic_idx - b->semantic_idx))) return ret; -- 2.33.0

2 1

[PATCH] wined3d: Allow constant buffers to be forced to be write-mappable.
by Jan Sikorski 09 Sep '21

09 Sep '21

Using a registry setting. Games sometimes use DEFAULT usage and no CPU access combined with UpdateSubresource() for often-changing constants, causing us to interrupt the render pass and transfer through a staging buffer on each update. In such cases forcing the buffers to be mappable greatly increases performance. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- I'm not sure if that kind of change is desired upstream, but I think it's pretty useful. --- dlls/wined3d/buffer.c | 9 +++++++-- dlls/wined3d/wined3d_main.c | 5 +++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index da61f36af45..a42259a5ece 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1139,6 +1139,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d { const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_R8_UNORM, desc->bind_flags); struct wined3d_resource *resource = &buffer->resource; + unsigned int access; HRESULT hr; TRACE("buffer %p, device %p, desc byte_width %u, usage %s, bind_flags %s, " @@ -1164,8 +1165,12 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d return E_INVALIDARG; } + access = desc->access; + if (desc->bind_flags & WINED3D_BIND_CONSTANT_BUFFER && wined3d_settings.write_mappable_cbuffers) + access |= WINED3D_RESOURCE_ACCESS_MAP_W; + if (FAILED(hr = resource_init(resource, device, WINED3D_RTYPE_BUFFER, format, - WINED3D_MULTISAMPLE_NONE, 0, desc->usage, desc->bind_flags, desc->access, + WINED3D_MULTISAMPLE_NONE, 0, desc->usage, desc->bind_flags, access, desc->byte_width, 1, 1, desc->byte_width, parent, parent_ops, &buffer_resource_ops))) { WARN("Failed to initialize resource, hr %#x.\n", hr); @@ -1179,7 +1184,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d buffer, buffer->resource.size, buffer->resource.usage, buffer->resource.heap_memory); if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING - || wined3d_resource_access_is_managed(desc->access)) + || wined3d_resource_access_is_managed(access)) { /* SWvp and managed buffers always return the same pointer in buffer * maps and retain data in DISCARD maps. Keep a system memory copy of diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 6e93b8dc683..a059598ec21 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -394,6 +394,11 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.renderer = WINED3D_RENDERER_NO3D; } } + if (!get_config_key_dword(hkey, appkey, "WriteMappableConstantBuffers", &tmpvalue) && tmpvalue) + { + TRACE("Forcing all constant buffers to be write-mappable.\n"); + wined3d_settings.write_mappable_cbuffers = TRUE; + } } if (appkey) RegCloseKey( appkey ); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86c053df0db..9357223cb97 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -482,6 +482,7 @@ struct wined3d_settings unsigned int max_sm_cs; enum wined3d_renderer renderer; enum wined3d_shader_backend shader_backend; + BOOL write_mappable_cbuffers; }; extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN; -- 2.30.2

2 1

[PATCH v3 0/5] Implement reflink support
by Alex Xu (Hello71) 09 Sep '21

09 Sep '21

Over the years, Wine prefixes have gotten bigger and bigger, for a number of reasons. Creating a new Wine prefix for each application is still the current recommendation, as despite the best efforts of Wine developers, some applications still require system-wide workarounds. This leads to significant bloat for each application installed. With a MinGW build of Wine without Mono or Gecko, new 32-bit prefixes are over 150 MB, and new 64-bit prefixes are over 300 MB. The vast majority of these files are byte-for-byte identical to Wine's central DLL copies. This patch set implements reflink support in Wine via the copy_file_range syscall. The reasons for selecting copy_file_range over FICLONE are outlined in patch 2. A previous unpublished version of this patch set used FICLONERANGE, but it was less convenient to use from setupapi and has inferior system support. When reflink is supported by the underlying filesystem, new Wine prefix sizes with Mono and Gecko disabled are reduced to less than 1 MB. The resulting Wine prefix is byte-for-byte identical to one created without reflink, but occupies less space on disk. If hard links or symlinks were used, if an application such as winetricks writes to a system file, it would overwrite the central copy. With reflink, the file blocks will be transparently copied by the Linux kernel so that each Wine prefix can be independent. Some files cannot be deduplicated in the current Wine system, as they are dynamically generated during the Wine prefix installation process. These include 16-bit fake DLLs and manifest files. In theory, it should be possible to pre-generate these files, but considering the Wine prefix size is already reduced to less than 1 MB, the extra space savings are likely not worth the effort. Changes since v2: Fix/improve errno handling. Alex Xu (Hello71) (5): ntdll: add support for IOCTL_COPYCHUNK. kernelbase: use IOCTL_COPYCHUNK in CopyFile* setupapi: Use IOCTL_COPYCHUNK, avoid buffering whole file lmshare.h: define STYPE_TEMPORARY kernel32/tests: add IOCTL_COPYCHUNK test configure | 1 + configure.ac | 1 + dlls/kernel32/tests/file.c | 137 +++++++++++++++++++++++++ dlls/kernelbase/file.c | 44 ++++---- dlls/ntdll/unix/file.c | 121 ++++++++++++++++++++++ dlls/setupapi/fakedll.c | 202 ++++++++++++++++++++----------------- include/config.h.in | 3 + include/lmshare.h | 11 +- include/winioctl.h | 34 +++++++ 9 files changed, 431 insertions(+), 123 deletions(-) -- 2.33.0

2 7

[PATCH 1/5] winegstreamer: Fix multiple leaks in failure pathes.
by Derek Lesho 09 Sep '21

09 Sep '21

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 01ab626254a..383afcfce75 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -733,6 +733,9 @@ static HRESULT new_media_stream(struct media_source *source, object->IMFMediaStream_iface.lpVtbl = &media_stream_vtbl; object->ref = 1; + if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) + goto fail; + IMFMediaSource_AddRef(&source->IMFMediaSource_iface); object->parent_source = source; object->stream_id = stream_id; @@ -741,9 +744,6 @@ static HRESULT new_media_stream(struct media_source *source, object->eos = FALSE; object->wg_stream = wg_stream; - if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) - goto fail; - TRACE("Created stream object %p.\n", object); *out_stream = object; @@ -1211,7 +1211,8 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) source->state = SOURCE_SHUTDOWN; - unix_funcs->wg_parser_disconnect(source->wg_parser); + if (source->stream_count) + unix_funcs->wg_parser_disconnect(source->wg_parser); if (source->read_thread) { @@ -1231,6 +1232,9 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) { struct media_stream *stream = source->streams[i]; + if (!stream) + continue; + stream->state = STREAM_SHUTDOWN; if (stream->event_queue) @@ -1245,7 +1249,7 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) unix_funcs->wg_parser_destroy(source->wg_parser); - if (source->stream_count) + if (source->streams) free(source->streams); if (source->async_commands_queue) @@ -1353,7 +1357,6 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (FAILED(hr = media_stream_init_desc(object->streams[i]))) { ERR("Failed to finish initialization of media stream %p, hr %x.\n", object->streams[i], hr); - IMFMediaStream_Release(&object->streams[i]->IMFMediaStream_iface); goto fail; } } @@ -1392,6 +1395,8 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ fail: WARN("Failed to construct MFMediaSource, hr %#x.\n", hr); + if (object->wg_parser) + IMFMediaSource_Shutdown(&object->IMFMediaSource_iface); free(descriptors); IMFMediaSource_Release(&object->IMFMediaSource_iface); return hr; -- 2.33.0

4 17

[PATCH] wined3d: Handle null semantics in stream output description cache.
by Nikolay Sivov 09 Sep '21

09 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Let me know if a test is useful for this, as it seems like implementation detail. To see the crash it's enough to create two shaders with matching descriptions, containing gaps. dlls/wined3d/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d2147447ee0..4f7a46340d4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5620,7 +5620,9 @@ static int wined3d_so_desc_compare(const void *key, const struct wine_rb_entry * if ((ret = (a->stream_idx - b->stream_idx))) return ret; - if ((ret = strcmp(a->semantic_name, b->semantic_name))) + if (!!a->semantic_name ^ !!b->semantic_name) + return a->semantic_name ? -1 : 1; + if (a->semantic_name && (ret = strcmp(a->semantic_name, b->semantic_name))) return ret; if ((ret = (a->semantic_idx - b->semantic_idx))) return ret; -- 2.33.0

2 2

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

09 Sep '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- 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..e9bb31ad6ff 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; + struct resource_readback rb; + ID2D1DeviceContext *context; + D2D1_SIZE_U input_size; + ID2D1Factory1 *factory; + ID2D1Bitmap1 *bitmap; + ID2D1Effect *effect; + ID2D1Image *output; + unsigned int i; + DWORD colour; + HRESULT hr; + + 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; + DWORD origin_colour; + } + effect_2d_affine_tests[] = + { + {image_4x4, 4, 4, &rotate, {-6.0f, -3.0f, 2.0f, 4.0f}, 0x7b7b7b7b}, + {image_4x4, 4, 4, &scale, {-2.0f, -3.0f, 1.0f, 9.0f}, 0xd0d7e482}, + {image_4x4, 4, 4, &skew, {-7.0f, -3.0f, 3.0f, 7.0f}, 0x4c3b2a19}, + {image_16x16, 16, 16, &rotate, {-14.0f, -3.0f, 10.0f, 21.0f}, 0x7f7f7f7f}, + {image_16x16, 16, 16, &scale, {-2.0f, -3.0f, 10.0f, 39.0f}, 0xffffffff}, + {image_16x16, 16, 16, &skew, {-19.0f, -3.0f, 15.0f, 31.0f}, 0x7f7f7f7f}, + }; + + 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); + get_surface_readback(&ctx, &rb); + colour = get_readback_colour(&rb, 0, 0); + todo_wine + ok(compare_colour(colour, test->origin_colour, 1), + "Got unexpected colour %#x, expected %#x.\n", colour, test->origin_colour); + + 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 resend] msxml3: Fix crash when iterating through attributes with namespaces.
by Bernhard Übelacker 09 Sep '21

09 Sep '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50475 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- dlls/msxml3/element.c | 5 ++- dlls/msxml3/tests/domdoc.c | 62 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 1a523798328..c11d28b066c 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1832,7 +1832,10 @@ static HRESULT domelem_get_item(const xmlNodePtr node, LONG index, IXMLDOMNode * if (!xmlns) return E_OUTOFMEMORY; - curr = xmlNewNsProp(NULL, xmlns, ns->prefix, ns->href); + if (ns->prefix) + curr = xmlNewNsProp(NULL, xmlns, ns->prefix, ns->href); + else + curr = xmlNewProp(NULL, xmlns->prefix, ns->href); if (!curr) { xmlFreeNs(xmlns); return E_OUTOFMEMORY; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 063f9433a77..e57c71b6a7a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13650,6 +13650,67 @@ todo_wine DeleteFileA(path); } +static const char svg[] = + "<svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"></svg>"; + +static void test_prefixless_namespace(void) +{ + HRESULT hr; + IXMLDOMDocument *doc; + VARIANT_BOOL b; + BSTR str; + IXMLDOMNodeList *node_list; + LONG length; + IXMLDOMNode *node1; + IXMLDOMNode *node2; + IXMLDOMNamedNodeMap *node_map; + int found; + + doc = create_document(&IID_IXMLDOMDocument); + EXPECT_REF(doc, 1); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(svg), &b); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_childNodes(doc, &node_list); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNodeList_get_item(node_list, 0, &node1); + EXPECT_HR(hr, S_OK); + + node_map = (void *)0xdeadbeef; + hr = IXMLDOMNode_get_attributes(node1, &node_map); + EXPECT_HR(hr, S_OK); + + length = 0xdeadbeef; + hr = IXMLDOMNamedNodeMap_get_length(node_map, &length); + EXPECT_HR(hr, S_OK); + ok(length == 3, "expected length=%d, got %d\n", 3, length); + + found = 0; + for (int i = 0; i < length; i++) + { + hr = IXMLDOMNamedNodeMap_get_item(node_map, i, &node2); + EXPECT_HR(hr, S_OK); + + str = (void *)0xdeadbeef; + hr = IXMLDOMNode_get_xml(node2, &str); + EXPECT_HR(hr, S_OK); + if (lstrcmpW(str, L"version=\"1.1\"") == 0) found++; + if (lstrcmpW(str, L"xmlns=\"http://www.w3.org/2000/svg\"") == 0) found++; + if (lstrcmpW(str, L"xmlns:xlink=\"http://www.w3.org/1999/xlink\"") == 0) found++; + SysFreeString(str); + + IXMLDOMNode_Release(node2); + } + ok(found == 3, "expected to find %d elements, found %d\n", 3, found); + + IXMLDOMNamedNodeMap_Release(node_map); + IXMLDOMNode_Release(node1); + IXMLDOMNodeList_Release(node_list); + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { HRESULT hr; @@ -13745,6 +13806,7 @@ START_TEST(domdoc) test_mxnamespacemanager(); test_mxnamespacemanager_override(); } + test_prefixless_namespace(); CoUninitialize(); } -- 2.30.2

2 2

[PATCH v4] dsound: Commit next audio chunk between play cursor and write cursor to playing.
by Eduard Permyakov 09 Sep '21

09 Sep '21

This region of the audio buffer is forbidden to be written to by the DirectSound specification. The documentation states: "The write cursor is the point after which it is safe to write data into the buffer. The block between the play cursor and the write cursor is already committed to be played, and cannot be changed safely." However, some applications still do this, which has lead to audio glitches only when using the Wine DirectSound implementation. Experiments showed that the native DirctSound implementation will still play the old audio the first time around when the buffer region gets overwritten. Use an approach of copying the next forbidden region into a "committed buffer" to add the same behavior to the Wine implementation. Out of performance considerations, only copy data to the committed buffer when we detect that an overwrite is possible (i.e. the current mixing region of the buffer gets locked). Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/dsound/buffer.c | 51 +++++++++++++++++++++++++++++++++--- dlls/dsound/dsound_convert.c | 33 ++++++++++++++++------- dlls/dsound/dsound_private.h | 6 ++++- dlls/dsound/mixer.c | 1 + 4 files changed, 77 insertions(+), 14 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index dc3b54906ce..12c8345c4a8 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -101,6 +101,25 @@ static int __cdecl notify_compar(const void *l, const void *r) return 1; } +static void copy_circular(VOID *dstbuff, VOID *srcbuff, DWORD srcoff, DWORD srcsize, DWORD cpysize) +{ + DWORD overflow; + if(cpysize > srcsize - srcoff) { + overflow = cpysize - (srcsize - srcoff); + memcpy(dstbuff, (BYTE*)srcbuff + srcoff, srcsize - srcoff); + memcpy((BYTE*)dstbuff + (srcsize - srcoff), srcbuff, overflow); + }else{ + memcpy(dstbuff, (BYTE*)srcbuff + srcoff, cpysize); + } +} + +static void commit_next_chunk(IDirectSoundBufferImpl *dsb) +{ + copy_circular(dsb->committedbuff, dsb->buffer->memory, dsb->sec_mixpos, dsb->buflen, dsb->writelead); + dsb->use_committed = TRUE; + TRACE("committing %u bytes from offset %u\n", dsb->writelead, dsb->sec_mixpos); +} + static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(IDirectSoundNotify *iface, DWORD howmuch, const DSBPOSITIONNOTIFY *notify) { @@ -503,8 +522,10 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(IDirectSoundBuffer8 *iface, DW if (writecursor+writebytes <= This->buflen) { *(LPBYTE*)lplpaudioptr1 = This->buffer->memory+writecursor; - if (This->sec_mixpos >= writecursor && This->sec_mixpos < writecursor + writebytes && This->state == STATE_PLAYING) + if (This->sec_mixpos >= writecursor && This->sec_mixpos < writecursor + writebytes && This->state == STATE_PLAYING) { WARN("Overwriting mixing position, case 1\n"); + commit_next_chunk(This); + } *audiobytes1 = writebytes; if (lplpaudioptr2) *(LPBYTE*)lplpaudioptr2 = NULL; @@ -519,16 +540,20 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(IDirectSoundBuffer8 *iface, DW *(LPBYTE*)lplpaudioptr1 = This->buffer->memory+writecursor; *audiobytes1 = This->buflen-writecursor; This->buffer->lockedbytes += *audiobytes1; - if (This->sec_mixpos >= writecursor && This->sec_mixpos < writecursor + writebytes && This->state == STATE_PLAYING) + if (This->sec_mixpos >= writecursor && This->sec_mixpos < writecursor + writebytes && This->state == STATE_PLAYING) { WARN("Overwriting mixing position, case 2\n"); + commit_next_chunk(This); + } if (lplpaudioptr2) *(LPBYTE*)lplpaudioptr2 = This->buffer->memory; if (audiobytes2) { *audiobytes2 = writebytes-(This->buflen-writecursor); This->buffer->lockedbytes += *audiobytes2; } - if (audiobytes2 && This->sec_mixpos < remainder && This->state == STATE_PLAYING) + if (audiobytes2 && This->sec_mixpos < remainder && This->state == STATE_PLAYING) { WARN("Overwriting mixing position, case 3\n"); + commit_next_chunk(This); + } TRACE("Locked %p(%i bytes) and %p(%i bytes) writecursor=%d\n", *(LPBYTE*)lplpaudioptr1, *audiobytes1, lplpaudioptr2 ? *(LPBYTE*)lplpaudioptr2 : NULL, audiobytes2 ? *audiobytes2: 0, writecursor); } @@ -1081,6 +1106,13 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds /* calculate fragment size and write lead */ DSOUND_RecalcFormat(dsb); + dsb->committedbuff = HeapAlloc(GetProcessHeap(), 0, dsb->writelead); + if(!dsb->committedbuff) { + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); + return DSERR_OUTOFMEMORY; + } + FillMemory(dsb->committedbuff, dsb->writelead, dsbd->lpwfxFormat->wBitsPerSample == 8 ? 128 : 0); + if (dsb->dsbd.dwFlags & DSBCAPS_CTRL3D) { dsb->ds3db_ds3db.dwSize = sizeof(DS3DBUFFER); dsb->ds3db_ds3db.vPosition.x = 0.0; @@ -1135,6 +1167,7 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) HeapFree(GetProcessHeap(), 0, This->notifies); HeapFree(GetProcessHeap(), 0, This->pwfx); + HeapFree(GetProcessHeap(), 0, This->committedbuff); if (This->filters) { int i; @@ -1157,6 +1190,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( { IDirectSoundBufferImpl *dsb; HRESULT hres = DS_OK; + VOID *committedbuff; TRACE("(%p,%p,%p)\n", device, ppdsb, pdsb); dsb = HeapAlloc(GetProcessHeap(),0,sizeof(*dsb)); @@ -1166,6 +1200,14 @@ HRESULT IDirectSoundBufferImpl_Duplicate( return DSERR_OUTOFMEMORY; } + committedbuff = HeapAlloc(GetProcessHeap(),0,pdsb->writelead); + if (committedbuff == NULL) { + HeapFree(GetProcessHeap(),0,dsb); + *ppdsb = NULL; + return DSERR_OUTOFMEMORY; + } + FillMemory(committedbuff, pdsb->writelead, pdsb->pwfx->wBitsPerSample == 8 ? 128 : 0); + AcquireSRWLockShared(&pdsb->lock); CopyMemory(dsb, pdsb, sizeof(*dsb)); @@ -1175,6 +1217,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( ReleaseSRWLockShared(&pdsb->lock); if (dsb->pwfx == NULL) { + HeapFree(GetProcessHeap(),0,committedbuff); HeapFree(GetProcessHeap(),0,dsb); *ppdsb = NULL; return DSERR_OUTOFMEMORY; @@ -1192,6 +1235,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( dsb->notifies = NULL; dsb->nrofnotifies = 0; dsb->device = device; + dsb->committedbuff = committedbuff; DSOUND_RecalcFormat(dsb); InitializeSRWLock(&dsb->lock); @@ -1202,6 +1246,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( list_remove(&dsb->entry); dsb->buffer->ref--; HeapFree(GetProcessHeap(),0,dsb->pwfx); + HeapFree(GetProcessHeap(),0,dsb->committedbuff); HeapFree(GetProcessHeap(),0,dsb); dsb = NULL; }else diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 4735178a9a8..76c36b607c7 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -55,17 +55,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); #define le32(x) (x) #endif +static BYTE *buff_byte(const IDirectSoundBufferImpl *dsb, DWORD offset) +{ + if(!dsb->use_committed) + return dsb->buffer->memory + offset; + + if(offset >= dsb->sec_mixpos && offset < dsb->sec_mixpos + dsb->writelead) { + return (BYTE*)dsb->committedbuff + (offset - dsb->sec_mixpos); + }else if(offset < (dsb->sec_mixpos + dsb->writelead) % dsb->buflen) { + return (BYTE*)dsb->committedbuff + (dsb->buflen - dsb->sec_mixpos + offset); + }else{ + return dsb->buffer->memory + offset; + } +} + static float get8(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - buf += pos + channel; + const BYTE *buf = buff_byte(dsb, pos + channel); return (buf[0] - 0x80) / (float)0x80; } static float get16(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const SHORT *sbuf = (const SHORT*)(buf + pos + 2 * channel); + const BYTE *buf = buff_byte(dsb, pos + 2 * channel); + const SHORT *sbuf = (const SHORT*)(buf); SHORT sample = (SHORT)le16(*sbuf); return sample / (float)0x8000; } @@ -73,8 +86,8 @@ static float get16(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) static float get24(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { LONG sample; - const BYTE* buf = dsb->buffer->memory; - buf += pos + 3 * channel; + const BYTE *buf = buff_byte(dsb, pos + 3 * channel); + /* The next expression deliberately has an overflow for buf[2] >= 0x80, this is how negative values are made. */ @@ -84,16 +97,16 @@ static float get24(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) static float get32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const LONG *sbuf = (const LONG*)(buf + pos + 4 * channel); + const BYTE *buf = buff_byte(dsb, pos + 4 * channel); + const LONG *sbuf = (const LONG*)(buf); LONG sample = le32(*sbuf); return sample / (float)0x80000000U; } static float getieee32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const float *sbuf = (const float*)(buf + pos + 4 * channel); + const BYTE *buf = buff_byte(dsb, pos + 4 * channel); + const float *sbuf = (const float*)(buf); /* The value will be clipped later, when put into some non-float buffer */ return *sbuf; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index bdb9ebee544..48f83315180 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -153,7 +153,11 @@ struct IDirectSoundBufferImpl LONG64 freqAccNum; /* used for mixing */ DWORD sec_mixpos; - + /* Holds a copy of the next 'writelead' bytes, to be used for mixing. This makes it + * so that these bytes get played once even if this region of the buffer gets overwritten, + * which is more in-line with native DirectSound behavior. */ + BOOL use_committed; + LPVOID committedbuff; /* IDirectSoundNotify fields */ LPDSBPOSITIONNOTIFY notifies; int nrofnotifies; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 124d1e4fba1..5cc1f70afdb 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -389,6 +389,7 @@ static void cp_fields(IDirectSoundBufferImpl *dsb, UINT count, LONG64 *freqAccNu } dsb->sec_mixpos = ipos; + dsb->use_committed = FALSE; } /** -- 2.25.1

2 1

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