wine-commits April 2019

1 participants
803 discussions

Józef Kucia : vkd3d-shader: Improve ID assignment for specialization constants.

by Alexandre Julliard

Module: vkd3d Branch: master Commit: 9046233492541cbe5541583884cd370bea69f859 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9046233492541cbe5541583… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 29 11:38:12 2019 +0200 vkd3d-shader: Improve ID assignment for specialization constants. Allows using 0 as SpecId. 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 | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 22e02f9..86d5be8 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2565,20 +2565,20 @@ static const struct vkd3d_spec_constant_info *get_spec_constant_info(enum vkd3d_ static uint32_t vkd3d_dxbc_compiler_alloc_spec_constant_id(struct vkd3d_dxbc_compiler *compiler) { - if (!compiler->current_spec_constant_id && compiler->compile_args) + if (!compiler->current_spec_constant_id) { const struct vkd3d_shader_compile_arguments *compile_args = compiler->compile_args; - unsigned int i, id; + unsigned int i, id = 0; - for (i = 0, id = 0; i < compile_args->parameter_count; ++i) + for (i = 0; compiler->compile_args && i < compile_args->parameter_count; ++i) { const struct vkd3d_shader_parameter *current = &compile_args->parameters[i]; if (current->type == VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT) - id = max(current->u.specialization_constant.id, id); + id = max(current->u.specialization_constant.id + 1, id); } - compiler->current_spec_constant_id = id + 1; + compiler->current_spec_constant_id = id; } return compiler->current_spec_constant_id++; @@ -2623,9 +2623,6 @@ static uint32_t vkd3d_dxbc_compiler_get_spec_constant(struct vkd3d_dxbc_compiler return compiler->spec_constants[i].id; } - if (!spec_id) - spec_id = vkd3d_dxbc_compiler_alloc_spec_constant_id(compiler); - return vkd3d_dxbc_compiler_emit_spec_constant(compiler, name, spec_id); } @@ -2633,7 +2630,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_uint_shader_parameter(struct vkd3d_dxbc enum vkd3d_shader_parameter_name name) { const struct vkd3d_shader_parameter *parameter; - uint32_t spec_constant_id = 0; if (!(parameter = vkd3d_dxbc_compiler_get_shader_parameter(compiler, name))) { @@ -2643,14 +2639,14 @@ static uint32_t vkd3d_dxbc_compiler_emit_uint_shader_parameter(struct vkd3d_dxbc if (parameter->type == VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT) return vkd3d_dxbc_compiler_get_constant_uint(compiler, parameter->u.immediate_constant.u.u32); - if (parameter->type == VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT) - spec_constant_id = parameter->u.specialization_constant.id; - else - FIXME("Unhandled parameter type %#x.\n", parameter->type); + return vkd3d_dxbc_compiler_get_spec_constant(compiler, name, parameter->u.specialization_constant.id); + + FIXME("Unhandled parameter type %#x.\n", parameter->type); default_parameter: - return vkd3d_dxbc_compiler_get_spec_constant(compiler, name, spec_constant_id); + return vkd3d_dxbc_compiler_get_spec_constant(compiler, + name, vkd3d_dxbc_compiler_alloc_spec_constant_id(compiler)); } static uint32_t vkd3d_dxbc_compiler_emit_construct_vector(struct vkd3d_dxbc_compiler *compiler,

5 years

Józef Kucia : tests: Add test for sample positions.

by Alexandre Julliard

Module: vkd3d Branch: master Commit: 698e0d086dcb8752a72d93d6ae8a0b1e8ab95f44 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=698e0d086dcb8752a72d93d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 29 11:38:11 2019 +0200 tests: Add test for sample positions. 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 | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5f2e6b1..dd13ddf 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -27607,6 +27607,135 @@ static void test_shader_get_render_target_sample_count(void) destroy_test_context(&context); } +static void test_shader_sample_position(void) +{ + D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; + ID3D12Resource *texture, *readback_texture; + ID3D12GraphicsCommandList *command_list; + D3D12_HEAP_PROPERTIES heap_properties; + D3D12_RESOURCE_DESC resource_desc; + struct test_context_desc desc; + struct resource_readback rb; + struct test_context context; + ID3D12DescriptorHeap *heap; + ID3D12CommandQueue *queue; + uint32_t sample_index; + unsigned int i; + D3D12_BOX box; + HRESULT hr; + + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD ps_code[] = + { +#if 0 + uint index; + Texture2DMS<float4> t; + + float4 main() : SV_Target + { + return float4(t.GetSamplePosition(index), 0, 0); + } +#endif + 0x43425844, 0x89611945, 0x2b7e06f0, 0x953a72bb, 0x1590618f, 0x00000001, 0x000000f8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000080, 0x00000050, 0x00000020, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04002058, 0x00107000, 0x00000000, + 0x00005555, 0x03000065, 0x001020f2, 0x00000000, 0x0900006e, 0x00102032, 0x00000000, 0x00107046, + 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + + memset(&desc, 0, sizeof(desc)); + desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT; + desc.rt_width = desc.rt_height = 1; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + context.root_signature = create_texture_root_signature(context.device, + D3D12_SHADER_VISIBILITY_PIXEL, 1, 0); + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL); + + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; + resource_desc = ID3D12Resource_GetDesc(context.render_target); + resource_desc.SampleDesc.Count = 4; + hr = ID3D12Device_CreateCommittedResource(context.device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 16); + readback_texture = create_default_texture(context.device, 4, 1, DXGI_FORMAT_R32G32B32A32_FLOAT, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + ID3D12Device_CreateShaderResourceView(context.device, texture, NULL, + ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap)); + + transition_resource_state(command_list, + texture, D3D12_RESOURCE_STATE_COMMON, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + + for (sample_index = 0; sample_index < resource_desc.SampleDesc.Count; ++sample_index) + { + 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_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + get_gpu_descriptor_handle(&context, heap, 0)); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 1, &sample_index, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + src_location.pResource = context.render_target; + src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; + src_location.SubresourceIndex = 0; + dst_location.pResource = readback_texture; + dst_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; + dst_location.SubresourceIndex = 0; + set_box(&box, 0, 0, 0, 1, 1, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, sample_index, 0, 0, &src_location, &box); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + + transition_resource_state(command_list, readback_texture, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_texture_readback_with_command_list(readback_texture, 0, &rb, queue, command_list); + for (i = 0; i < resource_desc.SampleDesc.Count; ++i) + { + const struct vec4 *position = get_readback_vec4(&rb, i, 0); + + vkd3d_test_set_context("Sample %u", i); + + ok(-1.0f <= position->x && position->x <= 1.0f, "Unexpected x %.8e.\n", position->x); + ok(-1.0f <= position->y && position->y <= 1.0f, "Unexpected y %.8e.\n", position->y); + ok(!position->z, "Unexpected z %.8e.\n", position->z); + ok(!position->w, "Unexpected w %.8e.\n", position->w); + + if (vkd3d_test_state.debug_level > 0) + trace("Sample %u position {%.8e, %.8e}.\n", i, position->x, position->y); + + vkd3d_test_set_context(NULL); + } + release_resource_readback(&rb); + + ID3D12DescriptorHeap_Release(heap); + ID3D12Resource_Release(texture); + ID3D12Resource_Release(readback_texture); + destroy_test_context(&context); +} + static void test_shader_eval_attribute(void) { D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; @@ -28623,6 +28752,7 @@ START_TEST(d3d12) run_test(test_sample_mask); run_test(test_coverage); run_test(test_shader_get_render_target_sample_count); + run_test(test_shader_sample_position); run_test(test_shader_eval_attribute); run_test(test_primitive_restart); run_test(test_vertex_shader_stream_output);

5 years

Józef Kucia : vkd3d-shader: Translate samplepos instructions.

by Alexandre Julliard

Module: vkd3d Branch: master Commit: 33937196925c3c30eb31e48298be1b8562b76add URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=33937196925c3c30eb31e48… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 29 11:38:10 2019 +0200 vkd3d-shader: Translate samplepos instructions. This returns standard sample locations. DXC and glslang do the same thing. https://github.com/khronosgroup/glslang/commit/d4d0b29752c173d2aa8d2d105f2f… In the long term, we could also add a shader parameter to pass sample positions to the shader compiler. 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 | 171 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 154 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=33937196925c3c30eb3…

5 years

Michael Stefaniuc : mscoree: Remove a redundant NULL check before heap_free().

by Alexandre Julliard

Module: wine Branch: master Commit: 5bd1b2652c844a2522131bd26feb95231f718986 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bd1b2652c844a2522131bd2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Apr 29 21:13:20 2019 +0200 mscoree: Remove a redundant NULL check before heap_free(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 95f6a9a..13619bd 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1707,8 +1707,7 @@ static BOOL try_create_registration_free_com(REFIID clsid, WCHAR *classname, UIN ret = TRUE; end: - if (assembly_info) - heap_free(assembly_info); + heap_free(assembly_info); if (guid_info.hActCtx) ReleaseActCtx(guid_info.hActCtx);

5 years

Michael Stefaniuc : wintrust: Use the ARRAY_SIZE() macro.

by Alexandre Julliard

Module: wine Branch: master Commit: 70996f49e3ed40c18cd9c17d8cabd3d33b03a8d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70996f49e3ed40c18cd9c17d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Apr 29 21:13:22 2019 +0200 wintrust: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/softpub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 914f04d..2a4f4f4 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -1211,7 +1211,7 @@ static void test_wintrust_digest(void) BOOL ret; int i, j; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { file = create_temp_file(pathW); ok(file != INVALID_HANDLE_VALUE, "failed to create temporary file\n");

5 years

Michael Stefaniuc : ntoskrnl.exe: Correctly initialize two CRITICAL_SECTION_DEBUGs.

by Alexandre Julliard

Module: wine Branch: master Commit: 4905bc740d4ed3e391212d332a2527048c8fb61c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4905bc740d4ed3e391212d33… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Apr 29 21:13:21 2019 +0200 ntoskrnl.exe: Correctly initialize two CRITICAL_SECTION_DEBUGs. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 9d75223..d8756a8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -293,7 +293,7 @@ static CRITICAL_SECTION obref_cs; static CRITICAL_SECTION_DEBUG obref_critsect_debug = { 0, 0, &obref_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + { &obref_critsect_debug.ProcessLocksList, &obref_critsect_debug.ProcessLocksList }, 0, 0, { (DWORD_PTR)(__FILE__ ": obref_cs") } }; static CRITICAL_SECTION obref_cs = { &obref_critsect_debug, -1, 0, 0, 0, 0 }; @@ -396,7 +396,7 @@ static CRITICAL_SECTION handle_map_cs; static CRITICAL_SECTION_DEBUG handle_map_critsect_debug = { 0, 0, &handle_map_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + { &handle_map_critsect_debug.ProcessLocksList, &handle_map_critsect_debug.ProcessLocksList }, 0, 0, { (DWORD_PTR)(__FILE__ ": handle_map_cs") } }; static CRITICAL_SECTION handle_map_cs = { &handle_map_critsect_debug, -1, 0, 0, 0, 0 };

5 years

Michael Stefaniuc : ntdll/tests: Avoid the comma operator.

by Alexandre Julliard

Module: wine Branch: master Commit: 21f3bf53dca1fae599f8d2b22a4430ed1ce330a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21f3bf53dca1fae599f8d2b2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Apr 29 21:13:19 2019 +0200 ntdll/tests: Avoid the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 4f75cc2..ada28c9 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3274,7 +3274,7 @@ static void test_suspend_process(void) startup.cb = sizeof(startup); sprintf(path_name, "%s exception suspend_process", argv[0]); - ret = CreateProcessA(NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info), + ret = CreateProcessA(NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info); ok(ret, "Failed to create target process.\n"); /* New process signals this event. */

5 years

Louis Lenders : user32: Added GetPointerType stub.

by Alexandre Julliard

Module: wine Branch: master Commit: 34408796b9521c965c6d81a96fa5174aade4addb URL: https://source.winehq.org/git/wine.git/?a=commit;h=34408796b9521c965c6d81a9… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Apr 26 14:21:03 2019 +0200 user32: Added GetPointerType stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45765 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec | 2 +- dlls/user32/misc.c | 16 +++++++++++ dlls/user32/tests/input.c | 32 ++++++++++++++++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 5 files changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec index 93ecc1b..c58d51a 100644 --- a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec +++ b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec @@ -17,7 +17,7 @@ @ stub GetPointerPenInfoHistory @ stub GetPointerTouchInfo @ stub GetPointerTouchInfoHistory -@ stub GetPointerType +@ stdcall GetPointerType(long ptr) user32.GetPointerType @ stub GetRawPointerDeviceData @ stub InitializeTouchInjection @ stub InjectTouchInput diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index d28cd9f..1a03d70 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -664,6 +664,22 @@ BOOL WINAPI RegisterTouchHitTestingWindow(HWND hwnd, ULONG value) return TRUE; } +/********************************************************************** + * GetPointerType [USER32.@] + */ +BOOL WINAPI GetPointerType(UINT32 id, POINTER_INPUT_TYPE *type) +{ + FIXME("(%d %p): stub\n", id, type); + + if(!id || !type) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + *type = PT_MOUSE; + return TRUE; +} static const WCHAR imeW[] = {'I','M','E',0}; const struct builtin_class_descr IME_builtin_class = diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 625de3d..4a9be55 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -78,6 +78,7 @@ static struct { static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); static BOOL (WINAPI *pGetCurrentInputMessageSource)( INPUT_MESSAGE_SOURCE *source ); +static BOOL (WINAPI *pGetPointerType)(UINT32, POINTER_INPUT_TYPE*); static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD); static UINT (WINAPI *pGetRawInputDeviceList) (PRAWINPUTDEVICELIST, PUINT, UINT); static UINT (WINAPI *pGetRawInputDeviceInfoW) (HANDLE, UINT, void *, UINT *); @@ -165,6 +166,7 @@ static void init_function_pointers(void) GET_PROC(SendInput); GET_PROC(GetCurrentInputMessageSource); GET_PROC(GetMouseMovePointsEx); + GET_PROC(GetPointerType); GET_PROC(GetRawInputDeviceList); GET_PROC(GetRawInputDeviceInfoW); GET_PROC(GetRawInputDeviceInfoA); @@ -2800,6 +2802,31 @@ static void test_input_message_source(void) UnregisterClassA( cls.lpszClassName, GetModuleHandleA(0) ); } +static void test_GetPointerType(void) +{ + BOOL ret; + POINTER_INPUT_TYPE type = -1; + UINT id = 0; + + SetLastError(0xdeadbeef); + ret = pGetPointerType(id, NULL); + ok(!ret, "GetPointerType should have failed.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected error ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetPointerType(id, &type); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected error ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); + ok(!ret, "GetPointerType failed, got type %d for %u.\n", type, id ); + ok(type == -1, " type %d\n", type ); + + id = 1; + ret = pGetPointerType(id, &type); + ok(ret, "GetPointerType failed, got type %d for %u.\n", type, id ); + ok(type == PT_MOUSE, " type %d\n", type ); +} + START_TEST(input) { POINT pos; @@ -2845,4 +2872,9 @@ START_TEST(input) win_skip("GetCurrentInputMessageSource is not available\n"); SetCursorPos( pos.x, pos.y ); + + if(pGetPointerType) + test_GetPointerType(); + else + win_skip("GetPointerType is not available\n"); } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index d5b8597..f9a4ae2 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -356,6 +356,7 @@ @ stdcall GetParent(long) @ stdcall GetPhysicalCursorPos(ptr) @ stdcall GetPointerDevices(ptr ptr) +@ stdcall GetPointerType(long ptr) @ stdcall GetPriorityClipboardFormat(ptr long) @ stdcall GetProcessDefaultLayout(ptr) @ stdcall GetProcessDpiAwarenessInternal(long ptr) diff --git a/include/winuser.h b/include/winuser.h index 28b9b1f..a489cb7 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3833,6 +3833,7 @@ WINUSERAPI HWND WINAPI GetNextDlgTabItem(HWND,HWND,BOOL); WINUSERAPI HWND WINAPI GetOpenClipboardWindow(void); WINUSERAPI HWND WINAPI GetParent(HWND); WINUSERAPI BOOL WINAPI GetPhysicalCursorPos(POINT*); +WINUSERAPI BOOL WINAPI GetPointerType(UINT32,POINTER_INPUT_TYPE *); WINUSERAPI INT WINAPI GetPriorityClipboardFormat(UINT*,INT); WINUSERAPI BOOL WINAPI GetProcessDefaultLayout(DWORD*); WINUSERAPI BOOL WINAPI GetProcessDpiAwarenessInternal(HANDLE,DPI_AWARENESS*);

5 years

Vijay Kiran Kamuju : virtdisk: Add stub and tests for OpenVirtualDisk.

by Alexandre Julliard

Module: wine Branch: master Commit: 081fd1e9972ac1ee0fba66d265e8ecf13217bdf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=081fd1e9972ac1ee0fba66d2… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Apr 26 05:10:39 2019 +0200 virtdisk: Add stub and tests for OpenVirtualDisk. Based on patch from Louis Lenders. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45947 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/virtdisk/tests/virtdisk.c | 41 +++++++++++++++++++++++++++++++++++ dlls/virtdisk/virtdisk.spec | 2 +- dlls/virtdisk/virtdisk_main.c | 14 ++++++++++++ include/virtdisk.h | 49 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 105 insertions(+), 1 deletion(-) diff --git a/dlls/virtdisk/tests/virtdisk.c b/dlls/virtdisk/tests/virtdisk.c index d1f699f..23d0705 100644 --- a/dlls/virtdisk/tests/virtdisk.c +++ b/dlls/virtdisk/tests/virtdisk.c @@ -18,11 +18,13 @@ #include <stdarg.h> #include "windef.h" +#include "initguid.h" #include "virtdisk.h" #include "wine/heap.h" #include "wine/test.h" static DWORD (WINAPI *pGetStorageDependencyInformation)(HANDLE,GET_STORAGE_DEPENDENCY_FLAG,ULONG,STORAGE_DEPENDENCY_INFO*,ULONG*); +static DWORD (WINAPI *pOpenVirtualDisk)(PVIRTUAL_STORAGE_TYPE,PCWSTR,VIRTUAL_DISK_ACCESS_MASK,OPEN_VIRTUAL_DISK_FLAG,POPEN_VIRTUAL_DISK_PARAMETERS,PHANDLE); static void test_GetStorageDependencyInformation(void) { @@ -47,6 +49,38 @@ static void test_GetStorageDependencyInformation(void) CloseHandle(handle); } +static void test_OpenVirtualDisk(void) +{ + DWORD ret; + HANDLE handle; + VIRTUAL_STORAGE_TYPE stgtype; + OPEN_VIRTUAL_DISK_PARAMETERS param; + static const WCHAR vdisk[] = {'t','e','s','t','.','v','h','d',0}; + + ret = pOpenVirtualDisk(NULL, NULL, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, NULL, &handle); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + stgtype.DeviceId = VIRTUAL_STORAGE_TYPE_DEVICE_UNKNOWN; + stgtype.VendorId = VIRTUAL_STORAGE_TYPE_VENDOR_UNKNOWN; + ret = pOpenVirtualDisk(&stgtype, NULL, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, NULL, &handle); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + param.Version = OPEN_VIRTUAL_DISK_VERSION_3; + ret = pOpenVirtualDisk(&stgtype, vdisk, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, &param, &handle); + ok((ret == ERROR_INVALID_PARAMETER) || (ret == ERROR_FILE_NOT_FOUND), "Expected ERROR_INVALID_PARAMETER or ERROR_FILE_NOT_FOUND (>= Win 10), got %d\n", ret); + + param.Version = OPEN_VIRTUAL_DISK_VERSION_2; + ret = pOpenVirtualDisk(&stgtype, vdisk, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, &param, &handle); + ok((ret == ERROR_INVALID_PARAMETER) || (ret == ERROR_FILE_NOT_FOUND), "Expected ERROR_INVALID_PARAMETER or ERROR_FILE_NOT_FOUND (>= Win 8), got %d\n", ret); + + param.Version = OPEN_VIRTUAL_DISK_VERSION_1; + ret = pOpenVirtualDisk(&stgtype, vdisk, 0xffffff, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, &param, &handle); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + ret = pOpenVirtualDisk(&stgtype, vdisk, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NONE, &param, &handle); + todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", ret); +} + START_TEST(virtdisk) { HMODULE module = LoadLibraryA("virtdisk.dll"); @@ -57,8 +91,15 @@ START_TEST(virtdisk) } pGetStorageDependencyInformation = (void *)GetProcAddress( module, "GetStorageDependencyInformation" ); + pOpenVirtualDisk = (void *)GetProcAddress( module, "OpenVirtualDisk" ); + if (pGetStorageDependencyInformation) test_GetStorageDependencyInformation(); else win_skip("GetStorageDependencyInformation is not available\n"); + + if (pOpenVirtualDisk) + test_OpenVirtualDisk(); + else + win_skip("OpenVirtualDisk is not available\n"); } diff --git a/dlls/virtdisk/virtdisk.spec b/dlls/virtdisk/virtdisk.spec index 6bd5f14..f35b8df 100644 --- a/dlls/virtdisk/virtdisk.spec +++ b/dlls/virtdisk/virtdisk.spec @@ -15,7 +15,7 @@ @ stub GetVirtualDiskPhysicalPath @ stub MergeVirtualDisk @ stub MirrorVirtualDisk -@ stub OpenVirtualDisk +@ stdcall OpenVirtualDisk(ptr wstr long long ptr ptr) @ stub ResizeVirtualDisk @ stub SetVirtualDiskInformation @ stub SetVirtualDiskMetadata diff --git a/dlls/virtdisk/virtdisk_main.c b/dlls/virtdisk/virtdisk_main.c index 3e6c5c1..2d384cb 100644 --- a/dlls/virtdisk/virtdisk_main.c +++ b/dlls/virtdisk/virtdisk_main.c @@ -65,3 +65,17 @@ DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_ return ERROR_SUCCESS; } + +DWORD WINAPI OpenVirtualDisk(VIRTUAL_STORAGE_TYPE *type, const WCHAR *path, VIRTUAL_DISK_ACCESS_MASK mask, OPEN_VIRTUAL_DISK_FLAG flags, + OPEN_VIRTUAL_DISK_PARAMETERS *param, HANDLE *handle) +{ + FIXME("(%p, %s, %d, 0x%x, %p, %p): stub\n", type, wine_dbgstr_w(path), mask, flags, param, handle); + + if (!type || !path || (mask & ~VIRTUAL_DISK_ACCESS_ALL) || (flags & ~(OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS | OPEN_VIRTUAL_DISK_FLAG_BLANK_FILE)) || !param) + return ERROR_INVALID_PARAMETER; + + if (param->Version != OPEN_VIRTUAL_DISK_VERSION_1) + return ERROR_INVALID_PARAMETER; + + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/virtdisk.h b/include/virtdisk.h index b4c07f3..0c81ee1 100644 --- a/include/virtdisk.h +++ b/include/virtdisk.h @@ -27,6 +27,11 @@ extern "C" { #define VIRTUAL_STORAGE_TYPE_DEVICE_UNKNOWN 0 #define VIRTUAL_STORAGE_TYPE_DEVICE_ISO 1 #define VIRTUAL_STORAGE_TYPE_DEVICE_VHD 2 +#define VIRTUAL_STORAGE_TYPE_DEVICE_VHDX 3 +#define VIRTUAL_STORAGE_TYPE_DEVICE_VHDSET 4 + +DEFINE_GUID(VIRTUAL_STORAGE_TYPE_VENDOR_UNKNOWN, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); +DEFINE_GUID(VIRTUAL_STORAGE_TYPE_VENDOR_MICROSOFT, 0xec984aec, 0xa0f9, 0x47e9, 0x90, 0x1f, 0x71, 0x41, 0x5a, 0x66, 0x34, 0x5b); typedef enum _ATTACH_VIRTUAL_DISK_FLAG { ATTACH_VIRTUAL_DISK_FLAG_NONE = 0x00, @@ -37,6 +42,26 @@ typedef enum _ATTACH_VIRTUAL_DISK_FLAG { ATTACH_VIRTUAL_DISK_FLAG_NO_SECURITY_DESCRIPTOR = 0x10 } ATTACH_VIRTUAL_DISK_FLAG; +typedef enum _OPEN_VIRTUAL_DISK_FLAG { + OPEN_VIRTUAL_DISK_FLAG_NONE = 0x00, + OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS = 0x01, + OPEN_VIRTUAL_DISK_FLAG_BLANK_FILE = 0x02, + OPEN_VIRTUAL_DISK_FLAG_BOOT_DRIVE = 0x04, + OPEN_VIRTUAL_DISK_FLAG_CACHED_IO = 0x08, + OPEN_VIRTUAL_DISK_FLAG_CUSTOM_DIFF_CHAIN = 0x10, + OPEN_VIRTUAL_DISK_FLAG_PARENT_CACHED_IO = 0x20, + OPEN_VIRTUAL_DISK_FLAG_VHDSET_FILE_ONLY = 0x40, + OPEN_VIRTUAL_DISK_FLAG_IGNORE_RELATIVE_PARENT_LOCATOR = 0x80, + OPEN_VIRTUAL_DISK_FLAG_NO_WRITE_HARDENING = 0x100 +} OPEN_VIRTUAL_DISK_FLAG; + +typedef enum _OPEN_VIRTUAL_DISK_VERSION { + OPEN_VIRTUAL_DISK_VERSION_UNSCPECIFIED, + OPEN_VIRTUAL_DISK_VERSION_1, + OPEN_VIRTUAL_DISK_VERSION_2, + OPEN_VIRTUAL_DISK_VERSION_3 +} OPEN_VIRTUAL_DISK_VERSION; + typedef enum _ATTACH_VIRTUAL_DISK_VERSION { ATTACH_VIRTUAL_DISK_VERSION_UNSPECIFIED, ATTACH_VIRTUAL_DISK_VERSION_1 @@ -156,6 +181,27 @@ typedef struct _EXPAND_VIRTUAL_DISK_PARAMETERS { } DUMMYUNIONNAME; } EXPAND_VIRTUAL_DISK_PARAMETERS, *PEXPAND_VIRTUAL_DISK_PARAMETERS; +typedef struct _OPEN_VIRTUAL_DISK_PARAMETERS +{ + OPEN_VIRTUAL_DISK_VERSION Version; + __C89_NAMELESS union { + struct { + ULONG RWDepth; + } Version1; + struct { + BOOL GetInfoOnly; + BOOL ReadOnly; + GUID ResiliencyGuid; + } Version2; + struct { + BOOL GetInfoOnly; + BOOL ReadOnly; + GUID ResiliencyGuid; + GUID SnapshotId; + } Version3; + } DUMMYUNIONNAME; +} OPEN_VIRTUAL_DISK_PARAMETERS, *POPEN_VIRTUAL_DISK_PARAMETERS; + typedef struct _STORAGE_DEPENDENCY_INFO_TYPE_1 { DEPENDENT_DISK_FLAG DependencyTypeFlags; @@ -196,6 +242,9 @@ typedef struct _VIRTUAL_DISK_PROGRESS { DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_FLAG flags, ULONG size, STORAGE_DEPENDENCY_INFO *info, ULONG *used); +DWORD WINAPI OpenVirtualDisk(VIRTUAL_STORAGE_TYPE *type, const WCHAR *path, VIRTUAL_DISK_ACCESS_MASK mask, OPEN_VIRTUAL_DISK_FLAG flags, + OPEN_VIRTUAL_DISK_PARAMETERS *param, HANDLE *handle); + #ifdef __cplusplus } #endif

5 years

Martin Storsjo : qcap: Fix compilation with older videodev2.h.

by Alexandre Julliard

Module: wine Branch: master Commit: 2c42d5ee4d98e4de7316dd56e56ec273d21ff2e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c42d5ee4d98e4de7316dd56… Author: Martin Storsjo <martin(a)martin.st> Date: Sat Apr 27 22:07:00 2019 +0300 qcap: Fix compilation with older videodev2.h. Older videodev2.h lack the V4L2_CAP_DEVICE_CAPS define and the device_caps field in the v4l2_capability struct. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index dcc5925..f0875f7 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -577,8 +577,10 @@ Capture * qcap_driver_init( IPin *pOut, USHORT card ) goto error; } +#ifdef V4L2_CAP_DEVICE_CAPS if (caps.capabilities & V4L2_CAP_DEVICE_CAPS) caps.capabilities = caps.device_caps; +#endif if (!(caps.capabilities & V4L2_CAP_VIDEO_CAPTURE)) {

5 years

← Newer
1
2
3
4
5
6
7
8
...
81
Older →

Jump to page:

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 April 2019