May 2019 - Wine-Commits - list.winehq.org

Józef Kucia : vkd3d-shader: Do not assume destination is 4 component vector in vkd3d_dxbc_compiler_emit_store ().
by Alexandre Julliard May 14, 2019

May 14, 2019

Module: vkd3d Branch: master Commit: 68a4b89d6160c97ac2acc0e502f9524f6b115cc8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=68a4b89d6160c97ac2acc0e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 14 13:27:39 2019 +0200 vkd3d-shader: Do not assume destination is 4 component vector in vkd3d_dxbc_compiler_emit_store(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e3adc5a..18e10ad 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3179,7 +3179,7 @@ static void vkd3d_dxbc_compiler_emit_store(struct vkd3d_dxbc_compiler *compiler, for (i = 0, component_idx = 0; i < dst_component_count; ++i) { if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) - components[i] = VKD3D_VEC4_SIZE + component_idx++; + components[i] = dst_component_count + component_idx++; else components[i] = i; }

1 0

Józef Kucia : vkd3d-shader: Handle interpolation mode in vkd3d_dxbc_compiler_emit_input().
by Alexandre Julliard May 14, 2019

May 14, 2019

Module: vkd3d Branch: master Commit: 267f10df8b0b541893c013215ee26c95a7447c1b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=267f10df8b0b541893c0132… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 14 13:27:41 2019 +0200 vkd3d-shader: Handle interpolation mode in vkd3d_dxbc_compiler_emit_input(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 79 ++++++++++++++++---------------- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 5477efd..f85db11 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3330,6 +3330,36 @@ static void vkd3d_dxbc_compiler_decorate_builtin(struct vkd3d_dxbc_compiler *com vkd3d_spirv_build_op_decorate1(builder, target_id, SpvDecorationBuiltIn, builtin); } +static void vkd3d_dxbc_compiler_emit_interpolation_decorations(struct vkd3d_dxbc_compiler *compiler, + uint32_t id, enum vkd3d_shader_interpolation_mode mode) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + switch (mode) + { + case VKD3DSIM_NONE: + break; + case VKD3DSIM_CONSTANT: + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationFlat, NULL, 0); + break; + case VKD3DSIM_LINEAR: + break; + case VKD3DSIM_LINEAR_CENTROID: + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationCentroid, NULL, 0); + break; + case VKD3DSIM_LINEAR_NOPERSPECTIVE: + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationNoPerspective, NULL, 0); + break; + case VKD3DSIM_LINEAR_SAMPLE: + vkd3d_spirv_enable_capability(builder, SpvCapabilitySampleRateShading); + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationSample, NULL, 0); + break; + default: + FIXME("Unhandled interpolation mode %#x.\n", mode); + break; + } +} + static uint32_t vkd3d_dxbc_compiler_emit_int_to_bool(struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_conditional_op condition, unsigned int component_count, uint32_t val_id) { @@ -3768,7 +3798,8 @@ static bool needs_private_io_variable(const struct vkd3d_shader_signature *signa } static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) + const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval, + enum vkd3d_shader_interpolation_mode interpolation_mode) { unsigned int component_idx, component_count, input_component_count; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; @@ -3857,6 +3888,8 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationLocation, reg_idx); if (component_idx) vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx); + + vkd3d_dxbc_compiler_emit_interpolation_decorations(compiler, input_id, interpolation_mode); } if (reg->type == VKD3DSPR_PATCHCONST) @@ -3961,7 +3994,7 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compil switch (reg->type) { case VKD3DSPR_INPUT: - vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE); + vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE, VKD3DSIM_NONE); return; case VKD3DSPR_OUTPOINTID: case VKD3DSPR_PRIMID: @@ -5089,64 +5122,30 @@ static void vkd3d_dxbc_compiler_emit_dcl_input(struct vkd3d_dxbc_compiler *compi if ((phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler))) vkd3d_dxbc_compiler_emit_shader_phase_input(compiler, phase, dst); else if (vkd3d_shader_register_is_input(&dst->reg) || dst->reg.type == VKD3DSPR_PATCHCONST) - vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE); + vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE, VKD3DSIM_NONE); else vkd3d_dxbc_compiler_emit_input_register(compiler, dst); } -static void vkd3d_dxbc_compiler_emit_interpolation_decorations(struct vkd3d_dxbc_compiler *compiler, - uint32_t id, enum vkd3d_shader_interpolation_mode mode) -{ - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - - switch (mode) - { - case VKD3DSIM_CONSTANT: - vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationFlat, NULL, 0); - break; - case VKD3DSIM_LINEAR: - break; - case VKD3DSIM_LINEAR_CENTROID: - vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationCentroid, NULL, 0); - break; - case VKD3DSIM_LINEAR_NOPERSPECTIVE: - vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationNoPerspective, NULL, 0); - break; - case VKD3DSIM_LINEAR_SAMPLE: - vkd3d_spirv_enable_capability(builder, SpvCapabilitySampleRateShading); - vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationSample, NULL, 0); - break; - default: - FIXME("Unhandled interpolation mode %#x.\n", mode); - break; - } -} - static void vkd3d_dxbc_compiler_emit_dcl_input_ps(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - uint32_t input_id; - - if ((input_id = vkd3d_dxbc_compiler_emit_input(compiler, &instruction->declaration.dst, VKD3D_SIV_NONE))) - vkd3d_dxbc_compiler_emit_interpolation_decorations(compiler, input_id, instruction->flags); + vkd3d_dxbc_compiler_emit_input(compiler, &instruction->declaration.dst, VKD3D_SIV_NONE, instruction->flags); } static void vkd3d_dxbc_compiler_emit_dcl_input_ps_sysval(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { const struct vkd3d_shader_register_semantic *semantic = &instruction->declaration.register_semantic; - uint32_t input_id; - input_id = vkd3d_dxbc_compiler_emit_input(compiler, &semantic->reg, semantic->sysval_semantic); - if (input_id && !semantic->sysval_semantic) - vkd3d_dxbc_compiler_emit_interpolation_decorations(compiler, input_id, instruction->flags); + vkd3d_dxbc_compiler_emit_input(compiler, &semantic->reg, semantic->sysval_semantic, instruction->flags); } static void vkd3d_dxbc_compiler_emit_dcl_input_sysval(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { vkd3d_dxbc_compiler_emit_input(compiler, &instruction->declaration.register_semantic.reg, - instruction->declaration.register_semantic.sysval_semantic); + instruction->declaration.register_semantic.sysval_semantic, VKD3DSIM_NONE); } static void vkd3d_dxbc_compiler_emit_dcl_output(struct vkd3d_dxbc_compiler *compiler, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 54d0705..47764e5 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -430,6 +430,7 @@ enum vkd3d_shader_dst_modifier enum vkd3d_shader_interpolation_mode { + VKD3DSIM_NONE = 0, VKD3DSIM_CONSTANT = 1, VKD3DSIM_LINEAR = 2, VKD3DSIM_LINEAR_CENTROID = 3,

1 0

Jeremy Newman : update for 2019
by Jeremy Newman May 14, 2019

May 14, 2019

Module: website Branch: master Commit: 9eb8ac50822012132224a6b484974919e42d3a19 URL: https://source.winehq.org/git/website.git/?a=commit;h=9eb8ac50822012132224a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue May 14 10:11:11 2019 -0500 update for 2019 --- templates/en/wineconf/rsvp.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/en/wineconf/rsvp.template b/templates/en/wineconf/rsvp.template index 59bbeb7..207aa2c 100644 --- a/templates/en/wineconf/rsvp.template +++ b/templates/en/wineconf/rsvp.template @@ -1,3 +1,3 @@  -<iframe src="https://docs.google.com/forms/d/e/1FAIpQLSebJ5QBhB7SRn2e9qB7FdDrrqGZykdb4bU…" width="90%" height="1500" frameborder="0" marginheight="0" marginwidth="0">Loading...</iframe> +<iframe src="https://docs.google.com/forms/d/e/1FAIpQLScHtRCy2l8SFv1r-SZjTVxDNiiXSC64Gnx…" width="90%" height="1500" frameborder="0" marginheight="0" marginwidth="0">Loading...</iframe>

1 0

Michael Stefaniuc : mfplat: Print the debug strings and not the pointers.
by Alexandre Julliard May 13, 2019

May 13, 2019

Module: wine Branch: master Commit: 40fef0fb71b079c1bf9667d80384cc43ec7f11fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=40fef0fb71b079c1bf9667d8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon May 13 21:49:52 2019 +0200 mfplat: Print the debug strings and not the pointers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 2 +- dlls/mfplat/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index b0b5ccc..0303759 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -438,7 +438,7 @@ static HRESULT WINAPI sample_DeleteItem(IMFSample *iface, REFGUID key) { struct sample *sample = impl_from_IMFSample(iface); - TRACE("%p, %p.\n", iface, debugstr_attr(key)); + TRACE("%p, %s.\n", iface, debugstr_attr(key)); return attributes_DeleteItem(&sample->attributes, key); } diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index d10e643..14b9e23 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5918,7 +5918,7 @@ HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HR mfmediaevent *object; HRESULT hr; - TRACE("%s, %s, %08x, %p, %p\n", debugstr_eventid(type), debugstr_guid(extended_type), status, + TRACE("%s, %s, %08x, %s, %p\n", debugstr_eventid(type), debugstr_guid(extended_type), status, debugstr_propvar(value), event); object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) );

1 0

Zebediah Figura : setupapi: Handle an empty string for the source file in SetupQueueCopySection().
by Alexandre Julliard May 13, 2019

May 13, 2019

Module: wine Branch: master Commit: 86724af01241b257a4b4b39682031c9c7a3aaeaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=86724af01241b257a4b4b396… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 13 10:28:51 2019 -0500 setupapi: Handle an empty string for the source file in SetupQueueCopySection(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47185 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index f267380..cacab2d 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -795,6 +795,7 @@ BOOL WINAPI SetupQueueCopySectionW( HSPFILEQ queue, PCWSTR src_root, HINF hinf, SP_FILE_COPY_PARAMS_W params; INT flags; BOOL ret = FALSE; + DWORD len; TRACE("queue %p, src_root %s, hinf %p, hlist %p, section %s, style %#x.\n", queue, debugstr_w(src_root), hinf, hlist, debugstr_w(section), style); @@ -830,7 +831,7 @@ BOOL WINAPI SetupQueueCopySectionW( HSPFILEQ queue, PCWSTR src_root, HINF hinf, if (!SetupGetStringFieldW( &context, 1, dst_file, ARRAY_SIZE( dst_file ), NULL )) goto end; - if (!SetupGetStringFieldW( &context, 2, src_file, ARRAY_SIZE( src_file ), NULL )) + if (!SetupGetStringFieldW( &context, 2, src_file, ARRAY_SIZE( src_file ), &len ) || len <= sizeof(WCHAR)) strcpyW( src_file, dst_file ); if (!SetupGetIntField( &context, 4, &flags )) flags = 0; /* FIXME */

1 0

Piotr Caban : hidclass.sys: Support descriptors with over 10 individual usages in feature.
by Alexandre Julliard May 13, 2019

May 13, 2019

Module: wine Branch: master Commit: f57b86912487a4be41de914c013b2fd40266a47b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f57b86912487a4be41de914c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 13 12:34:12 2019 +0200 hidclass.sys: Support descriptors with over 10 individual usages in feature. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 300 +++++++++++++++++++---------------------- 1 file changed, 137 insertions(+), 163 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f57b86912487a4be41de…

1 0

Nikolay Sivov : dwrite/layout: Use a helper to update layout metrics.
by Alexandre Julliard May 13, 2019

May 13, 2019

Module: wine Branch: master Commit: a4b3420e675fe92a41ac0b5986ee4a74373e9cff URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4b3420e675fe92a41ac0b59… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 13 14:21:42 2019 +0300 dwrite/layout: Use a helper to update layout metrics. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index d101a5a..40621ce 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3592,17 +3592,21 @@ static HRESULT WINAPI dwritetextlayout_GetLineMetrics(IDWriteTextLayout3 *iface, return max_count >= This->metrics.lineCount ? S_OK : E_NOT_SUFFICIENT_BUFFER; } +static HRESULT layout_update_metrics(struct dwrite_textlayout *layout) +{ + return layout_compute_effective_runs(layout); +} + static HRESULT WINAPI dwritetextlayout_GetMetrics(IDWriteTextLayout3 *iface, DWRITE_TEXT_METRICS *metrics) { - struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - DWRITE_TEXT_METRICS1 metrics1; + struct dwrite_textlayout *layout = impl_from_IDWriteTextLayout3(iface); HRESULT hr; - TRACE("(%p)->(%p)\n", This, metrics); + TRACE("%p, %p.\n", iface, metrics); - hr = IDWriteTextLayout3_GetMetrics(iface, &metrics1); + hr = layout_update_metrics(layout); if (hr == S_OK) - memcpy(metrics, &metrics1, sizeof(*metrics)); + memcpy(metrics, &layout->metrics, sizeof(*metrics)); return hr; } @@ -3932,17 +3936,15 @@ static HRESULT WINAPI dwritetextlayout1_GetCharacterSpacing(IDWriteTextLayout3 * static HRESULT WINAPI dwritetextlayout2_GetMetrics(IDWriteTextLayout3 *iface, DWRITE_TEXT_METRICS1 *metrics) { - struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); + struct dwrite_textlayout *layout = impl_from_IDWriteTextLayout3(iface); HRESULT hr; - TRACE("(%p)->(%p)\n", This, metrics); + TRACE("%p, %p.\n", iface, metrics); - hr = layout_compute_effective_runs(This); - if (FAILED(hr)) - return hr; + if (SUCCEEDED(hr = layout_update_metrics(layout))) + *metrics = layout->metrics; - *metrics = This->metrics; - return S_OK; + return hr; } static HRESULT WINAPI dwritetextlayout2_SetVerticalGlyphOrientation(IDWriteTextLayout3 *iface, DWRITE_VERTICAL_GLYPH_ORIENTATION orientation)

1 0

Piotr Caban : hid: Set button values in HidP_SetUsages function.
by Alexandre Julliard May 13, 2019

May 13, 2019

Module: wine Branch: master Commit: 42be0b770181afa9fb956d4aa255461e810c88ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=42be0b770181afa9fb956d4a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 13 12:34:19 2019 +0200 hid: Set button values in HidP_SetUsages function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 20 ++++++++++---------- include/ddk/hidpi.h | 3 +++ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 0add2cb..0416426 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -190,9 +190,9 @@ NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, return HIDP_STATUS_SUCCESS; } -static NTSTATUS find_value(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, +static NTSTATUS find_usage(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, - WINE_HID_ELEMENT *element) + WINE_ELEMENT_TYPE ElementType, WINE_HID_ELEMENT *element) { PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; WINE_HID_ELEMENT *elems = HID_ELEMS(data); @@ -232,7 +232,7 @@ static NTSTATUS find_value(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT { HIDP_VALUE_CAPS *value = &elems[report->elementIdx + i].caps.value; - if (elems[report->elementIdx + i].ElementType != ValueElement || + if (elems[report->elementIdx + i].ElementType != ElementType || value->UsagePage != UsagePage) continue; @@ -240,13 +240,13 @@ static NTSTATUS find_value(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT { *element = elems[report->elementIdx + i]; element->valueStartBit += value->BitSize * (Usage - value->u.Range.UsageMin); - element->bitCount = value->BitSize; + element->bitCount = elems[report->elementIdx + i].ElementType == ValueElement ? value->BitSize: 1; return HIDP_STATUS_SUCCESS; } else if (value->u.NotRange.Usage == Usage) { *element = elems[report->elementIdx + i]; - element->bitCount = value->BitSize; + element->bitCount = elems[report->elementIdx + i].ElementType == ValueElement ? value->BitSize : 1; return HIDP_STATUS_SUCCESS; } } @@ -288,7 +288,7 @@ NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE Usag TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, PreparsedData, Report, ReportLength); - rc = find_value(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, &element); + rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, ValueElement, &element); if (rc == HIDP_STATUS_SUCCESS) { @@ -314,7 +314,7 @@ NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, PreparsedData, Report, ReportLength); - rc = find_value(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, &element); + rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, ValueElement, &element); if (rc == HIDP_STATUS_SUCCESS) { @@ -568,7 +568,7 @@ NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, TRACE("(%i, %x, %i, %i, %i, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, PreparsedData, Report, ReportLength); - rc = find_value(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, &element); + rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, ValueElement, &element); if (rc == HIDP_STATUS_SUCCESS) { @@ -593,8 +593,8 @@ NTSTATUS WINAPI HidP_SetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH for (i = 0; i < *UsageLength; i++) { - rc = find_value(ReportType, UsagePage, LinkCollection, - UsageList[i], PreparsedData, Report, &element); + rc = find_usage(ReportType, UsagePage, LinkCollection, + UsageList[i], PreparsedData, Report, ButtonElement, &element); if (rc == HIDP_STATUS_SUCCESS) { rc = set_report_data((BYTE*)Report, ReportLength, diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 1df789f..042c84d 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -187,6 +187,9 @@ NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR Re ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PLONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, ULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength); +NTSTATUS WINAPI HidP_SetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, + USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, + PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(USAGE *ChangedUsageList, ULONG UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, HIDP_KEYBOARD_MODIFIER_STATE *ModifierState, PHIDP_INSERT_SCANCODES InsertCodesProcedure, VOID *InsertCodesContext); NTSTATUS WINAPI HidP_GetSpecificButtonCaps(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, HIDP_BUTTON_CAPS *ButtonCaps, USHORT *ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetSpecificValueCaps(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, HIDP_VALUE_CAPS *ValueCaps, USHORT *ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData);

1 0

Piotr Caban : hidclass.sys: Remove no longer used features list.
by Alexandre Julliard May 13, 2019

May 13, 2019

Module: wine Branch: master Commit: 84a248c1ddd06ef3e1e740cc0702640381ef1c21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84a248c1ddd06ef3e1e740cc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 13 12:34:04 2019 +0200 hidclass.sys: Remove no longer used features list. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index b409ea1..50c53f5 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -134,7 +134,6 @@ struct caps { struct feature { struct list entry; - struct list col_entry; struct caps caps; HIDP_REPORT_TYPE type; @@ -264,7 +263,7 @@ static void debug_collection(struct collection *collection) collection->index, collection_string[collection->type], collection->parent, list_count(&collection->features), list_count(&collection->collections)); debugstr_caps("Collection", &collection->caps); - LIST_FOR_EACH_ENTRY(fentry, &collection->features, struct feature, col_entry) + LIST_FOR_EACH_ENTRY(fentry, &collection->features, struct feature, entry) debug_feature(fentry); LIST_FOR_EACH_ENTRY(centry, &collection->collections, struct collection, entry) debug_collection(centry); @@ -476,7 +475,7 @@ static void new_caps(struct caps *caps) static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int length, unsigned int *feature_index, unsigned int *collection_index, struct collection *collection, struct caps *caps, - struct list *features, struct list *stack) + struct list *stack) { unsigned int i; for (i = index; i < length;) @@ -516,8 +515,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l { case TAG_MAIN_INPUT: feature = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*feature)); - list_add_tail(&collection->features, &feature->col_entry); - list_add_tail(features, &feature->entry); + list_add_tail(&collection->features, &feature->entry); feature->type = HidP_Input; parse_io_feature(bSize, itemVal, bTag, feature_index, feature); feature->caps = *caps; @@ -526,8 +524,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l break; case TAG_MAIN_OUTPUT: feature = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*feature)); - list_add_tail(&collection->features, &feature->col_entry); - list_add_tail(features, &feature->entry); + list_add_tail(&collection->features, &feature->entry); feature->type = HidP_Output; parse_io_feature(bSize, itemVal, bTag, feature_index, feature); feature->caps = *caps; @@ -536,8 +533,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l break; case TAG_MAIN_FEATURE: feature = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*feature)); - list_add_tail(&collection->features, &feature->col_entry); - list_add_tail(features, &feature->entry); + list_add_tail(&collection->features, &feature->entry); feature->type = HidP_Feature; parse_io_feature(bSize, itemVal, bTag, feature_index, feature); feature->caps = *caps; @@ -562,7 +558,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l parse_collection(bSize, itemVal, subcollection); - i = parse_descriptor(descriptor, i+1, length, feature_index, collection_index, subcollection, caps, features, stack); + i = parse_descriptor(descriptor, i+1, length, feature_index, collection_index, subcollection, caps, stack); continue; } case TAG_MAIN_END_COLLECTION: @@ -854,7 +850,7 @@ static void create_preparse_ctx(const struct collection *base, struct preparse_c struct feature *f; struct collection *c; - LIST_FOR_EACH_ENTRY(f, &base->features, struct feature, col_entry) + LIST_FOR_EACH_ENTRY(f, &base->features, struct feature, entry) { ctx->elem_count += f->caps.usage_count; ctx->report_elem_count[f->type][f->caps.ReportID] += f->caps.usage_count; @@ -874,7 +870,7 @@ static void preparse_collection(const struct collection *base, struct feature *f; struct collection *c; - LIST_FOR_EACH_ENTRY(f, &base->features, struct feature, col_entry) + LIST_FOR_EACH_ENTRY(f, &base->features, struct feature, entry) { WINE_HID_REPORT *report; @@ -958,9 +954,9 @@ static void free_collection(struct collection *collection) list_remove(&centry->entry); free_collection(centry); } - LIST_FOR_EACH_ENTRY_SAFE(fentry, fnext, &collection->features, struct feature, col_entry) + LIST_FOR_EACH_ENTRY_SAFE(fentry, fnext, &collection->features, struct feature, entry) { - list_remove(&fentry->col_entry); + list_remove(&fentry->entry); HeapFree(GetProcessHeap(), 0, fentry); } HeapFree(GetProcessHeap(), 0, collection); @@ -972,7 +968,6 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) struct collection *base; struct caps caps; - struct list features; struct list caps_stack; unsigned int feature_count = 0; @@ -990,7 +985,6 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) TRACE("\n"); } - list_init(&features); list_init(&caps_stack); base = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*base)); @@ -1000,7 +994,7 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) memset(&caps, 0, sizeof(caps)); cidx = 0; - parse_descriptor(descriptor, 0, length, &feature_count, &cidx, base, &caps, &features, &caps_stack); + parse_descriptor(descriptor, 0, length, &feature_count, &cidx, base, &caps, &caps_stack); debug_collection(base); @@ -1018,7 +1012,6 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) data = build_PreparseData(base); debug_print_preparsed(data); free_collection(base); - /* We do not have to free the list as free_collection does all the work */ return data; }

1 0

Nikolay Sivov : dwrite/layout: Fix layout metrics width for whitespace-only lines.
by Alexandre Julliard May 13, 2019

May 13, 2019

Module: wine Branch: master Commit: 93a852e26227ef6ca7c52ada9d274c9acb6da3ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=93a852e26227ef6ca7c52ada… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 13 14:21:45 2019 +0300 dwrite/layout: Fix layout metrics width for whitespace-only lines. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 5 +++-- dlls/dwrite/tests/layout.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 3e316c2..2b62758 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1831,7 +1831,7 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust FLOAT descent, trailingspacewidth; BOOL append_trimming_run = FALSE; const struct layout_run *run; - FLOAT width, origin_x; + float width = 0.0f, origin_x; HRESULT hr; /* Take a look at clusters we got for this line in reverse order to set trailing properties for current line */ @@ -1871,7 +1871,8 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust } /* Does not include trailing space width */ - width = get_cluster_range_width(layout, first_cluster, last_cluster + 1); + if (!layout->clustermetrics[last_cluster].isWhitespace) + width = get_cluster_range_width(layout, first_cluster, last_cluster + 1); /* Append trimming run if necessary */ if (width > layout->metrics.layoutWidth && layout->format.trimmingsign != NULL && diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 14b287c..8337ce7 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -3205,6 +3205,7 @@ static void test_GetMetrics(void) static const WCHAR str2W[] = {0x2066,')',')',0x661,'(',0x627,')',0}; static const WCHAR strW[] = {'a','b','c','d',0}; static const WCHAR str3W[] = {'a',0}; + static const WCHAR str4W[] = {' ',0}; DWRITE_CLUSTER_METRICS clusters[4]; DWRITE_TEXT_METRICS metrics; IDWriteTextFormat *format; @@ -3290,6 +3291,25 @@ todo_wine ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount); IDWriteTextLayout_Release(layout); + /* Whitespace only. */ + hr = IDWriteFactory_CreateTextLayout(factory, str4W, 1, format, 500.0, 1000.0, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); + + memset(&metrics, 0xcc, sizeof(metrics)); + hr = IDWriteTextLayout_GetMetrics(layout, &metrics); + ok(hr == S_OK, "Failed to get layout metrics, hr %#x.\n", hr); + ok(metrics.left == 0.0f, "Unexpected value for left %f.\n", metrics.left); + ok(metrics.top == 0.0f, "Unexpected value for top %f.\n", metrics.top); + ok(metrics.width == 0.0f, "Unexpected width %f.\n", metrics.width); + ok(metrics.widthIncludingTrailingWhitespace > 0.0f, "Unexpected full width %f.\n", + metrics.widthIncludingTrailingWhitespace); + ok(metrics.height > 0.0, "Unexpected height %f.\n", metrics.height); + ok(metrics.layoutWidth == 500.0, "Unexpected box width %f.\n", metrics.layoutWidth); + ok(metrics.layoutHeight == 1000.0, "Unexpected box height %f.\n", metrics.layoutHeight); + ok(metrics.maxBidiReorderingDepth == 1, "Unexpected reordering depth %u.\n", metrics.maxBidiReorderingDepth); + ok(metrics.lineCount == 1, "Unexpected line coun %u.\n", metrics.lineCount); + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); }

1 0