June 2019 - Wine-devel - list.winehq.org

[PATCH vkd3d 6/8] include: Document API versions.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d.h | 39 ++++++++++++++++++++++----------------- include/vkd3d_shader.h | 1 + include/vkd3d_utils.h | 1 + 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index b78076e43927..e2d9ec81f2c4 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -36,12 +36,15 @@ extern "C" { enum vkd3d_structure_type { + /* 1.0 */ VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO, VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO, + /* 1.1 */ VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO, + /* 1.2 */ VKD3D_STRUCTURE_TYPE_OPTIONAL_DEVICE_EXTENSIONS_INFO, VKD3D_STRUCTURE_TYPE_APPLICATION_INFO, @@ -74,7 +77,7 @@ struct vkd3d_instance_create_info uint32_t instance_extension_count; }; -/* Extends vkd3d_instance_create_info. */ +/* Extends vkd3d_instance_create_info. Available since 1.1. */ struct vkd3d_optional_instance_extensions_info { enum vkd3d_structure_type type; @@ -84,7 +87,7 @@ struct vkd3d_optional_instance_extensions_info uint32_t extension_count; }; -/* Extends vkd3d_instance_create_info. */ +/* Extends vkd3d_instance_create_info. Available since 1.2. */ struct vkd3d_application_info { enum vkd3d_structure_type type; @@ -116,7 +119,7 @@ struct vkd3d_device_create_info LUID adapter_luid; }; -/* Extends vkd3d_device_create_info. */ +/* Extends vkd3d_device_create_info. Available since 1.2. */ struct vkd3d_optional_device_extensions_info { enum vkd3d_structure_type type; @@ -167,18 +170,19 @@ ULONG vkd3d_resource_incref(ID3D12Resource *resource); HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); - -HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, - ID3DBlob **blob, ID3DBlob **error_blob); - HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); -HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZE_T data_size, - REFIID iid, void **deserializer); +VkFormat vkd3d_get_vk_format(DXGI_FORMAT format); +/* 1.1 */ DXGI_FORMAT vkd3d_get_dxgi_format(VkFormat format); -VkFormat vkd3d_get_vk_format(DXGI_FORMAT format); + +/* 1.2 */ +HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob); +HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZE_T data_size, + REFIID iid, void **deserializer); #endif /* VKD3D_NO_PROTOTYPES */ @@ -209,18 +213,19 @@ typedef ULONG (*PFN_vkd3d_resource_incref)(ID3D12Resource *resource); typedef HRESULT (*PFN_vkd3d_serialize_root_signature)(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); - -typedef HRESULT (*PFN_vkd3d_serialize_versioned_root_signature)(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, - ID3DBlob **blob, ID3DBlob **error_blob); - typedef HRESULT (*PFN_vkd3d_create_root_signature_deserializer)(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); -typedef HRESULT (*PFN_vkd3d_create_versioned_root_signature_deserializer)(const void *data, SIZE_T data_size, - REFIID iid, void **deserializer); +typedef VkFormat (*PFN_vkd3d_get_vk_format)(DXGI_FORMAT format); +/* 1.1 */ typedef DXGI_FORMAT (*PFN_vkd3d_get_dxgi_format)(VkFormat format); -typedef VkFormat (*PFN_vkd3d_get_vk_format)(DXGI_FORMAT format); + +/* 1.2 */ +typedef HRESULT (*PFN_vkd3d_serialize_versioned_root_signature)(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob); +typedef HRESULT (*PFN_vkd3d_create_versioned_root_signature_deserializer)(const void *data, SIZE_T data_size, + REFIID iid, void **deserializer); #ifdef __cplusplus } diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index e6cccd84cc67..fcf5db8efc03 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -29,6 +29,7 @@ extern "C" { enum vkd3d_shader_structure_type { + /* 1.2 */ VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO, VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS, VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO, diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index 6c926e4e1643..8a5689a80c3d 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -28,6 +28,7 @@ extern "C" { #define VKD3D_WAIT_FAILED (~0u) #define VKD3D_INFINITE (~0u) +/* 1.0 */ HANDLE vkd3d_create_event(void); HRESULT vkd3d_signal_event(HANDLE event); unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds); -- 2.21.0

2 1

[PATCH v3 vkd3d 4/8] vkd3d: Try to guess application name.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 3: Free memory returned by realpath(). --- libs/vkd3d/device.c | 7 ++++++ libs/vkd3d/utils.c | 44 ++++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 2 ++ 3 files changed, 53 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 1b651f144233..c93e6785ed01 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -466,6 +466,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, bool *user_extension_supported = NULL; VkApplicationInfo application_info; VkInstanceCreateInfo instance_info; + char application_name[PATH_MAX]; uint32_t extension_count; const char **extensions; VkInstance vk_instance; @@ -529,6 +530,12 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, application_info.engineVersion = vkd3d_application_info->engine_version; } } + else if (vkd3d_get_program_name(application_name)) + { + application_info.pApplicationName = application_name; + } + + TRACE("Application: %s.\n", debugstr_a(application_info.pApplicationName)); if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) { diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 4483a8d456f7..245f297587ae 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -602,6 +602,50 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, return S_OK; } +#ifdef _GNU_SOURCE + +bool vkd3d_get_program_name(char program_name[PATH_MAX]) +{ + char *name, *p, *real_path = NULL; + + if ((name = strrchr(program_invocation_name, '/'))) + { + real_path = realpath("/proc/self/exe", NULL); + + /* Try to strip command line arguments. */ + if (real_path && (p = strrchr(real_path, '/')) + && !strncmp(real_path, program_invocation_name, strlen(real_path))) + { + name = p; + } + + ++name; + } + else if ((name = strrchr(program_invocation_name, '\\'))) + { + ++name; + } + else + { + name = program_invocation_name; + } + + strncpy(program_name, name, PATH_MAX); + program_name[PATH_MAX - 1] = '\0'; + free(real_path); + return true; +} + +#else + +bool vkd3d_get_program_name(char program_name[PATH_MAX]) +{ + *program_name = '\0'; + return false; +} + +#endif /* _GNU_SOURCE */ + static struct vkd3d_private_data *vkd3d_private_store_get_private_data( const struct vkd3d_private_store *store, const GUID *tag) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 3af8a9594a5e..e22549d5055d 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1200,6 +1200,8 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, extern const char vkd3d_build[]; +bool vkd3d_get_program_name(char program_name[PATH_MAX]) DECLSPEC_HIDDEN; + static inline void vkd3d_set_thread_name(const char *name) { #if defined(HAVE_PTHREAD_SETNAME_NP_2) -- 2.21.0

2 1

[PATCH vkd3d 2/8] tests: Add test for SV_PrimitiveID in hull shader.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 323 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 323 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 81fb26ad7d60..2146e905e6f2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -27062,6 +27062,328 @@ done: destroy_test_context(&context); } +static void test_tessellation_primitive_id(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + D3D12_ROOT_PARAMETER root_parameters[1]; + ID3D12GraphicsCommandList *command_list; + D3D12_INPUT_LAYOUT_DESC input_layout; + struct test_context_desc desc; + D3D12_VERTEX_BUFFER_VIEW vbv; + struct test_context context; + ID3D12Resource *raw_buffer; + ID3D12CommandQueue *queue; + ID3D12Resource *vb; + HRESULT hr; + +#if 0 + ByteAddressBuffer b; + + struct data + { + float4 position : POSITION; + float ref_buffer_data : REF_BUFFER_DATA; + }; + + struct ds_data + { + float4 position : POSITION; + float ref_buffer_data : REF_BUFFER_DATA; + uint primitive_id : PRIM_ID; + uint invocation_id : CP_ID; + }; + + struct ps_data + { + float4 position : SV_POSITION; + float4 color : COLOR; + }; + + struct patch_constant_data + { + float edges[3] : SV_TessFactor; + float inside : SV_InsideTessFactor; + float buffer_data : BUFFER_DATA; + uint primitive_id : PATCH_PRIM_ID; + }; + + data vs_main(in data input) + { + return input; + } + + void patch_constant(uint prim_id : SV_PrimitiveID, out patch_constant_data output) + { + output.edges[0] = output.edges[1] = output.edges[2] = 4.0f; + output.inside = 4.0f; + output.buffer_data = b.Load(4 * prim_id); + output.primitive_id = prim_id; + } + + [domain("tri")] + [outputcontrolpoints(3)] + [partitioning("integer")] + [outputtopology("triangle_cw")] + [patchconstantfunc("patch_constant")] + ds_data hs_main(const InputPatch<data, 3> input, + uint prim_id : SV_PrimitiveID, uint i : SV_OutputControlPointID) + { + ds_data output; + output.position = input[i].position; + output.ref_buffer_data = input[i].ref_buffer_data; + output.primitive_id = prim_id; + output.invocation_id = i; + return output; + } + + [domain("tri")] + void ds_main(patch_constant_data input, + float3 tess_coord : SV_DomainLocation, + const OutputPatch<ds_data, 3> patch, + out ps_data output) + { + uint i; + + output.position = tess_coord.x * patch[0].position + + tess_coord.y * patch[1].position + + tess_coord.z * patch[2].position; + + for (i = 0; i < 3; ++i) + { + if (patch[i].ref_buffer_data != input.buffer_data) + { + output.color = float4(1, patch[i].ref_buffer_data / 255.0f, input.buffer_data / 255.0f, 0); + return; + } + } + + for (i = 0; i < 3; ++i) + { + if (patch[i].primitive_id != input.primitive_id) + { + output.color = float4(1, 0, 1, 1); + return; + } + } + + if (patch[0].invocation_id != 0 || patch[1].invocation_id != 1 || patch[2].invocation_id != 2) + { + output.color = float4(1, 1, 0, 1); + return; + } + + output.color = float4(0, 1, 0, 1); + } +#endif + static const DWORD vs_code[] = + { + 0x43425844, 0x1cf34a89, 0x09f0ca02, 0x1d9d7e25, 0x4161cddd, 0x00000001, 0x00000154, 0x00000003, + 0x0000002c, 0x00000088, 0x000000e4, 0x4e475349, 0x00000054, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000041, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000101, 0x49534f50, 0x4e4f4954, 0x46455200, 0x4655425f, 0x5f524546, + 0x41544144, 0xababab00, 0x4e47534f, 0x00000054, 0x00000002, 0x00000008, 0x00000038, 0x00000000, + 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x00000041, 0x00000000, 0x00000000, 0x00000003, + 0x00000001, 0x00000e01, 0x49534f50, 0x4e4f4954, 0x46455200, 0x4655425f, 0x5f524546, 0x41544144, + 0xababab00, 0x58454853, 0x00000068, 0x00010050, 0x0000001a, 0x0100086a, 0x0300005f, 0x001010f2, + 0x00000000, 0x0300005f, 0x00101012, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x03000065, + 0x00102012, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036, + 0x00102012, 0x00000001, 0x0010100a, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const DWORD hs_code[] = + { + 0x43425844, 0x23a919a7, 0xf5fdd1b4, 0x4f5a835f, 0xca389c71, 0x00000001, 0x00000464, 0x00000004, + 0x00000030, 0x0000008c, 0x00000124, 0x00000200, 0x4e475349, 0x00000054, 0x00000002, 0x00000008, + 0x00000038, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000041, 0x00000000, + 0x00000000, 0x00000003, 0x00000001, 0x00000101, 0x49534f50, 0x4e4f4954, 0x46455200, 0x4655425f, + 0x5f524546, 0x41544144, 0xababab00, 0x4e47534f, 0x00000090, 0x00000004, 0x00000008, 0x00000068, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x00000071, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000e01, 0x00000081, 0x00000000, 0x00000000, 0x00000001, 0x00000002, + 0x00000e01, 0x00000089, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000d02, 0x49534f50, + 0x4e4f4954, 0x46455200, 0x4655425f, 0x5f524546, 0x41544144, 0x49525000, 0x44495f4d, 0x5f504300, + 0xab004449, 0x47534350, 0x000000d4, 0x00000006, 0x00000008, 0x00000098, 0x00000000, 0x0000000d, + 0x00000003, 0x00000000, 0x00000e01, 0x000000a6, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x00000d02, 0x00000098, 0x00000001, 0x0000000d, 0x00000003, 0x00000001, 0x00000e01, 0x000000b2, + 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000d02, 0x00000098, 0x00000002, 0x0000000d, + 0x00000003, 0x00000002, 0x00000e01, 0x000000c0, 0x00000000, 0x0000000e, 0x00000003, 0x00000003, + 0x00000e01, 0x545f5653, 0x46737365, 0x6f746361, 0x55420072, 0x52454646, 0x5441445f, 0x41500041, + 0x5f484354, 0x4d495250, 0x0044495f, 0x495f5653, 0x6469736e, 0x73655465, 0x63614673, 0x00726f74, + 0x58454853, 0x0000025c, 0x00030050, 0x00000097, 0x01000071, 0x01001893, 0x01001894, 0x01001095, + 0x01000896, 0x01001897, 0x0100086a, 0x030000a1, 0x00107000, 0x00000000, 0x01000072, 0x0200005f, + 0x00016000, 0x0200005f, 0x0000b000, 0x0400005f, 0x002010f2, 0x00000003, 0x00000000, 0x0400005f, + 0x00201012, 0x00000003, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x00102012, + 0x00000001, 0x03000065, 0x00102012, 0x00000002, 0x03000065, 0x00102022, 0x00000002, 0x02000068, + 0x00000001, 0x04000036, 0x00100012, 0x00000000, 0x00016001, 0x07000036, 0x001020f2, 0x00000000, + 0x00a01e46, 0x0010000a, 0x00000000, 0x00000000, 0x07000036, 0x00102012, 0x00000001, 0x00a0100a, + 0x0010000a, 0x00000000, 0x00000001, 0x04000036, 0x00102012, 0x00000002, 0x0000b001, 0x04000036, + 0x00102022, 0x00000002, 0x00016001, 0x0100003e, 0x01000073, 0x02000099, 0x00000003, 0x0200005f, + 0x00017000, 0x04000067, 0x00102012, 0x00000000, 0x00000011, 0x04000067, 0x00102012, 0x00000001, + 0x00000012, 0x04000067, 0x00102012, 0x00000002, 0x00000013, 0x02000068, 0x00000001, 0x0400005b, + 0x00102012, 0x00000000, 0x00000003, 0x04000036, 0x00100012, 0x00000000, 0x0001700a, 0x06000036, + 0x00902012, 0x0010000a, 0x00000000, 0x00004001, 0x40800000, 0x0100003e, 0x01000073, 0x04000067, + 0x00102012, 0x00000003, 0x00000014, 0x05000036, 0x00102012, 0x00000003, 0x00004001, 0x40800000, + 0x0100003e, 0x01000073, 0x0200005f, 0x0000b000, 0x03000065, 0x00102022, 0x00000000, 0x02000068, + 0x00000001, 0x06000029, 0x00100012, 0x00000000, 0x0000b001, 0x00004001, 0x00000002, 0x890000a5, + 0x800002c2, 0x00199983, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x00107006, 0x00000000, + 0x05000056, 0x00102022, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e, 0x01000073, 0x0200005f, + 0x0000b000, 0x03000065, 0x00102022, 0x00000001, 0x04000036, 0x00102022, 0x00000001, 0x0000b001, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)}; + static const DWORD ds_code[] = + { + 0x43425844, 0x4b659bb4, 0x3eb61f16, 0xaa8397b6, 0xd60e8c43, 0x00000001, 0x000005ec, 0x00000004, + 0x00000030, 0x000000c8, 0x000001a4, 0x000001f8, 0x4e475349, 0x00000090, 0x00000004, 0x00000008, + 0x00000068, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000071, 0x00000000, + 0x00000000, 0x00000003, 0x00000001, 0x00000101, 0x00000081, 0x00000000, 0x00000000, 0x00000001, + 0x00000002, 0x00000101, 0x00000089, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000202, + 0x49534f50, 0x4e4f4954, 0x46455200, 0x4655425f, 0x5f524546, 0x41544144, 0x49525000, 0x44495f4d, + 0x5f504300, 0xab004449, 0x47534350, 0x000000d4, 0x00000006, 0x00000008, 0x00000098, 0x00000000, + 0x0000000d, 0x00000003, 0x00000000, 0x00000001, 0x000000a6, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x00000202, 0x00000098, 0x00000001, 0x0000000d, 0x00000003, 0x00000001, 0x00000001, + 0x000000b2, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000202, 0x00000098, 0x00000002, + 0x0000000d, 0x00000003, 0x00000002, 0x00000001, 0x000000c0, 0x00000000, 0x0000000e, 0x00000003, + 0x00000003, 0x00000001, 0x545f5653, 0x46737365, 0x6f746361, 0x55420072, 0x52454646, 0x5441445f, + 0x41500041, 0x5f484354, 0x4d495250, 0x0044495f, 0x495f5653, 0x6469736e, 0x73655465, 0x63614673, + 0x00726f74, 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, + 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x58454853, 0x000003ec, + 0x00040050, 0x000000fb, 0x01001893, 0x01001095, 0x0100086a, 0x0300005f, 0x0011b022, 0x00000000, + 0x0300005f, 0x0011b022, 0x00000001, 0x0200005f, 0x0001c072, 0x0400005f, 0x002190f2, 0x00000003, + 0x00000000, 0x0400005f, 0x00219012, 0x00000003, 0x00000001, 0x0400005f, 0x00219012, 0x00000003, + 0x00000002, 0x0400005f, 0x00219022, 0x00000003, 0x00000002, 0x04000067, 0x001020f2, 0x00000000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x02000068, 0x00000002, 0x07000038, 0x001000f2, + 0x00000000, 0x0001c556, 0x00219e46, 0x00000001, 0x00000000, 0x09000032, 0x001000f2, 0x00000000, + 0x0001c006, 0x00219e46, 0x00000000, 0x00000000, 0x00100e46, 0x00000000, 0x09000032, 0x001000f2, + 0x00000000, 0x0001caa6, 0x00219e46, 0x00000002, 0x00000000, 0x00100e46, 0x00000000, 0x05000036, + 0x00100012, 0x00000001, 0x00004001, 0x00000000, 0x01000030, 0x07000050, 0x00100022, 0x00000001, + 0x0010000a, 0x00000001, 0x00004001, 0x00000003, 0x03040003, 0x0010001a, 0x00000001, 0x09000039, + 0x00100022, 0x00000001, 0x0011b01a, 0x00000000, 0x00a1900a, 0x0010000a, 0x00000001, 0x00000001, + 0x0304001f, 0x0010001a, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, + 0x08000036, 0x00102092, 0x00000001, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, + 0x09000038, 0x00102022, 0x00000001, 0x00004001, 0x3b808081, 0x00a1900a, 0x0010000a, 0x00000001, + 0x00000001, 0x07000038, 0x00102042, 0x00000001, 0x0011b01a, 0x00000000, 0x00004001, 0x3b808081, + 0x0100003e, 0x01000015, 0x0700001e, 0x00100012, 0x00000001, 0x0010000a, 0x00000001, 0x00004001, + 0x00000001, 0x01000016, 0x05000036, 0x00100012, 0x00000001, 0x00004001, 0x00000000, 0x01000030, + 0x07000050, 0x00100022, 0x00000001, 0x0010000a, 0x00000001, 0x00004001, 0x00000003, 0x03040003, + 0x0010001a, 0x00000001, 0x09000027, 0x00100022, 0x00000001, 0x0011b01a, 0x00000001, 0x00a1900a, + 0x0010000a, 0x00000001, 0x00000002, 0x0304001f, 0x0010001a, 0x00000001, 0x05000036, 0x001020f2, + 0x00000000, 0x00100e46, 0x00000000, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x3f800000, + 0x00000000, 0x3f800000, 0x3f800000, 0x0100003e, 0x01000015, 0x0700001e, 0x00100012, 0x00000001, + 0x0010000a, 0x00000001, 0x00004001, 0x00000001, 0x01000016, 0x08000027, 0x00100012, 0x00000001, + 0x00004001, 0x00000000, 0x0021901a, 0x00000000, 0x00000002, 0x08000027, 0x00100022, 0x00000001, + 0x00004001, 0x00000001, 0x0021901a, 0x00000001, 0x00000002, 0x0700003c, 0x00100012, 0x00000001, + 0x0010001a, 0x00000001, 0x0010000a, 0x00000001, 0x08000027, 0x00100022, 0x00000001, 0x00004001, + 0x00000002, 0x0021901a, 0x00000002, 0x00000002, 0x0700003c, 0x00100012, 0x00000001, 0x0010001a, + 0x00000001, 0x0010000a, 0x00000001, 0x0304001f, 0x0010000a, 0x00000001, 0x05000036, 0x001020f2, + 0x00000000, 0x00100e46, 0x00000000, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x3f800000, + 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000015, 0x05000036, 0x001020f2, 0x00000000, + 0x00100e46, 0x00000000, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x00000000, 0x3f800000, + 0x00000000, 0x3f800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)}; + static const DWORD ps_code[] = + { +#if 0 + float4 main(in float4 p : SV_Position, in float4 color : COLOR) : SV_Target + { + return color; + } +#endif + 0x43425844, 0xbd83f517, 0x8974e87a, 0xaf402223, 0xaec7f351, 0x00000001, 0x000000f8, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000003c, 0x00000050, + 0x0000000f, 0x0100086a, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"REF_BUFFER_DATA", 0, DXGI_FORMAT_R32_FLOAT, 0, 16, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const struct + { + struct vec4 position; + float ref_buffer_data; + } + vertices[] = + { + {{-1.0f, -1.0f, 0.0f, 1.0f}, 1.0f}, + {{-1.0f, 1.0f, 0.0f, 1.0f}, 1.0f}, + {{ 1.0f, -1.0f, 0.0f, 1.0f}, 1.0f}, + + {{-1.0f, 1.0f, 0.0f, 1.0f}, 2.0f}, + {{ 1.0f, 1.0f, 0.0f, 1.0f}, 2.0f}, + {{ 1.0f, -1.0f, 0.0f, 1.0f}, 2.0f}, + }; + static const uint32_t buffer_data[] = {1, 2}; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_SRV; + root_parameters[0].Descriptor.ShaderRegister = 0; + root_parameters[0].Descriptor.RegisterSpace = 0; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_HULL; + memset(&root_signature_desc, 0, sizeof(root_signature_desc)); + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.pParameters = root_parameters; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT; + hr = create_root_signature(context.device, &root_signature_desc, &context.root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, NULL, NULL, &input_layout); + pso_desc.VS = vs; + pso_desc.HS = hs; + pso_desc.DS = ds; + pso_desc.PS = ps; + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr); + + vb = create_upload_buffer(context.device, sizeof(vertices), vertices); + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv.StrideInBytes = sizeof(*vertices); + vbv.SizeInBytes = sizeof(vertices); + + raw_buffer = create_upload_buffer(context.device, sizeof(buffer_data), buffer_data); + + 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_3_CONTROL_POINT_PATCHLIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_SetGraphicsRootShaderResourceView(command_list, + 0, ID3D12Resource_GetGPUVirtualAddress(raw_buffer)); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 6, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + ID3D12Resource_Release(vb); + ID3D12Resource_Release(raw_buffer); + destroy_test_context(&context); +} + static void test_render_a8(void) { static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; @@ -30608,6 +30930,7 @@ START_TEST(d3d12) run_test(test_hull_shader_control_point_phase); run_test(test_hull_shader_fork_phase); run_test(test_line_tessellation); + run_test(test_tessellation_primitive_id); run_test(test_render_a8); run_test(test_cpu_descriptors_lifetime); run_test(test_clip_distance); -- 2.21.0

2 1

[PATCH vkd3d 3/8] vkd3d-shader: Fix component decoration for shader IO variables.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> This fixes a regression introduced by commit 91820630cb49ef645ca6251f63ce2ff63e0c568d. We need to take into account the combined write mask returned from needs_private_io_variable(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 8 +++++ tests/d3d12.c | 65 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 69 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 25e3f8ea6f52..73d266195f5d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3944,6 +3944,10 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi component_count = VKD3D_VEC4_SIZE; write_mask = VKD3DSP_WRITEMASK_ALL; } + else + { + component_idx = vkd3d_write_mask_get_component_idx(write_mask); + } storage_class = SpvStorageClassInput; @@ -4300,6 +4304,10 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler use_private_variable = true; write_mask = VKD3DSP_WRITEMASK_ALL; } + else + { + component_idx = vkd3d_write_mask_get_component_idx(write_mask); + } vkd3d_symbol_make_register(&reg_symbol, reg); diff --git a/tests/d3d12.c b/tests/d3d12.c index 2146e905e6f2..3dc55fe5a7fc 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -10039,6 +10039,62 @@ static void test_shader_input_output_components(void) 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps4 = {ps4_code, sizeof(ps4_code)}; +#if 0 + struct ps_data + { + float4 position : SV_Position; + float4 color : COLOR; + float3 color1 : COLOR1; + float color2 : COLOR2; + }; + + ps_data vs_main(float4 position : POSITION) + { + ps_data o; + o.position = position; + o.color = float4(0, 1, 0, 1); + o.color1 = (float3)0.5; + o.color2 = 0.25; + return o; + } + + float4 ps_main(ps_data i) : SV_Target + { + return float4(i.color.rgb, i.color2); + } +#endif + static const DWORD vs5_code[] = + { + 0x43425844, 0xc3e1b9fc, 0xb99e43ef, 0x9a2a6dfc, 0xad719e68, 0x00000001, 0x00000190, 0x00000003, + 0x0000002c, 0x00000060, 0x000000e4, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000007c, 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000074, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x00000074, 0x00000001, 0x00000000, 0x00000003, 0x00000002, 0x00000807, 0x00000074, 0x00000002, + 0x00000000, 0x00000003, 0x00000002, 0x00000708, 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, + 0xabab0052, 0x58454853, 0x000000a4, 0x00010050, 0x00000029, 0x0100086a, 0x0300005f, 0x001010f2, + 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, + 0x03000065, 0x00102072, 0x00000002, 0x03000065, 0x00102082, 0x00000002, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f800000, 0x08000036, 0x001020f2, 0x00000002, 0x00004002, 0x3f000000, + 0x3f000000, 0x3f000000, 0x3e800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs5 = {vs5_code, sizeof(vs5_code)}; + static const DWORD ps5_code[] = + { + 0x43425844, 0x285bf397, 0xbc07e078, 0xc4e528e3, 0x74efea4d, 0x00000001, 0x00000148, 0x00000003, + 0x0000002c, 0x000000b0, 0x000000e4, 0x4e475349, 0x0000007c, 0x00000004, 0x00000008, 0x00000068, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000074, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x0000070f, 0x00000074, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000007, 0x00000074, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x00000808, 0x505f5653, + 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, + 0xabab0074, 0x58454853, 0x0000005c, 0x00000050, 0x00000017, 0x0100086a, 0x03001062, 0x00101072, + 0x00000001, 0x03001062, 0x00101082, 0x00000002, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x00102072, 0x00000000, 0x00101246, 0x00000001, 0x05000036, 0x00102082, 0x00000000, 0x0010103a, + 0x00000002, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps5 = {ps5_code, sizeof(ps5_code)}; static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = { {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, @@ -10071,10 +10127,11 @@ static void test_shader_input_output_components(void) } tests[] = { - {&vs1, &ps1, {1.0f, 2.0f, 3.0f, 0.0f}, {0xdeadbeef, 0, 2, 3}}, - {&vs2, &ps2, {6.0f, 4.0f, 7.0f, 8.0f}, { 9, 5, 0, 1}}, - {&vs2, &ps3, {3.0f, 8.0f, 7.0f, 7.0f}, { 9, 0, 0, 1}}, - {&vs2, &ps4, {0.0f, 1.0f, 0.0f, 1.0f}, { 0, 1, 0, 0}}, + {&vs1, &ps1, {1.0f, 2.0f, 3.0f, 0.00f}, {0xdeadbeef, 0, 2, 3}}, + {&vs2, &ps2, {6.0f, 4.0f, 7.0f, 8.00f}, { 9, 5, 0, 1}}, + {&vs2, &ps3, {3.0f, 8.0f, 7.0f, 7.00f}, { 9, 0, 0, 1}}, + {&vs2, &ps4, {0.0f, 1.0f, 0.0f, 1.00f}, { 0, 1, 0, 0}}, + {&vs5, &ps5, {0.0f, 1.0f, 0.0f, 0.25f}, { 0, 1, 0, 0}}, }; memset(&desc, 0, sizeof(desc)); -- 2.21.0

2 1

[PATCH vkd3d 1/8] vkd3d: Validate resource pointer for transition barriers.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 28 ++++++++++++++++++++++------ libs/vkd3d/device.c | 2 +- tests/d3d12_invalid_usage.c | 12 ++++++++++-- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 75556f5335e3..b145413efdc3 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1140,6 +1140,18 @@ HRESULT d3d12_fence_create(struct d3d12_device *device, } /* Command buffers */ +static void d3d12_command_list_mark_as_invalid(struct d3d12_command_list *list, + const char *message, ...) +{ + va_list args; + + va_start(args, message); + WARN("Command list %p is invalid: \"%s\".\n", list, vkd3d_dbg_vsprintf(message, args)); + va_end(args); + + list->is_valid = false; +} + static HRESULT d3d12_command_list_begin_command_buffer(struct d3d12_command_list *list) { struct d3d12_device *device = list->device; @@ -3729,19 +3741,23 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC if (!is_valid_resource_state(transition->StateBefore)) { - WARN("Invalid StateBefore %#x (barrier %u).\n", transition->StateBefore, i); - list->is_valid = false; + d3d12_command_list_mark_as_invalid(list, + "Invalid StateBefore %#x (barrier %u).", transition->StateBefore, i); continue; } if (!is_valid_resource_state(transition->StateAfter)) { - WARN("Invalid StateAfter %#x (barrier %u).\n", transition->StateAfter, i); - list->is_valid = false; + d3d12_command_list_mark_as_invalid(list, + "Invalid StateAfter %#x (barrier %u).", transition->StateAfter, i); + continue; + } + + if (!(resource = unsafe_impl_from_ID3D12Resource(transition->pResource))) + { + d3d12_command_list_mark_as_invalid(list, "A resource pointer is NULL."); continue; } - resource = unsafe_impl_from_ID3D12Resource(transition->pResource); - assert(resource); sub_resource_idx = transition->Subresource; if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateBefore, diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index fa10bb8e096b..1b651f144233 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3189,7 +3189,7 @@ void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, va_list args; va_start(args, message); - WARN("Device %p is lost (reason %#x, message \"%s\").\n", + WARN("Device %p is lost (reason %#x, \"%s\").\n", device, reason, vkd3d_dbg_vsprintf(message, args)); va_end(args); diff --git a/tests/d3d12_invalid_usage.c b/tests/d3d12_invalid_usage.c index ab5deb5b1e11..feb45b456612 100644 --- a/tests/d3d12_invalid_usage.c +++ b/tests/d3d12_invalid_usage.c @@ -32,7 +32,7 @@ static void recreate_command_list_(unsigned int line, ID3D12Device *device, ok_(line)(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); } -static void test_invalid_texture_resource_barriers(void) +static void test_invalid_resource_barriers(void) { ID3D12Resource *texture, *readback_buffer, *upload_buffer; ID3D12CommandAllocator *command_allocator; @@ -127,6 +127,14 @@ static void test_invalid_texture_resource_barriers(void) hr = ID3D12GraphicsCommandList_Close(command_list); todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + recreate_command_list(device, command_allocator, &command_list); + + /* NULL resource. */ + transition_resource_state(command_list, NULL, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ID3D12CommandAllocator_Release(command_allocator); ID3D12CommandQueue_Release(queue); ID3D12GraphicsCommandList_Release(command_list); @@ -284,6 +292,6 @@ START_TEST(d3d12_invalid_usage) enable_d3d12_debug_layer(argc, argv); init_adapter_info(); - run_test(test_invalid_texture_resource_barriers); + run_test(test_invalid_resource_barriers); run_test(test_invalid_copy_texture_region); } -- 2.21.0

2 1

[PATCH v2 1/8] kernel32/tests: Fix NtMapViewOfSection tests results for w1064v1809
by Rémi Bernon 18 Jun '19

18 Jun '19

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 0b718606d0e..47e61566c9c 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1265,8 +1265,8 @@ static void test_NtMapViewOfSection(void) size = 0; offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 12, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - todo_wine - ok( status == STATUS_NO_MEMORY, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, + "NtMapViewOfSection returned %x\n", status ); if (status == STATUS_SUCCESS) { status = pNtUnmapViewOfSection( hProcess, ptr2 ); @@ -1288,7 +1288,8 @@ static void test_NtMapViewOfSection(void) ptr2 = NULL; size = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 22, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %x\n", status ); if (status == STATUS_SUCCESS) { status = pNtUnmapViewOfSection( hProcess, ptr2 ); @@ -1328,25 +1329,30 @@ static void test_NtMapViewOfSection(void) size = 0; offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 12, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER || + broken(STATUS_MAPPED_ALIGNMENT) /* w1064v1809 inconsistently returns STATUS_MAPPED_ALIGNMENT or STATUS_INVALID_PARAMETER */, + "NtMapViewOfSection returned %x\n", status ); ptr2 = (char *)ptr + 0x1000; size = 0; offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %x\n", status ); ptr2 = (char *)ptr + 0x1001; size = 0; offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %x\n", status ); ptr2 = (char *)ptr + 0x1000; size = 0; offset.QuadPart = 1; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %x\n", status ); if (sizeof(void *) == sizeof(int) && (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 ) || !is_wow64)) @@ -1409,7 +1415,8 @@ static void test_NtMapViewOfSection(void) status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, &size, 1, AT_ROUND_TO_PAGE, PAGE_READWRITE ); todo_wine - ok( status == STATUS_INVALID_PARAMETER_9, "NtMapViewOfSection returned %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER_9 || status == STATUS_INVALID_PARAMETER, + "NtMapViewOfSection returned %x\n", status ); } status = pNtUnmapViewOfSection( hProcess, ptr ); -- 2.20.1

3 19

[PATCH 3/4] mshtml: Add IHTMLBlockElement interface stub.
by Dmitry Timoshkov 18 Jun '19

18 Jun '19

While IHTMLDOMNode_QueryInterface(node, &IID_IHTMLBlockElement) works fine in my local VM with fully updated Windows XP and IE8 it fails under many of testbot VMs, and even adding is_ie9plus check doesn't help. So, instead of checking is_ie9plus I've added a broken() statement. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mshtml/htmlnode.c | 82 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/main.c | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 9 ++++ include/mshtmdid.h | 3 ++ include/mshtml.idl | 18 ++++++++ 6 files changed, 114 insertions(+) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index faffb6bd02..59d3be0ffb 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1390,6 +1390,85 @@ static const IHTMLDOMNode3Vtbl HTMLDOMNode3Vtbl = { HTMLDOMNode3_isSupported }; +static inline HTMLDOMNode *impl_from_IHTMLBlockElement(IHTMLBlockElement *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMNode, IHTMLBlockElement_iface); +} + +static HRESULT WINAPI HTMLBlockElement_QueryInterface(IHTMLBlockElement *iface, REFIID riid, void **ppv) +{ + HTMLDOMNode *This = impl_from_IHTMLBlockElement(iface); + return IHTMLDOMNode_QueryInterface(&This->IHTMLDOMNode_iface, riid, ppv); +} + +static ULONG WINAPI HTMLBlockElement_AddRef(IHTMLBlockElement *iface) +{ + HTMLDOMNode *This = impl_from_IHTMLBlockElement(iface); + return IHTMLDOMNode_AddRef(&This->IHTMLDOMNode_iface); +} + +static ULONG WINAPI HTMLBlockElement_Release(IHTMLBlockElement *iface) +{ + HTMLDOMNode *This = impl_from_IHTMLBlockElement(iface); + return IHTMLDOMNode_Release(&This->IHTMLDOMNode_iface); +} + +static HRESULT WINAPI HTMLBlockElement_GetTypeInfoCount(IHTMLBlockElement *iface, UINT *pctinfo) +{ + HTMLDOMNode *This = impl_from_IHTMLBlockElement(iface); + return IDispatchEx_GetTypeInfoCount(&This->event_target.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLBlockElement_GetTypeInfo(IHTMLBlockElement *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDOMNode *This = impl_from_IHTMLBlockElement(iface); + return IDispatchEx_GetTypeInfo(&This->event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLBlockElement_GetIDsOfNames(IHTMLBlockElement *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLDOMNode *This = impl_from_IHTMLBlockElement(iface); + return IDispatchEx_GetIDsOfNames(&This->event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLBlockElement_Invoke(IHTMLBlockElement *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDOMNode *This = impl_from_IHTMLBlockElement(iface); + return IDispatchEx_Invoke(&This->event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLBlockElement_put_clear(IHTMLBlockElement *iface, BSTR v) +{ + HTMLDOMNode *This = impl_from_IHTMLBlockElement(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLBlockElement_get_clear(IHTMLBlockElement *iface, BSTR *p) +{ + HTMLDOMNode *This = impl_from_IHTMLBlockElement(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLBlockElementVtbl HTMLBlockElementVtbl = { + HTMLBlockElement_QueryInterface, + HTMLBlockElement_AddRef, + HTMLBlockElement_Release, + HTMLBlockElement_GetTypeInfoCount, + HTMLBlockElement_GetTypeInfo, + HTMLBlockElement_GetIDsOfNames, + HTMLBlockElement_Invoke, + HTMLBlockElement_put_clear, + HTMLBlockElement_get_clear +}; + HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) { TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); @@ -1404,6 +1483,8 @@ HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) *ppv = &This->IHTMLDOMNode2_iface; }else if(IsEqualGUID(&IID_IHTMLDOMNode3, riid)) { *ppv = &This->IHTMLDOMNode3_iface; + }else if(IsEqualGUID(&IID_IHTMLBlockElement, riid)) { + *ppv = &This->IHTMLBlockElement_iface; }else if(IsEqualGUID(&IID_nsXPCOMCycleCollectionParticipant, riid)) { *ppv = &node_ccp; return S_OK; @@ -1457,6 +1538,7 @@ void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsno node->IHTMLDOMNode_iface.lpVtbl = &HTMLDOMNodeVtbl; node->IHTMLDOMNode2_iface.lpVtbl = &HTMLDOMNode2Vtbl; node->IHTMLDOMNode3_iface.lpVtbl = &HTMLDOMNode3Vtbl; + node->IHTMLBlockElement_iface.lpVtbl = &HTMLBlockElementVtbl; ccref_init(&node->ccref, 1); EventTarget_Init(&node->event_target, (IUnknown*)&node->IHTMLDOMNode_iface, dispex_data, doc->document_mode); diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 29396a5475..8ce7f8680c 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -710,6 +710,7 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IEnumConnections); X(IID_IEnumVARIANT); X(IID_IHlinkTarget); + X(IID_IHTMLBlockElement); X(IID_IHTMLDocument6); X(IID_IHTMLDocument7); X(IID_IHTMLEditServices); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a36da94e43..6c25cc828c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -776,6 +776,7 @@ struct HTMLDOMNode { IHTMLDOMNode IHTMLDOMNode_iface; IHTMLDOMNode2 IHTMLDOMNode2_iface; IHTMLDOMNode3 IHTMLDOMNode3_iface; + IHTMLBlockElement IHTMLBlockElement_iface; const NodeImplVtbl *vtbl; nsCycleCollectingAutoRefCnt ccref; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 01c6191a6e..320be5b43a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -8521,6 +8521,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElementCollection *col; IHTMLDOMChildrenCollection *child_col; IHTMLElement *elem, *elem2, *elem3; + IHTMLBlockElement *block_elem; IHTMLDOMNode *node, *node2; IHTMLWindow2 *window; IDispatch *disp; @@ -8650,10 +8651,18 @@ static void test_elems(IHTMLDocument2 *doc) node = test_node_get_parent((IUnknown*)elem); ok(node != NULL, "node == NULL\n"); test_node_name((IUnknown*)node, "BODY"); + hres = IHTMLDOMNode_QueryInterface(node, &IID_IHTMLBlockElement, (void**)&block_elem); + ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IHTMLBlockElement iface: %08x\n", hres); + if (block_elem) + IHTMLBlockElement_Release(block_elem); node2 = test_node_get_parent((IUnknown*)node); IHTMLDOMNode_Release(node); ok(node2 != NULL, "node == NULL\n"); test_node_name((IUnknown*)node2, "HTML"); + hres = IHTMLDOMNode_QueryInterface(node2, &IID_IHTMLBlockElement, (void**)&block_elem); + ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IHTMLBlockElement iface: %08x\n", hres); + if (block_elem) + IHTMLBlockElement_Release(block_elem); node = test_node_get_parent((IUnknown*)node2); IHTMLDOMNode_Release(node2); ok(node != NULL, "node == NULL\n"); diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 82055f690b..a58b3f9247 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -3857,6 +3857,9 @@ /* IHTMLLabelElement2 */ #define DISPID_IHTMLLABELELEMENT2_FORM DISPID_LABEL+2 +/* IHTMLBlockElement */ +#define DISPID_IHTMLBLOCKELEMENT_CLEAR DISPID_A_CLEAR + /* IHTMLTxtRange */ #define DISPID_IHTMLTXTRANGE_HTMLTEXT DISPID_RANGE+3 #define DISPID_IHTMLTXTRANGE_TEXT DISPID_RANGE+4 diff --git a/include/mshtml.idl b/include/mshtml.idl index f7ebd9e71a..e90e0018a8 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -28609,6 +28609,24 @@ interface IHTMLDOMConstructorCollection : IDispatch HRESULT XMLHttpRequest([out, retval] IDispatch **p); } +/***************************************************************************** + * IHTMLBlockElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f208-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLBlockElement : IDispatch +{ + [propput, id(DISPID_IHTMLBLOCKELEMENT_CLEAR), displaybind, bindable] + HRESULT clear([in] BSTR v); + + [propget, id(DISPID_IHTMLBLOCKELEMENT_CLEAR), displaybind, bindable] + HRESULT clear([retval, out] BSTR *p); +}; + /***************************************************************************** * IXMLGenericParse interface */ -- 2.20.1

3 2

[PATCH 4/4] mshtml: Add IHTMLControlRange interface stub.
by Dmitry Timoshkov 18 Jun '19

18 Jun '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mshtml/main.c | 1 + dlls/mshtml/txtrange.c | 196 +++++++++++++++++++++++++++++++++++++++++ include/mshtmdid.h | 17 ++++ include/mshtml.idl | 57 ++++++++++++ 4 files changed, 271 insertions(+) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 8ce7f8680c..b3c6cf80d4 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -711,6 +711,7 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IEnumVARIANT); X(IID_IHlinkTarget); X(IID_IHTMLBlockElement); + X(IID_IHTMLControlRange); X(IID_IHTMLDocument6); X(IID_IHTMLDocument7); X(IID_IHTMLEditServices); diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index c6a6ed096b..ab83009a09 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -39,6 +39,7 @@ static const WCHAR hrW[] = {'h','r',0}; typedef struct { DispatchEx dispex; IHTMLTxtRange IHTMLTxtRange_iface; + IHTMLControlRange IHTMLControlRange_iface; IOleCommandTarget IOleCommandTarget_iface; LONG ref; @@ -69,6 +70,198 @@ typedef enum { RU_TEXTEDIT } range_unit_t; +static inline HTMLTxtRange *impl_from_IHTMLControlRange(IHTMLControlRange *iface) +{ + return CONTAINING_RECORD(iface, HTMLTxtRange, IHTMLControlRange_iface); +} + +static HRESULT WINAPI HTMLControlRange_QueryInterface(IHTMLControlRange *iface, REFIID riid, void **ppv) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + return IHTMLTxtRange_QueryInterface(&This->IHTMLTxtRange_iface, riid, ppv); +} + +static ULONG WINAPI HTMLControlRange_AddRef(IHTMLControlRange *iface) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + return IHTMLTxtRange_AddRef(&This->IHTMLTxtRange_iface); +} + +static ULONG WINAPI HTMLControlRange_Release(IHTMLControlRange *iface) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + return IHTMLTxtRange_Release(&This->IHTMLTxtRange_iface); +} + +static HRESULT WINAPI HTMLControlRange_GetTypeInfoCount(IHTMLControlRange *iface, UINT *pctinfo) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLControlRange_GetTypeInfo(IHTMLControlRange *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLControlRange_GetIDsOfNames(IHTMLControlRange *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLControlRange_Invoke(IHTMLControlRange *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLControlRange_select(IHTMLControlRange *iface) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_add(IHTMLControlRange *iface, IHTMLControlElement *item) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_remove(IHTMLControlRange *iface, LONG index) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_item(IHTMLControlRange *iface, LONG index, IHTMLElement **pdisp) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_scrollIntoView(IHTMLControlRange *iface, VARIANT varargStart) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_queryCommandSupported(IHTMLControlRange *iface, + BSTR cmdID, VARIANT_BOOL *pfRet) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_queryCommandEnabled(IHTMLControlRange *iface, + BSTR cmdID, VARIANT_BOOL *pfRet) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_queryCommandState(IHTMLControlRange *iface, + BSTR cmdID, VARIANT_BOOL *pfRet) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_queryCommandIndeterm(IHTMLControlRange *iface, + BSTR cmdID, VARIANT_BOOL *pfRet) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_queryCommandText(IHTMLControlRange *iface, + BSTR cmdID, BSTR *pcmdText) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_queryCommandValue(IHTMLControlRange *iface, + BSTR cmdID, VARIANT *pcmdValue) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_execCommand(IHTMLControlRange *iface, + BSTR cmdID, VARIANT_BOOL showUI, VARIANT value, VARIANT_BOOL *pfRet) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_execCommandShowHelp(IHTMLControlRange *iface, + BSTR cmdID, VARIANT_BOOL *pfRet) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_commonParentElement(IHTMLControlRange *iface, IHTMLElement **parent) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLControlRange_get_length(IHTMLControlRange *iface, LONG *p) +{ + HTMLTxtRange *This = impl_from_IHTMLControlRange(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static const IHTMLControlRangeVtbl HTMLControlRangeVtbl = { + HTMLControlRange_QueryInterface, + HTMLControlRange_AddRef, + HTMLControlRange_Release, + HTMLControlRange_GetTypeInfoCount, + HTMLControlRange_GetTypeInfo, + HTMLControlRange_GetIDsOfNames, + HTMLControlRange_Invoke, + HTMLControlRange_select, + HTMLControlRange_add, + HTMLControlRange_remove, + HTMLControlRange_item, + HTMLControlRange_scrollIntoView, + HTMLControlRange_queryCommandSupported, + HTMLControlRange_queryCommandEnabled, + HTMLControlRange_queryCommandState, + HTMLControlRange_queryCommandIndeterm, + HTMLControlRange_queryCommandText, + HTMLControlRange_queryCommandValue, + HTMLControlRange_execCommand, + HTMLControlRange_execCommandShowHelp, + HTMLControlRange_commonParentElement, + HTMLControlRange_get_length +}; + static HTMLTxtRange *get_range_object(HTMLDocumentNode *doc, IHTMLTxtRange *iface) { HTMLTxtRange *iter; @@ -831,6 +1024,8 @@ static HRESULT WINAPI HTMLTxtRange_QueryInterface(IHTMLTxtRange *iface, REFIID r *ppv = &This->IHTMLTxtRange_iface; }else if(IsEqualGUID(&IID_IHTMLTxtRange, riid)) { *ppv = &This->IHTMLTxtRange_iface; + }else if(IsEqualGUID(&IID_IHTMLControlRange, riid)) { + *ppv = &This->IHTMLControlRange_iface; }else if(IsEqualGUID(&IID_IOleCommandTarget, riid)) { *ppv = &This->IOleCommandTarget_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { @@ -1744,6 +1939,7 @@ HRESULT HTMLTxtRange_Create(HTMLDocumentNode *doc, nsIDOMRange *nsrange, IHTMLTx init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLTxtRange_iface, &HTMLTxtRange_dispex); ret->IHTMLTxtRange_iface.lpVtbl = &HTMLTxtRangeVtbl; + ret->IHTMLControlRange_iface.lpVtbl = &HTMLControlRangeVtbl; ret->IOleCommandTarget_iface.lpVtbl = &OleCommandTargetVtbl; ret->ref = 1; diff --git a/include/mshtmdid.h b/include/mshtmdid.h index a58b3f9247..8544d4be2a 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -4208,6 +4208,23 @@ #define DISPID_IHTMLTEXTCONTAINER_SCROLLLEFT DISPID_TEXTSITE+5 #define DISPID_IHTMLTEXTCONTAINER_ONSCROLL DISPID_EVPROP_ONSCROLL +/* IHTMLControlRange */ +#define DISPID_IHTMLCONTROLRANGE_SELECT DISPID_RANGE+2 +#define DISPID_IHTMLCONTROLRANGE_ADD DISPID_RANGE+3 +#define DISPID_IHTMLCONTROLRANGE_REMOVE DISPID_RANGE+4 +#define DISPID_IHTMLCONTROLRANGE_ITEM DISPID_VALUE +#define DISPID_IHTMLCONTROLRANGE_SCROLLINTOVIEW DISPID_RANGE+6 +#define DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDSUPPORTED DISPID_RANGE+7 +#define DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDENABLED DISPID_RANGE+8 +#define DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDSTATE DISPID_RANGE+9 +#define DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDINDETERM DISPID_RANGE+10 +#define DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDTEXT DISPID_RANGE+11 +#define DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDVALUE DISPID_RANGE+12 +#define DISPID_IHTMLCONTROLRANGE_EXECCOMMAND DISPID_RANGE+13 +#define DISPID_IHTMLCONTROLRANGE_EXECCOMMANDSHOWHELP DISPID_RANGE+14 +#define DISPID_IHTMLCONTROLRANGE_COMMONPARENTELEMENT DISPID_RANGE+15 +#define DISPID_IHTMLCONTROLRANGE_LENGTH DISPID_RANGE+5 + /* IHTMLTableCaption */ #define DISPID_IHTMLTABLECAPTION_ALIGN STDPROPID_XOBJ_BLOCKALIGN #define DISPID_IHTMLTABLECAPTION_VALIGN DISPID_A_TABLEVALIGN diff --git a/include/mshtml.idl b/include/mshtml.idl index e90e0018a8..a666c628ae 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -16262,6 +16262,63 @@ coclass HTMLUnknownElement /* interface IHTMLUnknownElement; */ } +/***************************************************************************** + * IHTMLControlRange interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f29c-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLControlRange : IDispatch +{ + [id(DISPID_IHTMLCONTROLRANGE_SELECT)] + HRESULT select(); + + [id(DISPID_IHTMLCONTROLRANGE_ADD)] + HRESULT add([in] IHTMLControlElement *item); + + [id(DISPID_IHTMLCONTROLRANGE_REMOVE)] + HRESULT remove([in] long index); + + [id(DISPID_IHTMLCONTROLRANGE_ITEM)] + HRESULT item([in] long index,[retval, out] IHTMLElement **pdisp); + + [id(DISPID_IHTMLCONTROLRANGE_SCROLLINTOVIEW)] + HRESULT scrollIntoView([optional, in] VARIANT varargStart); + + [id(DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDSUPPORTED)] + HRESULT queryCommandSupported([in] BSTR cmdID,[retval, out] VARIANT_BOOL *pfRet); + + [id(DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDENABLED)] + HRESULT queryCommandEnabled([in] BSTR cmdID,[retval, out] VARIANT_BOOL *pfRet); + + [id(DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDSTATE)] + HRESULT queryCommandState([in] BSTR cmdID,[retval, out] VARIANT_BOOL *pfRet); + + [id(DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDINDETERM)] + HRESULT queryCommandIndeterm([in] BSTR cmdID,[retval, out] VARIANT_BOOL *pfRet); + + [id(DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDTEXT)] + HRESULT queryCommandText([in] BSTR cmdID,[retval, out] BSTR* pcmdText); + + [id(DISPID_IHTMLCONTROLRANGE_QUERYCOMMANDVALUE)] + HRESULT queryCommandValue([in] BSTR cmdID,[retval, out] VARIANT *pcmdValue); + + [id(DISPID_IHTMLCONTROLRANGE_EXECCOMMAND)] + HRESULT execCommand([in] BSTR cmdID,[defaultvalue(0), in] VARIANT_BOOL showUI,[optional, in] VARIANT value,[retval, out] VARIANT_BOOL *pfRet); + + [id(DISPID_IHTMLCONTROLRANGE_EXECCOMMANDSHOWHELP)] + HRESULT execCommandShowHelp([in] BSTR cmdID,[retval, out] VARIANT_BOOL *pfRet); + + [id(DISPID_IHTMLCONTROLRANGE_COMMONPARENTELEMENT)] + HRESULT commonParentElement([retval, out] IHTMLElement **parent); + + [propget, id(DISPID_IHTMLCONTROLRANGE_LENGTH)] + HRESULT length([retval, out] long *p); +}; + /***************************************************************************** * ISVGAnimatedEnumeration interface */ -- 2.20.1

3 2

[PATCH 2/4] mshtml: Replace a useless trace with a slightly better one.
by Dmitry Timoshkov 18 Jun '19

18 Jun '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mshtml/dispex.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index f0daafaa49..dab44991bf 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -256,8 +256,10 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, HRESULT hres; hres = ITypeInfo_GetDocumentation(dti, desc->memid, &name, NULL, NULL, NULL); - if(FAILED(hres)) + if(FAILED(hres)) { + WARN("GetDocumentation failed: %08x\n", hres); return; + } for(info = data->funcs; info < data->funcs+data->func_cnt; info++) { if(info->id == desc->memid || !wcscmp(info->name, name)) { @@ -269,6 +271,8 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, } } + TRACE("adding %s...\n", debugstr_w(name)); + if(info == data->funcs+data->func_cnt) { if(data->func_cnt == data->func_size) data->funcs = heap_realloc_zero(data->funcs, (data->func_size <<= 1)*sizeof(func_info_t)); @@ -414,7 +418,6 @@ static HRESULT process_interface(dispex_data_t *data, tid_t tid, ITypeInfo *disp } if(!hook || hook->invoke) { - TRACE("adding...\n"); add_func_info(data, tid, funcdesc, disp_typeinfo ? disp_typeinfo : typeinfo, hook ? hook->invoke : NULL); } -- 2.20.1

3 2

[PATCH 1/4] mshtml: Add recently added GUIDs to debugstr_mshtml_guid().
by Dmitry Timoshkov 18 Jun '19

18 Jun '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mshtml/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 7cb3006812..29396a5475 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -705,6 +705,7 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IDispatch); X(IID_IDispatchEx); X(IID_IDispatchJS); + X(IID_IDisplayServices); X(IID_UndocumentedScriptIface); X(IID_IEnumConnections); X(IID_IEnumVARIANT); @@ -719,6 +720,8 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IInternetProtocol); X(IID_IInternetProtocolRoot); X(IID_IManagedObject); + X(IID_IMarkupContainer); + X(IID_IMarkupServices); X(IID_IMarshal); X(IID_IMonikerProp); X(IID_IObjectIdentity); -- 2.20.1

3 2