wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Józef Kucia : vkd3d-shader: Allow vPrim in hull shader phases.
by Alexandre Julliard 14 May '19

14 May '19

Module: vkd3d Branch: master Commit: 3b6a63425a1bd39ca9a30fc4bc42e438422ac5fc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3b6a63425a1bd39ca9a30fc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 14 13:27:36 2019 +0200 vkd3d-shader: Allow vPrim in hull shader phases. 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index dc51644..f0b7c5b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3967,6 +3967,7 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compil vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE); return; case VKD3DSPR_OUTPOINTID: + case VKD3DSPR_PRIMID: vkd3d_dxbc_compiler_emit_input_register(compiler, dst); return; case VKD3DSPR_FORKINSTID:

1 0

Józef Kucia : tests: Remove test_incompletely_initialized_shader_outputs().
by Alexandre Julliard 14 May '19

14 May '19

Module: vkd3d Branch: master Commit: 206d370be4f982072c66488c7cc4bc6372b10d04 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=206d370be4f982072c66488… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 14 13:27:35 2019 +0200 tests: Remove test_incompletely_initialized_shader_outputs(). The test checks the content of uninitialized pixel shader outputs and it fails on Windows with Intel GPUs. 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> --- tests/d3d12.c | 81 ----------------------------------------------------------- 1 file changed, 81 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 4e08636..842939b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9756,86 +9756,6 @@ static void test_shader_input_output_components(void) destroy_test_context(&context); } -static void test_incompletely_initialized_shader_outputs(void) -{ - static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; - ID3D12GraphicsCommandList *command_list; - struct test_context_desc desc; - struct test_context context; - ID3D12CommandQueue *queue; - unsigned int i; - - static const DWORD ps_code[] = - { -#if 0 - float3 color; - - void main(out float4 o : SV_Target) - { - o.xyz = color; - } -#endif - 0x43425844, 0xb5d86526, 0xc6c2455a, 0x8d02fe46, 0x5932818b, 0x00000001, 0x000000bc, 0x00000003, - 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, - 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, - 0x0000080f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000044, 0x00000050, 0x00000011, - 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x00102072, 0x00000000, - 0x06000036, 0x00102072, 0x00000000, 0x00208246, 0x00000000, 0x00000000, 0x0100003e, - }; - static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; - static struct - { - struct vec4 input; - struct vec4 output; - } - tests[] = - { - {{0.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f, 0.0f}}, - {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 0.0f}}, - {{1.0f, 2.0f, 3.0f, 4.0f}, {1.0f, 2.0f, 3.0f, 0.0f}}, - }; - - memset(&desc, 0, sizeof(desc)); - desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT; - desc.no_root_signature = true; - if (!init_test_context(&context, &desc)) - return; - command_list = context.list; - queue = context.queue; - - context.root_signature = create_32bit_constants_root_signature(context.device, - 0, 4, D3D12_SHADER_VISIBILITY_PIXEL); - context.pipeline_state = create_pipeline_state(context.device, - context.root_signature, desc.rt_format, NULL, &ps, NULL); - - for (i = 0; i < ARRAY_SIZE(tests); ++i) - { - vkd3d_test_set_context("Test %u", i); - - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); - - ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); - ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); - ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &tests[i].input, 0); - ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); - ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); - ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); - ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); - ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); - - transition_resource_state(command_list, context.render_target, - D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_vec4(context.render_target, 0, queue, command_list, &tests[i].output, 0); - - reset_command_list(command_list, context.allocator); - transition_resource_state(command_list, context.render_target, - D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); - } - vkd3d_test_set_context(NULL); - - destroy_test_context(&context); -} - static void check_descriptor_range_(unsigned int line, const D3D12_DESCRIPTOR_RANGE *range, const D3D12_DESCRIPTOR_RANGE *expected_range) { @@ -29121,7 +29041,6 @@ START_TEST(d3d12) run_test(test_discard_instruction); run_test(test_shader_interstage_interface); run_test(test_shader_input_output_components); - run_test(test_incompletely_initialized_shader_outputs); run_test(test_root_signature_byte_code); run_test(test_cs_constant_buffer); run_test(test_constant_buffer_relative_addressing);

1 0

Jeremy Newman : update for 2019
by Jeremy Newman 14 May '19

14 May '19

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 13 May '19

13 May '19

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 13 May '19

13 May '19

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 : hid: Set button values in HidP_SetUsages function.
by Alexandre Julliard 13 May '19

13 May '19

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: Support descriptors with over 10 individual usages in feature.
by Alexandre Julliard 13 May '19

13 May '19

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

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

13 May '19

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

Piotr Caban : hid: Change format of preparsed data.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 395d268565893c10875cbe903d2e1b77d6d7e3a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=395d268565893c10875cbe90… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 13 12:33:56 2019 +0200 hid: Change format of preparsed data. Advantages of this format: - all table elements have constant size, that makes iterating table easier - allow report lookup by report ID in O(1) time - doesn't sort reports, it makes it possible to preserve original order of elements making output of functions more similar to native - preparsed data is created from collection, this will allow to add support for multiple top-most collections 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 | 239 ++++++++-------------- dlls/hid/parse.h | 39 ++-- dlls/hidclass.sys/descriptor.c | 437 +++++++++++++---------------------------- dlls/hidclass.sys/device.c | 4 +- dlls/hidclass.sys/parse.h | 25 ++- 5 files changed, 250 insertions(+), 494 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=395d268565893c10875c…

1 0

Nikolay Sivov : dwrite: Improve returned design glyph metrics.
by Alexandre Julliard 13 May '19

13 May '19

Module: wine Branch: master Commit: 421c83cd7b15a42617fd942888eca0c81f6d2278 URL: https://source.winehq.org/git/wine.git/?a=commit;h=421c83cd7b15a42617fd9428… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 13 14:21:47 2019 +0300 dwrite: Improve returned design glyph metrics. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 71 ++++++++++++++++++++++++++++++++++++++------ dlls/dwrite/font.c | 51 +++++-------------------------- dlls/dwrite/freetype.c | 25 ++++++++-------- dlls/dwrite/opentype.c | 21 +++++++++++++ 4 files changed, 103 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=421c83cd7b15a42617fd…

1 0

Jump to page:

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-commits May 2019