- wine-devel - winehq.org

Re: WineConf 2019: call for volunteers
by ulrich.czekalla＠utoronto.ca 14 Mar '19

14 Mar '19

I?d like to volunteer to host WineConf 2019 in Toronto, Canada. Toronto is the largest city in Canada and sits on the coast of Lake Ontario (14th largest lake in the world). We have plenty of bars and yes, lots of good beer. :-) What else do you need? I?ve looked into venues and the most economical room rates are the weekend of Oct 12-13. That?s around $189 CAD + Tax. For about 20% more we can hold it in mid or late August. While the weather in August is much nicer, October should still be pleasant. (~10-15 C) Thanks, -Ulrich On 2019-02-27, 8:18 AM, "wine-devel on behalf of Alexandre Julliard" <wine-devel-bounces(a)winehq.org on behalf of julliard(a)winehq.org> wrote: Folks, It's time to start thinking about this year's Wine conference! Until now, selecting the next WineConf was a more or less ad-hoc process, but we had some discussions on the wineconf list a while ago, and it was suggested that the Wine Committee should play a more active role in the decision, especially since the chosen location impacts the financial decisions. Ideally we'd define a formal set of requirements, and issue a Call for Proposals, but it was felt that this would take too much time and thus would be more appropriate for 2020. So I thought that for this year we'd do a simple call for volunteers, and have the Wine Committee work with the volunteers to select the best proposal. So, would anybody like to volunteer to host WineConf 2019? -- Alexandre Julliard julliard(a)winehq.org

3 2

[PATCH] windowscodecs/tests: Add a trailing '\n' to an ok() call.
by Francois Gouget 14 Mar '19

14 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/windowscodecs/tests/stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index 3750c32f3c2..048f1326be0 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -765,7 +765,7 @@ static void test_StreamOnIStream(void) ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); hr = IWICStream_InitializeFromMemory(stream, memory, sizeof(memory)); - ok(hr == S_OK, "Failed to initialize stream, hr %#x.", hr); + ok(hr == S_OK, "Failed to initialize stream, hr %#x.\n", hr); hr = IWICImagingFactory_CreateStream(factory, &substream); ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); -- 2.20.1

2 1

[PATCH] windowscodecs: Spelling fixes in a comment.
by Francois Gouget 14 Mar '19

14 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/windowscodecs/palette.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 1c1e85834b8..f99cbe00fd1 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -669,8 +669,8 @@ static HRESULT WINAPI PaletteImpl_InitializeFromBitmap(IWICPalette *palette, hr = IWICBitmapSource_GetPixelFormat(source, &format); if (hr != S_OK) return hr; - /* For interoperability with gdiplus where PixelFormat24bppRGB actully stored - * as BGR (and there is no a corresponding RGB format) we have to use 24bppBGR + /* For interoperability with gdiplus where PixelFormat24bppRGB is actually stored + * as BGR (and there is no corresponding RGB format), we have to use 24bppBGR * to avoid format conversions. */ if (!IsEqualGUID(&format, &GUID_WICPixelFormat24bppBGR)) -- 2.20.1

2 1

[PATCH vkd3d 04/11] vkd3d: Add VKD3D_VULKAN_DEVICE debug environment variable.
by Józef Kucia 14 Mar '19

14 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_debug.h | 2 ++ libs/vkd3d-common/debug.c | 20 +++++++++++++++++++- libs/vkd3d/device.c | 26 +++++++++++++++++++------- 3 files changed, 40 insertions(+), 8 deletions(-) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 8b4c77db291d..42e5903d96d9 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -70,4 +70,6 @@ static inline const char *debugstr_guid(const GUID *guid) guid->Data4[5], guid->Data4[6], guid->Data4[7]); } +unsigned int vkd3d_env_var_as_uint(const char *name, unsigned int default_value) DECLSPEC_HIDDEN; + #endif /* __VKD3D_DEBUG_H */ diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index ee23ab0f49a8..9d10c28662da 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -20,10 +20,11 @@ #include <assert.h> #include <ctype.h> +#include <errno.h> +#include <inttypes.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <inttypes.h> #define VKD3D_DEBUG_BUFFER_COUNT 64 #define VKD3D_DEBUG_BUFFER_SIZE 512 @@ -297,3 +298,20 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) return debugstr_w16((const uint16_t *)wstr); return debugstr_w32((const uint32_t *)wstr); } + +unsigned int vkd3d_env_var_as_uint(const char *name, unsigned int default_value) +{ + const char *value = getenv(name); + unsigned long r; + char *end_ptr; + + if (value) + { + errno = 0; + r = strtoul(value, &end_ptr, 0); + if (!errno && end_ptr != value) + return r; + } + + return default_value; +} diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 204489c2993a..f809a00b03ff 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1061,12 +1061,13 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, } static HRESULT vkd3d_select_physical_device(struct vkd3d_instance *instance, - VkPhysicalDevice *selected_device) + unsigned int device_index, VkPhysicalDevice *selected_device) { VkPhysicalDevice dgpu_device = VK_NULL_HANDLE, igpu_device = VK_NULL_HANDLE; const struct vkd3d_vk_instance_procs *vk_procs = &instance->vk_procs; VkInstance vk_instance = instance->vk_instance; VkPhysicalDeviceProperties device_properties; + VkPhysicalDevice device = VK_NULL_HANDLE; VkPhysicalDevice *physical_devices; uint32_t count; unsigned int i; @@ -1094,27 +1095,36 @@ static HRESULT vkd3d_select_physical_device(struct vkd3d_instance *instance, return hresult_from_vk_result(vr); } + if (device_index != ~0u && device_index >= count) + WARN("Device index %u is out of range.\n", device_index); + for (i = 0; i < count; ++i) { VK_CALL(vkGetPhysicalDeviceProperties(physical_devices[i], &device_properties)); vkd3d_trace_physical_device(physical_devices[i], &device_properties, vk_procs); + if (i == device_index) + device = physical_devices[i]; + if (device_properties.deviceType == VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU && !dgpu_device) dgpu_device = physical_devices[i]; else if (device_properties.deviceType == VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU && !igpu_device) igpu_device = physical_devices[i]; } - *selected_device = dgpu_device ? dgpu_device : igpu_device; - if (!*selected_device) - *selected_device = physical_devices[0]; + if (!device) + device = dgpu_device ? dgpu_device : igpu_device; + if (!device) + device = physical_devices[0]; vkd3d_free(physical_devices); - VK_CALL(vkGetPhysicalDeviceProperties(*selected_device, &device_properties)); + VK_CALL(vkGetPhysicalDeviceProperties(device, &device_properties)); TRACE("Using device: %s, %#x:%#x.\n", device_properties.deviceName, device_properties.vendorID, device_properties.deviceID); + *selected_device = device; + return S_OK; } @@ -1285,6 +1295,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VkPhysicalDeviceFeatures2 features2; VkPhysicalDevice physical_device; VkDeviceCreateInfo device_info; + unsigned int device_index; uint32_t extension_count; const char **extensions; VkDevice vk_device; @@ -1294,8 +1305,9 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, TRACE("device %p, create_info %p.\n", device, create_info); physical_device = create_info->vk_physical_device; - if (!physical_device - && FAILED(hr = vkd3d_select_physical_device(device->vkd3d_instance, &physical_device))) + device_index = vkd3d_env_var_as_uint("VKD3D_VULKAN_DEVICE", ~0u); + if ((!physical_device || device_index != ~0u) + && FAILED(hr = vkd3d_select_physical_device(device->vkd3d_instance, device_index, &physical_device))) return hr; device->vk_physical_device = physical_device; -- 2.19.2

2 1

[PATCH vkd3d 10/11] vkd3d: Remove FIXME() from vkd3d_get_format().
by Józef Kucia 14 Mar '19

14 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/utils.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 14b79337ca76..e0af3f6e2dfd 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -163,7 +163,6 @@ const struct vkd3d_format *vkd3d_get_format(DXGI_FORMAT dxgi_format, bool depth_ return &vkd3d_formats[i]; } - FIXME("Unhandled DXGI format %#x.\n", dxgi_format); return NULL; } -- 2.19.2

2 1

[PATCH vkd3d 11/11] tests: Fix Vulkan validation error in test_copy_descriptors().
by Józef Kucia 14 Mar '19

14 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 00b9e7be2e85..3f881b947df4 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -14684,7 +14684,7 @@ static void test_copy_descriptors(void) D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE); t[2] = create_default_texture(context.device, - 1, 1, DXGI_FORMAT_R32_UINT, 0, D3D12_RESOURCE_STATE_COPY_DEST); + 1, 1, DXGI_FORMAT_R32_SINT, 0, D3D12_RESOURCE_STATE_COPY_DEST); data.pData = &t2_data; data.RowPitch = sizeof(t2_data); data.SlicePitch = data.RowPitch; -- 2.19.2

2 1

[PATCH vkd3d 01/11] vkd3d-shader: Translate eval_sample_index shader instructions.
by Józef Kucia 14 Mar '19

14 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 40 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a734539b7b88..accdd756e1ac 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7605,6 +7605,43 @@ static void vkd3d_dxbc_compiler_emit_sample_info(struct vkd3d_dxbc_compiler *com vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } +static void vkd3d_dxbc_compiler_emit_interpolate(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_dst_param *dst = instruction->dst; + const struct vkd3d_shader_src_param *src = instruction->src; + const struct vkd3d_shader_register *input = &src[0].reg; + uint32_t instr_set_id, type_id, val_id, src_ids[2]; + struct vkd3d_shader_register_info register_info; + + if (!vkd3d_dxbc_compiler_get_register_info(compiler, input, &register_info)) + return; + + if (register_info.storage_class != SpvStorageClassInput) + { + FIXME("Not supported for storage class %#x.\n", register_info.storage_class); + return; + } + + vkd3d_spirv_enable_capability(builder, SpvCapabilityInterpolationFunction); + + src_ids[0] = register_info.id; + src_ids[1] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[1], VKD3DSP_WRITEMASK_0); + + type_id = vkd3d_spirv_get_type_id(builder, + VKD3D_TYPE_FLOAT, vkd3d_write_mask_component_count(register_info.write_mask)); + + instr_set_id = vkd3d_spirv_get_glsl_std450_instr_set(builder); + val_id = vkd3d_spirv_build_op_ext_inst(builder, type_id, + instr_set_id, GLSLstd450InterpolateAtSample, src_ids, 2); + + val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, + val_id, register_info.write_mask, VKD3D_TYPE_FLOAT, src[0].swizzle, dst->write_mask); + + vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); +} + /* From the Vulkan spec: * * "Scope for execution must be limited to: * Workgroup * Subgroup" @@ -8011,6 +8048,9 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_SAMPLE_INFO: vkd3d_dxbc_compiler_emit_sample_info(compiler, instruction); break; + case VKD3DSIH_EVAL_SAMPLE_INDEX: + vkd3d_dxbc_compiler_emit_interpolate(compiler, instruction); + break; case VKD3DSIH_SYNC: vkd3d_dxbc_compiler_emit_sync(compiler, instruction); break; -- 2.19.2

2 1

[PATCH vkd3d 02/11] vkd3d-shader: Translate eval_centroid shader instructions.
by Józef Kucia 14 Mar '19

14 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 2 ++ libs/vkd3d-shader/spirv.c | 24 ++++++++++++++++++------ libs/vkd3d-shader/trace.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 7cc11e7586ac..996a7e544c1e 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -296,6 +296,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, VKD3D_SM5_OP_SYNC = 0xbe, VKD3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, + VKD3D_SM5_OP_EVAL_CENTROID = 0xcd, VKD3D_SM5_OP_DCL_GS_INSTANCES = 0xce, }; @@ -1108,6 +1109,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_SYNC, VKD3DSIH_SYNC, "", "", shader_sm5_read_sync}, {VKD3D_SM5_OP_EVAL_SAMPLE_INDEX, VKD3DSIH_EVAL_SAMPLE_INDEX, "f", "fi"}, + {VKD3D_SM5_OP_EVAL_CENTROID, VKD3DSIH_EVAL_CENTROID, "f", "f"}, {VKD3D_SM5_OP_DCL_GS_INSTANCES, VKD3DSIH_DCL_GS_INSTANCES, "", "", shader_sm4_read_declaration_count}, }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index accdd756e1ac..e13d7301c0a4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7605,7 +7605,7 @@ static void vkd3d_dxbc_compiler_emit_sample_info(struct vkd3d_dxbc_compiler *com vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } -static void vkd3d_dxbc_compiler_emit_interpolate(struct vkd3d_dxbc_compiler *compiler, +static void vkd3d_dxbc_compiler_emit_eval_attrib(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; @@ -7614,6 +7614,8 @@ static void vkd3d_dxbc_compiler_emit_interpolate(struct vkd3d_dxbc_compiler *com const struct vkd3d_shader_register *input = &src[0].reg; uint32_t instr_set_id, type_id, val_id, src_ids[2]; struct vkd3d_shader_register_info register_info; + unsigned int src_count = 0; + enum GLSLstd450 op; if (!vkd3d_dxbc_compiler_get_register_info(compiler, input, &register_info)) return; @@ -7626,15 +7628,24 @@ static void vkd3d_dxbc_compiler_emit_interpolate(struct vkd3d_dxbc_compiler *com vkd3d_spirv_enable_capability(builder, SpvCapabilityInterpolationFunction); - src_ids[0] = register_info.id; - src_ids[1] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[1], VKD3DSP_WRITEMASK_0); + src_ids[src_count++] = register_info.id; + + if (instruction->handler_idx == VKD3DSIH_EVAL_CENTROID) + { + op = GLSLstd450InterpolateAtCentroid; + } + else + { + assert(instruction->handler_idx == VKD3DSIH_EVAL_SAMPLE_INDEX); + op = GLSLstd450InterpolateAtSample; + src_ids[src_count++] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[1], VKD3DSP_WRITEMASK_0); + } type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, vkd3d_write_mask_component_count(register_info.write_mask)); instr_set_id = vkd3d_spirv_get_glsl_std450_instr_set(builder); - val_id = vkd3d_spirv_build_op_ext_inst(builder, type_id, - instr_set_id, GLSLstd450InterpolateAtSample, src_ids, 2); + val_id = vkd3d_spirv_build_op_ext_inst(builder, type_id, instr_set_id, op, src_ids, src_count); val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, val_id, register_info.write_mask, VKD3D_TYPE_FLOAT, src[0].swizzle, dst->write_mask); @@ -8048,8 +8059,9 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_SAMPLE_INFO: vkd3d_dxbc_compiler_emit_sample_info(compiler, instruction); break; + case VKD3DSIH_EVAL_CENTROID: case VKD3DSIH_EVAL_SAMPLE_INDEX: - vkd3d_dxbc_compiler_emit_interpolate(compiler, instruction); + vkd3d_dxbc_compiler_emit_eval_attrib(compiler, instruction); break; case VKD3DSIH_SYNC: vkd3d_dxbc_compiler_emit_sync(compiler, instruction); diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index bb0e6ad5a3d0..13fb117b5360 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -130,6 +130,7 @@ static const char * const shader_opcode_names[] = /* VKD3DSIH_ENDREP */ "endrep", /* VKD3DSIH_ENDSWITCH */ "endswitch", /* VKD3DSIH_EQ */ "eq", + /* VKD3DSIH_EVAL_CENTROID */ "eval_centroid", /* VKD3DSIH_EVAL_SAMPLE_INDEX */ "eval_sample_index", /* VKD3DSIH_EXP */ "exp", /* VKD3DSIH_EXPP */ "expp", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index a6860969c068..fba493e3b563 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -156,6 +156,7 @@ enum VKD3D_SHADER_INSTRUCTION_HANDLER VKD3DSIH_ENDREP, VKD3DSIH_ENDSWITCH, VKD3DSIH_EQ, + VKD3DSIH_EVAL_CENTROID, VKD3DSIH_EVAL_SAMPLE_INDEX, VKD3DSIH_EXP, VKD3DSIH_EXPP, -- 2.19.2

2 1

[PATCH vkd3d 03/11] tests: Add test for eval attribute shader instructions.
by Józef Kucia 14 Mar '19

14 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index e3e86e8afa07..654770ac5540 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -25410,6 +25410,157 @@ static void test_coverage(void) destroy_test_context(&context); } +static void test_shader_eval_attribute(void) +{ + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + void main(uint id : SV_VertexID, out float4 position : SV_Position, + out float2 attr : ATTR, out centroid float2 ref : REF) + { + float2 coords = float2((id << 1) & 2, id & 2); + position = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1); + attr = ref = position.xy; + } +#endif + 0x43425844, 0x9289815f, 0xc6ff580d, 0xa7184c61, 0x4920e2eb, 0x00000001, 0x0000021c, 0x00000003, + 0x0000002c, 0x00000060, 0x000000d0, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000006, 0x00000001, 0x00000000, 0x00000101, 0x565f5653, 0x65747265, 0x00444978, + 0x4e47534f, 0x00000068, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x0000005c, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000c03, + 0x00000061, 0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x00000c03, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x52545441, 0x46455200, 0xababab00, 0x58454853, 0x00000144, 0x00010050, 0x00000051, + 0x0100086a, 0x04000060, 0x00101012, 0x00000000, 0x00000006, 0x04000067, 0x001020f2, 0x00000000, + 0x00000001, 0x03000065, 0x00102032, 0x00000001, 0x03000065, 0x00102032, 0x00000002, 0x02000068, + 0x00000001, 0x0b00008c, 0x00100012, 0x00000000, 0x00004001, 0x00000001, 0x00004001, 0x00000001, + 0x0010100a, 0x00000000, 0x00004001, 0x00000000, 0x07000001, 0x00100042, 0x00000000, 0x0010100a, + 0x00000000, 0x00004001, 0x00000002, 0x05000056, 0x00100032, 0x00000000, 0x00100086, 0x00000000, + 0x0f000032, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x00004002, 0x40000000, 0xc0000000, + 0x00000000, 0x00000000, 0x00004002, 0xbf800000, 0x3f800000, 0x00000000, 0x00000000, 0x05000036, + 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x05000036, 0x00102032, 0x00000001, 0x00100046, + 0x00000000, 0x05000036, 0x00102032, 0x00000002, 0x00100046, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const DWORD ps_eval_sample_index_code[] = + { +#if 0 + float4 main(float4 p : SV_Position, float2 attr : ATTR, + sample float2 ref : REF, uint sample_id : SV_SampleIndex) : SV_Target + { + return float4(EvaluateAttributeAtSample(attr, sample_id) - ref, 0, 1); + } +#endif + 0x43425844, 0x65f268a1, 0x2c1a3d53, 0xd39689a5, 0x2f556a12, 0x00000001, 0x000001a4, 0x00000003, + 0x0000002c, 0x000000c0, 0x000000f4, 0x4e475349, 0x0000008c, 0x00000004, 0x00000008, 0x00000068, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000074, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000303, 0x00000079, 0x00000000, 0x00000000, 0x00000003, 0x00000002, + 0x00000303, 0x0000007d, 0x00000000, 0x0000000a, 0x00000001, 0x00000003, 0x00000101, 0x505f5653, + 0x7469736f, 0x006e6f69, 0x52545441, 0x46455200, 0x5f565300, 0x706d6153, 0x6e49656c, 0x00786564, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a8, 0x00000050, + 0x0000002a, 0x0100086a, 0x03001062, 0x00101032, 0x00000001, 0x03003062, 0x00101032, 0x00000002, + 0x04000863, 0x00101012, 0x00000003, 0x0000000a, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x070000cc, 0x00100032, 0x00000000, 0x00101046, 0x00000001, 0x0010100a, 0x00000003, + 0x08000000, 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x80101046, 0x00000041, 0x00000002, + 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_eval_sample_index = {ps_eval_sample_index_code, sizeof(ps_eval_sample_index_code)}; + static const DWORD ps_eval_centroid_code[] = + { +#if 0 + float4 main(float4 p : SV_Position, float2 attr : ATTR, centroid float2 ref : REF) : SV_Target + { + return float4(EvaluateAttributeCentroid(attr) - ref, 0, 1); + } +#endif + 0x43425844, 0x77f3381c, 0x9cf9ef7c, 0xefc86041, 0x1ab6e047, 0x00000001, 0x00000168, 0x00000003, + 0x0000002c, 0x0000009c, 0x000000d0, 0x4e475349, 0x00000068, 0x00000003, 0x00000008, 0x00000050, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000005c, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000303, 0x00000061, 0x00000000, 0x00000000, 0x00000003, 0x00000002, + 0x00000303, 0x505f5653, 0x7469736f, 0x006e6f69, 0x52545441, 0x46455200, 0xababab00, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000090, 0x00000050, 0x00000024, + 0x0100086a, 0x03001062, 0x00101032, 0x00000001, 0x03001862, 0x00101032, 0x00000002, 0x03000065, + 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x050000cd, 0x00100032, 0x00000000, 0x00101046, + 0x00000001, 0x08000000, 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x80101046, 0x00000041, + 0x00000002, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, + 0x3f800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_eval_centroid = {ps_eval_centroid_code, sizeof(ps_eval_centroid_code)}; + static const struct vec4 expected_vec4 = {0.0f, 0.0f, 0.0f, 1.0f}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + if (use_warp_device) + { + skip("Sample shading tests fail on WARP.\n"); + return; + } + + memset(&desc, 0, sizeof(desc)); + desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT; + desc.rt_width = desc.rt_height = 32; + desc.sample_desc.Count = 4; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, &vs, &ps_eval_sample_index, NULL); + pso_desc.SampleDesc.Count = desc.sample_desc.Count; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + + 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_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_RESOLVE_SOURCE); + check_sub_resource_vec4(context.render_target, 0, queue, command_list, &expected_vec4, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RESOLVE_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12PipelineState_Release(context.pipeline_state); + pso_desc.PS = ps_eval_centroid; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + + 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_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_RESOLVE_SOURCE); + check_sub_resource_vec4(context.render_target, 0, queue, command_list, &expected_vec4, 0); + + destroy_test_context(&context); +} + static void test_primitive_restart(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -25821,6 +25972,7 @@ START_TEST(d3d12) run_test(test_multisample_rendering); run_test(test_sample_mask); run_test(test_coverage); + run_test(test_shader_eval_attribute); run_test(test_primitive_restart); run_test(test_vertex_shader_stream_output); } -- 2.19.2

2 1

[PATCH v3 7/8] user32: Implement EC_USEFONTINFO margins in the CJK case.
by Akihiro Sagawa 14 Mar '19

14 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/edit.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 88 insertions(+), 3 deletions(-)

1 0

[PATCH v3 2/8] user32/tests: Use EM_SETMARGINS to test EC_USEFONTINFO margins.
by Akihiro Sagawa 14 Mar '19

14 Mar '19

Tests assume that WM_SETFONT margins are equal to EM_SETMARGINS with EC_USEFONTINFO ones. This isn't true when font's charset is CJK. In v3, Introduce cjk_charset variable, in addition to cjk variable. cjk_charset variable represents font charset (codepage) is CJK. cjk one represents Wine's way that indicates the font is CJK. This value doesn't support charset association seen in Chinese. So, they are different. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 47 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-)

1 0

[PATCH v3 1/8] user32/tests: Skip margin tests if a font for the target charset isn't available.
by Akihiro Sagawa 14 Mar '19

14 Mar '19

This patch is new in v3. Test results are unreliable if a font for the target charset isn't available, so skip the test. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)

1 0

[PATCH v2] hid: Handle overlapped file handles.
by Zebediah Figura 14 Mar '19

14 Mar '19

This fixes a crash in the hid:device tests for me, and likely helps with bug 46711. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: fix memory leak (thanks Dmitry). dlls/hid/hidd.c | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 614e7c4bf5..4b703ca536 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -38,6 +38,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); +static BOOL sync_ioctl(HANDLE file, DWORD code, void *in_buf, DWORD in_len, void *out_buf, DWORD out_len, DWORD *ret_len) +{ + OVERLAPPED ovl = {0}; + BOOL ret; + + ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + ret = DeviceIoControl(file, code, in_buf, in_len, out_buf, out_len, ret_len, &ovl); + if (!ret && GetLastError() == ERROR_IO_PENDING) + ret = GetOverlappedResult(file, &ovl, ret_len, TRUE); + CloseHandle(ovl.hEvent); + return ret; +} + BOOLEAN WINAPI HidD_FreePreparsedData(PHIDP_PREPARSED_DATA PreparsedData) { TRACE("(%p)\n", PreparsedData); @@ -52,7 +65,7 @@ BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr) TRACE("(%p %p)\n", HidDeviceObject, Attr); - ret = DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(HID_COLLECTION_INFORMATION), NULL, NULL); + ret = sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(HID_COLLECTION_INFORMATION), NULL); if (ret) { @@ -66,7 +79,7 @@ BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr) BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength, NULL); } void WINAPI HidD_GetHidGuid(LPGUID guid) @@ -78,43 +91,43 @@ void WINAPI HidD_GetHidGuid(LPGUID guid) BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength, NULL); } BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, NULL); } BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers) { TRACE("(%p %p)\n", HidDeviceObject, NumberBuffers); - return DeviceIoControl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(*NumberBuffers), NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(*NumberBuffers), NULL); } BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0, NULL); } BOOLEAN WINAPI HidD_SetNumInputBuffers(HANDLE HidDeviceObject, ULONG NumberBuffers) { TRACE("(%p %i)\n", HidDeviceObject, NumberBuffers); - return DeviceIoControl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0, NULL); } BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, NULL); } BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength, NULL); } BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DATA *PreparsedData) @@ -124,14 +137,14 @@ BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DAT TRACE("(%p %p)\n", HidDeviceObject, PreparsedData); - if (!DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, - &info, sizeof(HID_COLLECTION_INFORMATION), NULL, NULL)) + if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, + &info, sizeof(HID_COLLECTION_INFORMATION), NULL)) return FALSE; if (!(data = HeapAlloc(GetProcessHeap(), 0, info.DescriptorSize))) return FALSE; - if (!DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, - data, info.DescriptorSize, NULL, NULL)) + if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, + data, info.DescriptorSize, NULL)) { HeapFree( GetProcessHeap(), 0, data ); return FALSE; @@ -143,5 +156,5 @@ BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DAT BOOLEAN WINAPI HidD_SetOutputReport(HANDLE HidDeviceObject, void *ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0, NULL, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0, NULL); } -- 2.20.1

2 1

[PATCH 01/17] mshtml: Use is_main_content_window in a few more places.
by Jacek Caban 14 Mar '19

14 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/persist.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-)

2 1

[PATCH 17/17] mshtml: Get rid of no longer needed HTMLOuterWindow doc_obj pointer.
by Jacek Caban 14 Mar '19

14 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 6 +----- dlls/mshtml/htmlwindow.c | 2 -- dlls/mshtml/mshtml_private.h | 1 - 3 files changed, 1 insertion(+), 8 deletions(-)

1 0

[PATCH 16/17] mshtml: Access document object via browser object in navigate_uri.
by Jacek Caban 14 Mar '19

14 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/navigate.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)

1 0

[PATCH 15/17] mshtml: Access document object via browser object in navigate_new_window.
by Jacek Caban 14 Mar '19

14 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/navigate.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)

1 0

[PATCH 14/17] mshtml: Access document object via browser object in super_navigate.
by Jacek Caban 14 Mar '19

14 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/navigate.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

1 0

[PATCH 13/17] mshtml: Access document object via browser object in navigate_javascript_proc and navigate_fragment.
by Jacek Caban 14 Mar '19

14 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/navigate.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)

1 0

[PATCH 12/17] mshtml: Access document object via browser object in handle_navigation_error and handle_extern_mime_navigation.
by Jacek Caban 14 Mar '19

14 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/navigate.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH 11/17] mshtml: Access document object via browser object in nsChannelBSC_init_bindinfo.
by Jacek Caban 14 Mar '19

14 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/navigate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH 10/17] mshtml: Access document object via browser object in IBindCallbackRedirect::Redirect.
by Jacek Caban 14 Mar '19

14 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/navigate.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

1 0

[PATCH 09/17] mshtml: Access document object via browser object in update_window_doc.
by Jacek Caban 14 Mar '19

14 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlwindow.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

1 0

[PATCH 08/17] mshtml: Access document object via browser object in window QueryService implementation.
by Jacek Caban 14 Mar '19

14 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlwindow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 07/17] mshtml: Access document object via browser object in IHTMLPrivateWindow implementation.
by Jacek Caban 14 Mar '19

14 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlwindow.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

1 0

[PATCH 06/17] mshtml: Access document object via browser object in IHTMLWindow2 implementation.
by Jacek Caban 14 Mar '19

14 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlwindow.c | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-)

1 0

[PATCH 05/17] mshtml: Access document object via browser object in nsIChannel::AsyncOpen.
by Jacek Caban 14 Mar '19

14 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH 04/17] mshtml: Access document object via browser object in refresh_proc.
by Jacek Caban 14 Mar '19

14 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/olecmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 03/17] mshtml: Access document object via browser object in IOmHistory::get_length.
by Jacek Caban 14 Mar '19

14 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/omnavigator.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)

1 0

[PATCH 02/17] mshtml: Access document object via browser object in IActiveScriptSiteWindow::GetWindow.
by Jacek Caban 14 Mar '19

14 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/script.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 01/11] mfplat: Add a helper to have readable attribute names in traces.
by Nikolay Sivov 14 Mar '19

14 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 149 ++++++++++++++++++++++++--------------------- 1 file changed, 80 insertions(+), 69 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c7f4fea6b4..c8c19aa404 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -34,6 +34,7 @@ #include "wine/list.h" #include "mfplat_private.h" +#include "mfreadwrite.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -532,6 +533,62 @@ HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG sr return S_OK; } +struct guid_def +{ + const GUID *guid; + const char *name; +}; + +static int debug_compare_guid(const void *a, const void *b) +{ + const GUID *guid = a; + const struct guid_def *guid_def = b; + return memcmp(guid, guid_def->guid, sizeof(*guid)); +} + +static const char *debugstr_attr(const GUID *guid) +{ + static const struct guid_def guid_defs[] = + { +#define X(g) { &(g), #g } + X(MF_READWRITE_MMCSS_CLASS), + X(MF_SINK_WRITER_ENCODER_CONFIG), + X(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS), + X(MF_MT_PIXEL_ASPECT_RATIO), + X(MF_MT_AVG_BITRATE), + X(MF_MT_ALL_SAMPLES_INDEPENDENT), + X(MF_MT_FRAME_SIZE), + X(MF_SINK_WRITER_ASYNC_CALLBACK), + X(MF_MT_FRAME_RATE_RANGE_MAX), + X(MF_MT_USER_DATA), + X(MF_READWRITE_DISABLE_CONVERTERS), + X(MF_READWRITE_MMCSS_PRIORITY_AUDIO), + X(MF_BYTESTREAM_ORIGIN_NAME), + X(MF_BYTESTREAM_CONTENT_TYPE), + X(MF_BYTESTREAM_DURATION), + X(MF_BYTESTREAM_LAST_MODIFIED_TIME), + X(MF_MT_FRAME_RATE_RANGE_MIN), + X(MF_BYTESTREAM_IFO_FILE_URI), + X(MF_BYTESTREAM_DLNA_PROFILE_ID), + X(MF_MT_MAJOR_TYPE), + X(MF_MT_SUBTYPE), + X(MF_SINK_WRITER_D3D_MANAGER), + X(MF_MT_INTERLACE_MODE), + X(MF_READWRITE_MMCSS_PRIORITY), + X(MF_SINK_WRITER_DISABLE_THROTTLING), + X(MF_READWRITE_D3D_OPTIONAL), + X(MF_READWRITE_MMCSS_CLASS_AUDIO), + X(MF_MT_FRAME_RATE), +#undef X + }; + struct guid_def *ret = NULL; + + if (guid) + ret = bsearch(guid, guid_defs, ARRAY_SIZE(guid_defs), sizeof(*guid_defs), debug_compare_guid); + + return ret ? wine_dbg_sprintf("%s", ret->name) : wine_dbgstr_guid(guid); +} + static inline mfattributes *impl_from_IMFAttributes(IMFAttributes *iface) { return CONTAINING_RECORD(iface, mfattributes, IMFAttributes_iface); @@ -586,27 +643,21 @@ static ULONG WINAPI mfattributes_Release(IMFAttributes *iface) static HRESULT WINAPI mfattributes_GetItem(IMFAttributes *iface, REFGUID key, PROPVARIANT *value) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + FIXME("%p, %s, %p.\n", iface, debugstr_attr(key), value); return E_NOTIMPL; } static HRESULT WINAPI mfattributes_GetItemType(IMFAttributes *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), type); + FIXME("%p, %s, %p.\n", iface, debugstr_attr(key), type); return E_NOTIMPL; } static HRESULT WINAPI mfattributes_CompareItem(IMFAttributes *iface, REFGUID key, REFPROPVARIANT value, BOOL *result) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s, %p, %p\n", This, debugstr_guid(key), value, result); + FIXME("%p, %s, %p, %p.\n", iface, debugstr_attr(key), value, result); return E_NOTIMPL; } @@ -623,45 +674,35 @@ static HRESULT WINAPI mfattributes_Compare(IMFAttributes *iface, IMFAttributes * static HRESULT WINAPI mfattributes_GetUINT32(IMFAttributes *iface, REFGUID key, UINT32 *value) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + FIXME("%p, %s, %p.\n", iface, debugstr_attr(key), value); return E_NOTIMPL; } static HRESULT WINAPI mfattributes_GetUINT64(IMFAttributes *iface, REFGUID key, UINT64 *value) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + FIXME("%p, %s, %p.\n", iface, debugstr_attr(key), value); return E_NOTIMPL; } static HRESULT WINAPI mfattributes_GetDouble(IMFAttributes *iface, REFGUID key, double *value) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + FIXME("%p, %s, %p.\n", iface, debugstr_attr(key), value); return E_NOTIMPL; } static HRESULT WINAPI mfattributes_GetGUID(IMFAttributes *iface, REFGUID key, GUID *value) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + FIXME("%p, %s, %p.\n", iface, debugstr_attr(key), value); return E_NOTIMPL; } static HRESULT WINAPI mfattributes_GetStringLength(IMFAttributes *iface, REFGUID key, UINT32 *length) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), length); + FIXME("%p, %s, %p.\n", iface, debugstr_attr(key), length); return E_NOTIMPL; } @@ -669,9 +710,7 @@ static HRESULT WINAPI mfattributes_GetStringLength(IMFAttributes *iface, REFGUID static HRESULT WINAPI mfattributes_GetString(IMFAttributes *iface, REFGUID key, WCHAR *value, UINT32 size, UINT32 *length) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s, %p, %d, %p\n", This, debugstr_guid(key), value, size, length); + FIXME("%p, %s, %p, %d, %p.\n", iface, debugstr_attr(key), value, size, length); return E_NOTIMPL; } @@ -679,18 +718,14 @@ static HRESULT WINAPI mfattributes_GetString(IMFAttributes *iface, REFGUID key, static HRESULT WINAPI mfattributes_GetAllocatedString(IMFAttributes *iface, REFGUID key, WCHAR **value, UINT32 *length) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s, %p, %p\n", This, debugstr_guid(key), value, length); + FIXME("%p, %s, %p, %p.\n", iface, debugstr_attr(key), value, length); return E_NOTIMPL; } static HRESULT WINAPI mfattributes_GetBlobSize(IMFAttributes *iface, REFGUID key, UINT32 *size) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), size); + FIXME("%p, %s, %p.\n", iface, debugstr_attr(key), size); return E_NOTIMPL; } @@ -698,45 +733,35 @@ static HRESULT WINAPI mfattributes_GetBlobSize(IMFAttributes *iface, REFGUID key static HRESULT WINAPI mfattributes_GetBlob(IMFAttributes *iface, REFGUID key, UINT8 *buf, UINT32 bufsize, UINT32 *blobsize) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s, %p, %d, %p\n", This, debugstr_guid(key), buf, bufsize, blobsize); + FIXME("%p, %s, %p, %d, %p.\n", iface, debugstr_attr(key), buf, bufsize, blobsize); return E_NOTIMPL; } static HRESULT WINAPI mfattributes_GetAllocatedBlob(IMFAttributes *iface, REFGUID key, UINT8 **buf, UINT32 *size) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s, %p, %p\n", This, debugstr_guid(key), buf, size); + FIXME("%p, %s, %p, %p.\n", iface, debugstr_attr(key), buf, size); return E_NOTIMPL; } static HRESULT WINAPI mfattributes_GetUnknown(IMFAttributes *iface, REFGUID key, REFIID riid, void **ppv) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s, %s, %p\n", This, debugstr_guid(key), debugstr_guid(riid), ppv); + FIXME("%p, %s, %s, %p.\n", iface, debugstr_attr(key), debugstr_guid(riid), ppv); return E_NOTIMPL; } static HRESULT WINAPI mfattributes_SetItem(IMFAttributes *iface, REFGUID key, REFPROPVARIANT Value) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), Value); + FIXME("%p, %s, %p.\n", iface, debugstr_attr(key), Value); return E_NOTIMPL; } static HRESULT WINAPI mfattributes_DeleteItem(IMFAttributes *iface, REFGUID key) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s\n", This, debugstr_guid(key)); + FIXME("%p, %s.\n", iface, debugstr_attr(key)); return E_NOTIMPL; } @@ -752,63 +777,49 @@ static HRESULT WINAPI mfattributes_DeleteAllItems(IMFAttributes *iface) static HRESULT WINAPI mfattributes_SetUINT32(IMFAttributes *iface, REFGUID key, UINT32 value) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s, %d\n", This, debugstr_guid(key), value); + FIXME("%p, %s, %d.\n", iface, debugstr_attr(key), value); return E_NOTIMPL; } static HRESULT WINAPI mfattributes_SetUINT64(IMFAttributes *iface, REFGUID key, UINT64 value) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s, %s\n", This, debugstr_guid(key), wine_dbgstr_longlong(value)); + FIXME("%p, %s, %s.\n", iface, debugstr_attr(key), wine_dbgstr_longlong(value)); return E_NOTIMPL; } static HRESULT WINAPI mfattributes_SetDouble(IMFAttributes *iface, REFGUID key, double value) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s, %f\n", This, debugstr_guid(key), value); + FIXME("%p, %s, %f.\n", iface, debugstr_attr(key), value); return E_NOTIMPL; } static HRESULT WINAPI mfattributes_SetGUID(IMFAttributes *iface, REFGUID key, REFGUID value) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s, %s\n", This, debugstr_guid(key), debugstr_guid(value)); + FIXME("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_guid(value)); return E_NOTIMPL; } static HRESULT WINAPI mfattributes_SetString(IMFAttributes *iface, REFGUID key, const WCHAR *value) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s, %s\n", This, debugstr_guid(key), debugstr_w(value)); + FIXME("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_w(value)); return E_NOTIMPL; } static HRESULT WINAPI mfattributes_SetBlob(IMFAttributes *iface, REFGUID key, const UINT8 *buf, UINT32 size) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s, %p, %d\n", This, debugstr_guid(key), buf, size); + FIXME("%p, %s, %p, %u.\n", iface, debugstr_attr(key), buf, size); return E_NOTIMPL; } static HRESULT WINAPI mfattributes_SetUnknown(IMFAttributes *iface, REFGUID key, IUnknown *unknown) { - mfattributes *This = impl_from_IMFAttributes(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), unknown); + FIXME("%p, %s, %p.\n", iface, debugstr_attr(key), unknown); return E_NOTIMPL; } -- 2.20.1

2 15

[PATCH] testbot/TestLauncher: Add an Emacs directive to get 3-space indentation.
by Francois Gouget 14 Mar '19

14 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Yep, except for those two lines it's 3-space indent all the way down! testbot/src/TestLauncher/TestLauncher.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 15929c50..783dbaba 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset: 3; indent-tabs-mode: nil -*- */ /* * Verifies that the dlls needed for the test are present. * @@ -34,8 +35,8 @@ static const char *LocationFile; static unsigned LocationLine; static void _SetErrorLocation(const char* file, int line) { - LocationFile = file; - LocationLine = line; + LocationFile = file; + LocationLine = line; } #ifdef __GNUC__ -- 2.20.1

1 0

[PATCH] testbot: Fix Collection::Validate() errors for new Items.
by Francois Gouget 14 Mar '19

14 Mar '19

New Items don't have a full key yet so it cannot be put in the error message. Instead indicate the error happened on a new object and give its partial key. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index c110c98b..1fe1481f 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -495,11 +495,16 @@ sub Validate($) { if ($Item->GetIsNew() || $Item->GetIsModified()) { - (my $ErrProperty, my $ErrMessage) = $Item->Validate(); - if (defined($ErrMessage)) + my ($ErrProperty, $ErrMessage) = $Item->Validate(); + if (defined $ErrMessage) { - return ($Item->GetKey(), $ErrProperty, "$ErrMessage for " . - $self->GetItemName() . " " . $Item->GetFullKey()); + my $Key = $Item->GetKey(); + my $FullKey = $Item->GetFullKey(); + if (defined $FullKey) + { + return ($Key, $ErrProperty, "$ErrMessage for ". $self->GetItemName() ." $FullKey"); + } + return ($Key, $ErrProperty, "$ErrMessage for new ". $self->GetItemName() ." $Key"); } if ($Item->GetIsNew()) { -- 2.20.1

1 0

[PATCH] testbot/WineSendLog: We are testing more than Windows now.
by Francois Gouget 14 Mar '19

14 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 1d13454f..28644fb8 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -342,7 +342,7 @@ EOF Hi, -While running your changed tests on Windows, I think I found new failures. +While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? -- 2.20.1

1 0

[PATCH] testbot/SetWinLocale: Fix setting the VM description.
by Francois Gouget 14 Mar '19

14 Mar '19

There is no $Suffix variable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/SetWinLocale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/scripts/SetWinLocale b/testbot/scripts/SetWinLocale index e9d024f8..5ca05071 100755 --- a/testbot/scripts/SetWinLocale +++ b/testbot/scripts/SetWinLocale @@ -649,7 +649,7 @@ if ($OptRefresh) $VM->IdleSnapshot($BaseVM->IdleSnapshot ."_$VMLocale"); $VM->Hostname($BaseVM->Hostname); - my $Description = $BaseVM->Description ." ". LocaleName($Suffix); + my $Description = $BaseVM->Description ." ". LocaleName($VMLocale); my $PropertyDescriptor = $VMs->GetPropertyDescriptorByName("Description"); if ($PropertyDescriptor->GetMaxLength() < length($Description)) { -- 2.20.1

1 0

[PATCH vkd3d 09/11] vkd3d: Validate box in d3d12_command_list_CopyTextureRegion().
by Józef Kucia 14 Mar '19

14 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 13 +++++++++++++ libs/vkd3d/utils.c | 10 ++++++++++ libs/vkd3d/vkd3d_private.h | 1 + tests/d3d12.c | 5 +++++ 4 files changed, 29 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4cd64b030249..35c2be41716d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2713,6 +2713,13 @@ static void d3d12_command_list_copy_incompatible_texture_region(struct d3d12_com VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &buffer_image_copy)); } +static bool validate_d3d12_box(const D3D12_BOX *box) +{ + return box->right > box->left + && box->bottom > box->top + && box->back > box->front; +} + static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12GraphicsCommandList1 *iface, const D3D12_TEXTURE_COPY_LOCATION *dst, UINT dst_x, UINT dst_y, UINT dst_z, const D3D12_TEXTURE_COPY_LOCATION *src, const D3D12_BOX *src_box) @@ -2727,6 +2734,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic TRACE("iface %p, dst %p, dst_x %u, dst_y %u, dst_z %u, src %p, src_box %p.\n", iface, dst, dst_x, dst_y, dst_z, src, src_box); + if (src_box && !validate_d3d12_box(src_box)) + { + WARN("Empty box %s.\n", debug_d3d12_box(src_box)); + return; + } + vk_procs = &list->device->vk_procs; dst_resource = unsafe_impl_from_ID3D12Resource(dst->pResource); diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index e8ebd2cfead9..14b79337ca76 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -322,6 +322,16 @@ HRESULT return_interface(void *iface, REFIID iface_iid, return hr; } +const char *debug_d3d12_box(const D3D12_BOX *box) +{ + if (!box) + return "(null)"; + + return vkd3d_dbg_sprintf("(%u, %u, %u)-(%u, %u, %u)", + box->left, box->top, box->front, + box->right, box->bottom, box->back); +} + const char *debug_vk_extent_3d(VkExtent3D extent) { return vkd3d_dbg_sprintf("(%u, %u, %u)", diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index b4727a20a4df..a6ada4b4e68f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1015,6 +1015,7 @@ static inline bool is_cpu_accessible_heap(const D3D12_HEAP_PROPERTIES *propertie HRESULT return_interface(void *iface, REFIID iface_iid, REFIID requested_iid, void **object) DECLSPEC_HIDDEN; +const char *debug_d3d12_box(const D3D12_BOX *box) DECLSPEC_HIDDEN; const char *debug_vk_extent_3d(VkExtent3D extent) DECLSPEC_HIDDEN; const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags) DECLSPEC_HIDDEN; const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags) DECLSPEC_HIDDEN; diff --git a/tests/d3d12.c b/tests/d3d12.c index 53c78f99f9fb..00b9e7be2e85 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20933,6 +20933,11 @@ static void test_copy_texture_buffer(void) ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 32, 0, 0, &src_location, &box); + /* empty box */ + set_box(&box, 128, 0, 0, 32, 32, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 0, 0, &src_location, &box); + for (i = 0; i < ARRAY_SIZE(dst_buffers); ++i) { transition_resource_state(command_list, dst_buffers[i], -- 2.19.2

1 0

[PATCH vkd3d 08/11] tests: Add more tests for copying data from textures to buffers.
by Józef Kucia 14 Mar '19

14 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 182213610d69..53c78f99f9fb 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20844,6 +20844,177 @@ static void test_copy_texture(void) destroy_test_context(&context); } +static void test_copy_texture_buffer(void) +{ + D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; + ID3D12GraphicsCommandList *command_list; + D3D12_SUBRESOURCE_DATA texture_data; + ID3D12Resource *dst_buffers[4]; + struct test_context_desc desc; + struct test_context context; + struct resource_readback rb; + ID3D12Resource *src_texture; + unsigned int got, expected; + ID3D12CommandQueue *queue; + ID3D12Device *device; + unsigned int x, y; + unsigned int *ptr; + unsigned int i; + D3D12_BOX box; + + memset(&desc, 0, sizeof(desc)); + desc.no_render_target = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + ptr = calloc(64 * 32, sizeof(*ptr)); + ok(ptr, "Failed to allocate memory.\n"); + + for (i = 0; i < 64 * 32; ++i) + ptr[i] = i; + + src_texture = create_default_texture(device, + 64, 32, DXGI_FORMAT_R32_UINT, 0, D3D12_RESOURCE_STATE_COPY_DEST); + texture_data.pData = ptr; + texture_data.RowPitch = 64 * sizeof(*ptr); + texture_data.SlicePitch = texture_data.RowPitch * 32; + upload_texture_data(src_texture, &texture_data, 1, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, src_texture, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + free(ptr); + + for (i = 0; i < ARRAY_SIZE(dst_buffers); ++i) + { + dst_buffers[i] = create_default_buffer(device, + 64 * 32 * sizeof(*ptr), 0, D3D12_RESOURCE_STATE_COPY_DEST); + } + + dst_location.pResource = dst_buffers[0]; + dst_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT; + dst_location.PlacedFootprint.Offset = 0; + dst_location.PlacedFootprint.Footprint.Format = DXGI_FORMAT_R32_UINT; + dst_location.PlacedFootprint.Footprint.Width = 64; + dst_location.PlacedFootprint.Footprint.Height = 32; + dst_location.PlacedFootprint.Footprint.Depth = 1; + dst_location.PlacedFootprint.Footprint.RowPitch = 64 * sizeof(*ptr); + + src_location.pResource = src_texture; + src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; + src_location.SubresourceIndex = 0; + + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 0, 0, &src_location, NULL); + + dst_location.pResource = dst_buffers[1]; + for (y = 0; y < 32; ++y) + { + set_box(&box, 0, y, 0, 64, y + 1, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 31 - y, 0, &src_location, &box); + } + + dst_location.pResource = dst_buffers[2]; + for (x = 0; x < 64; ++x) + { + set_box(&box, x, 0, 0, x + 1, 32, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 63 - x, 0, 0, &src_location, &box); + } + + dst_location.pResource = dst_buffers[3]; + set_box(&box, 0, 0, 0, 32, 32, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 0, 0, &src_location, &box); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 32, 0, 0, &src_location, &box); + + for (i = 0; i < ARRAY_SIZE(dst_buffers); ++i) + { + transition_resource_state(command_list, dst_buffers[i], + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + } + + got = expected = 0; + get_buffer_readback_with_command_list(dst_buffers[0], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + for (i = 0; i < 64 * 32; ++i) + { + got = get_readback_uint(&rb, i, 0, 0); + expected = i; + + if (got != expected) + break; + } + release_resource_readback(&rb); + ok(got == expected, "Got unexpected value 0x%08x at %u, expected 0x%08x.\n", got, i, expected); + + reset_command_list(command_list, context.allocator); + got = expected = 0; + get_buffer_readback_with_command_list(dst_buffers[1], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + for (y = 0; y < 32; ++y) + { + for (x = 0; x < 64; ++x) + { + got = get_readback_uint(&rb, 64 * y + x, 0, 0); + expected = 64 * (31 - y) + x; + + if (got != expected) + break; + } + if (got != expected) + break; + } + release_resource_readback(&rb); + ok(got == expected, "Got unexpected value 0x%08x at (%u, %u), expected 0x%08x.\n", got, x, y, expected); + + reset_command_list(command_list, context.allocator); + got = expected = 0; + get_buffer_readback_with_command_list(dst_buffers[2], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + for (y = 0; y < 32; ++y) + { + for (x = 0; x < 64; ++x) + { + got = get_readback_uint(&rb, 64 * y + x, 0, 0); + expected = 64 * y + 63 - x; + + if (got != expected) + break; + } + if (got != expected) + break; + } + release_resource_readback(&rb); + ok(got == expected, "Got unexpected value 0x%08x at (%u, %u), expected 0x%08x.\n", got, x, y, expected); + + reset_command_list(command_list, context.allocator); + got = expected = 0; + get_buffer_readback_with_command_list(dst_buffers[3], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + for (y = 0; y < 32; ++y) + { + for (x = 0; x < 64; ++x) + { + got = get_readback_uint(&rb, 64 * y + x, 0, 0); + expected = 64 * y + x % 32; + + if (got != expected) + break; + } + if (got != expected) + break; + } + release_resource_readback(&rb); + ok(got == expected, "Got unexpected value 0x%08x at (%u, %u), expected 0x%08x.\n", got, x, y, expected); + + ID3D12Resource_Release(src_texture); + for (i = 0; i < ARRAY_SIZE(dst_buffers); ++i) + ID3D12Resource_Release(dst_buffers[i]); + destroy_test_context(&context); +} + static void test_copy_buffer_texture(void) { D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; @@ -26123,6 +26294,7 @@ START_TEST(d3d12) run_test(test_instance_id); run_test(test_vertex_id); run_test(test_copy_texture); + run_test(test_copy_texture_buffer); run_test(test_copy_buffer_texture); run_test(test_separate_bindings); run_test(test_face_culling); -- 2.19.2

1 0

[PATCH vkd3d 07/11] vkd3d: Fix copying texture regions from textures to buffers.
by Józef Kucia 14 Mar '19

14 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index fec7d59062af..4cd64b030249 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2526,6 +2526,37 @@ static void vk_buffer_image_copy_from_d3d12(VkBufferImageCopy *copy, } } +static void vk_image_buffer_copy_from_d3d12(VkBufferImageCopy *copy, + const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *footprint, unsigned int sub_resource_idx, + const D3D12_RESOURCE_DESC *image_desc, const struct vkd3d_format *format, + const D3D12_BOX *src_box, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) +{ + copy->bufferOffset = footprint->Offset; + copy->bufferOffset += (dst_x / format->block_width) * format->byte_count * format->block_byte_count; + copy->bufferOffset += dst_y * footprint->Footprint.RowPitch; + copy->bufferOffset += dst_z * footprint->Footprint.RowPitch * footprint->Footprint.Depth; + copy->bufferRowLength = footprint->Footprint.RowPitch / + (format->byte_count * format->block_byte_count) * format->block_width; + copy->bufferImageHeight = footprint->Footprint.Height; + vk_image_subresource_layers_from_d3d12(&copy->imageSubresource, + format, sub_resource_idx, image_desc->MipLevels); + copy->imageOffset.x = src_box ? src_box->left : 0; + copy->imageOffset.y = src_box ? src_box->top : 0; + copy->imageOffset.z = src_box ? src_box->front : 0; + if (src_box) + { + copy->imageExtent.width = src_box->right - src_box->left; + copy->imageExtent.height = src_box->bottom - src_box->top; + copy->imageExtent.depth = src_box->back - src_box->front; + } + else + { + copy->imageExtent.width = footprint->Footprint.Width; + copy->imageExtent.height = footprint->Footprint.Height; + copy->imageExtent.depth = footprint->Footprint.Depth; + } +} + static void vk_image_copy_from_d3d12(VkImageCopy *image_copy, unsigned int src_sub_resource_idx, unsigned int dst_sub_resource_idx, const D3D12_RESOURCE_DESC *src_desc, const D3D12_RESOURCE_DESC *dst_desc, @@ -2723,7 +2754,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic && (dst_format->vk_aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT)) FIXME("Depth-stencil format %#x not fully supported yet.\n", dst_format->dxgi_format); - vk_buffer_image_copy_from_d3d12(&buffer_image_copy, &dst->u.PlacedFootprint, + vk_image_buffer_copy_from_d3d12(&buffer_image_copy, &dst->u.PlacedFootprint, src->u.SubresourceIndex, &src_resource->desc, dst_format, src_box, dst_x, dst_y, dst_z); VK_CALL(vkCmdCopyImageToBuffer(list->vk_command_buffer, src_resource->u.vk_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, -- 2.19.2

1 0

[PATCH vkd3d 06/11] tests: Add more tests for copying data from buffers to textures.
by Józef Kucia 14 Mar '19

14 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 179 ++++++++++++++++++++++++++++++++++++++- tests/d3d12_test_utils.h | 36 ++++++-- 2 files changed, 205 insertions(+), 10 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 654770ac5540..182213610d69 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20654,7 +20654,7 @@ static void test_vertex_id(void) destroy_test_context(&context); } -static void test_copy_texture_region(void) +static void test_copy_texture(void) { D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; ID3D12Resource *src_texture, *dst_texture; @@ -20844,6 +20844,180 @@ static void test_copy_texture_region(void) destroy_test_context(&context); } +static void test_copy_buffer_texture(void) +{ + D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; + ID3D12GraphicsCommandList *command_list; + struct test_context_desc desc; + struct test_context context; + struct resource_readback rb; + ID3D12Resource *zero_buffer; + ID3D12Resource *dst_texture; + ID3D12Resource *src_buffer; + unsigned int got, expected; + ID3D12CommandQueue *queue; + unsigned int buffer_size; + ID3D12Device *device; + unsigned int x, y, z; + unsigned int *ptr; + unsigned int i; + D3D12_BOX box; + HRESULT hr; + + memset(&desc, 0, sizeof(desc)); + desc.no_render_target = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + buffer_size = 128 * 128 * 128; + + zero_buffer = create_upload_buffer(device, buffer_size * sizeof(*ptr) + D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT, NULL); + hr = ID3D12Resource_Map(zero_buffer, 0, NULL, (void **)&ptr); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + memset(ptr, 0, buffer_size * sizeof(*ptr) + D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT); + for (i = 0; i < D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT / sizeof(*ptr); ++i) + ptr[i] = 0xdeadbeef; + ID3D12Resource_Unmap(zero_buffer, 0, NULL); + + src_buffer = create_upload_buffer(device, buffer_size * sizeof(*ptr), NULL); + hr = ID3D12Resource_Map(src_buffer, 0, NULL, (void **)&ptr); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + for (z = 0; z < 128; ++z) + { + for (y = 0; y < 128; ++y) + { + for (x = 0; x < 128; ++x) + { + ptr[z * 128 * 128 + y * 128 + x] = (z + 1) << 16 | (y + 1) << 8 | (x + 1); + } + } + } + ID3D12Resource_Unmap(src_buffer, 0, NULL); + + dst_texture = create_default_texture3d(device, 128, 128, 128, 2, + DXGI_FORMAT_R32_UINT, 0, D3D12_RESOURCE_STATE_COPY_DEST); + + dst_location.pResource = dst_texture; + dst_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; + dst_location.SubresourceIndex = 0; + + src_location.pResource = zero_buffer; + src_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT; + src_location.PlacedFootprint.Offset = D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT; + src_location.PlacedFootprint.Footprint.Format = DXGI_FORMAT_R32_UINT; + src_location.PlacedFootprint.Footprint.Width = 128; + src_location.PlacedFootprint.Footprint.Height = 128; + src_location.PlacedFootprint.Footprint.Depth = 128; + src_location.PlacedFootprint.Footprint.RowPitch = 128 * sizeof(*ptr); + + /* fill with 0 */ + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 0, 0, &src_location, NULL); + + src_location.pResource = src_buffer; + src_location.PlacedFootprint.Offset = 0; + + /* copy region 1 */ + set_box(&box, 64, 16, 8, 128, 128, 128); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 64, 16, 8, &src_location, &box); + + /* empty boxes */ + for (z = 0; z < 2; ++z) + { + for (y = 0; y < 4; ++y) + { + for (x = 0; x < 8; ++x) + { + set_box(&box, x, y, z, x, y, z); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 0, 0, &src_location, &box); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, x, y, z, &src_location, &box); + } + } + } + + /* copy region 2 */ + set_box(&box, 0, 0, 0, 4, 4, 4); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 2, 2, 2, &src_location, &box); + + /* fill sub-resource 1 */ + dst_location.SubresourceIndex = 1; + set_box(&box, 0, 0, 0, 64, 64, 64); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 0, 0, &src_location, &box); + + transition_resource_state(command_list, dst_texture, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + got = expected = 0; + get_texture_readback_with_command_list(dst_texture, 0, &rb, queue, command_list); + for (z = 0; z < 128; ++z) + { + for (y = 0; y < 128; ++y) + { + for (x = 0; x < 128; ++x) + { + got = get_readback_uint(&rb, x, y, z); + + if (2 <= x && x < 6 && 2 <= y && y < 6 && 2 <= z && z < 6) + expected = (z - 1) << 16 | (y - 1) << 8 | (x - 1); /* copy region 1 */ + else if (64 <= x && 16 <= y && 8 <= z) + expected = (z + 1) << 16 | (y + 1) << 8 | (x + 1); /* copy region 2 */ + else + expected = 0; + + if (got != expected) + break; + } + if (got != expected) + break; + } + if (got != expected) + break; + } + release_resource_readback(&rb); + ok(got == expected, + "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", + got, x, y, z, expected); + + reset_command_list(command_list, context.allocator); + got = expected = 0; + get_texture_readback_with_command_list(dst_texture, 1, &rb, queue, command_list); + for (z = 0; z < 64; ++z) + { + for (y = 0; y < 64; ++y) + { + for (x = 0; x < 64; ++x) + { + got = get_readback_uint(&rb, x, y, z); + expected = (z + 1) << 16 | (y + 1) << 8 | (x + 1); + + if (got != expected) + break; + } + if (got != expected) + break; + } + if (got != expected) + break; + } + release_resource_readback(&rb); + ok(got == expected, + "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", + got, x, y, z, expected); + + ID3D12Resource_Release(dst_texture); + ID3D12Resource_Release(src_buffer); + ID3D12Resource_Release(zero_buffer); + destroy_test_context(&context); +} + static void test_separate_bindings(void) { ID3D12Resource *cs_raw_buffer, *cs_raw_uav_buffer; @@ -25948,7 +26122,8 @@ START_TEST(d3d12) run_test(test_dispatch_zero_thread_groups); run_test(test_instance_id); run_test(test_vertex_id); - run_test(test_copy_texture_region); + run_test(test_copy_texture); + run_test(test_copy_buffer_texture); run_test(test_separate_bindings); run_test(test_face_culling); run_test(test_multithread_command_queue_exec); diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 53fa0e763ea3..0ea5a75544b3 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -301,7 +301,7 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi rb->width = max(1, resource_desc.Width >> miplevel); rb->height = max(1, resource_desc.Height >> miplevel); rb->depth = resource_desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D - ? resource_desc.DepthOrArraySize : 1; + ? max(1, resource_desc.DepthOrArraySize >> miplevel) : 1; rb->row_pitch = align(rb->width * format_size(resource_desc.Format), D3D12_TEXTURE_DATA_PITCH_ALIGNMENT); rb->data = NULL; @@ -429,25 +429,26 @@ static inline void check_sub_resource_uint_(unsigned int line, ID3D12Resource *t release_resource_readback(&rb); } -#define create_default_texture(a, b, c, d, e, f) create_default_texture2d_(__LINE__, a, b, c, 1, 1, d, e, f) -#define create_default_texture2d(a, b, c, d, e, f, g, h) create_default_texture2d_(__LINE__, a, b, c, d, e, f, g, h) -static ID3D12Resource *create_default_texture2d_(unsigned int line, ID3D12Device *device, - unsigned int width, unsigned int height, unsigned int array_size, unsigned int miplevel_count, - DXGI_FORMAT format, D3D12_RESOURCE_FLAGS flags, D3D12_RESOURCE_STATES initial_state) +static ID3D12Resource *create_default_texture_(unsigned int line, ID3D12Device *device, + D3D12_RESOURCE_DIMENSION dimension, unsigned int width, unsigned int height, + unsigned int depth_or_array_size, unsigned int miplevel_count, DXGI_FORMAT format, + D3D12_RESOURCE_FLAGS flags, D3D12_RESOURCE_STATES initial_state) { D3D12_HEAP_PROPERTIES heap_properties; D3D12_RESOURCE_DESC resource_desc; ID3D12Resource *texture; HRESULT hr; + assert(dimension != D3D12_RESOURCE_DIMENSION_BUFFER); + memset(&heap_properties, 0, sizeof(heap_properties)); heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; memset(&resource_desc, 0, sizeof(resource_desc)); - resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Dimension = dimension; resource_desc.Width = width; resource_desc.Height = height; - resource_desc.DepthOrArraySize = array_size; + resource_desc.DepthOrArraySize = depth_or_array_size; resource_desc.MipLevels = miplevel_count; resource_desc.Format = format; resource_desc.SampleDesc.Count = 1; @@ -459,6 +460,25 @@ static ID3D12Resource *create_default_texture2d_(unsigned int line, ID3D12Device return texture; } +#define create_default_texture(a, b, c, d, e, f) create_default_texture2d_(__LINE__, a, b, c, 1, 1, d, e, f) +#define create_default_texture2d(a, b, c, d, e, f, g, h) create_default_texture2d_(__LINE__, a, b, c, d, e, f, g, h) +static ID3D12Resource *create_default_texture2d_(unsigned int line, ID3D12Device *device, + unsigned int width, unsigned int height, unsigned int array_size, unsigned int miplevel_count, + DXGI_FORMAT format, D3D12_RESOURCE_FLAGS flags, D3D12_RESOURCE_STATES initial_state) +{ + return create_default_texture_(line, device, D3D12_RESOURCE_DIMENSION_TEXTURE2D, + width, height, array_size, miplevel_count, format, flags, initial_state); +} + +#define create_default_texture3d(a, b, c, d, e, f, g, h) create_default_texture3d_(__LINE__, a, b, c, d, e, f, g, h) +static inline ID3D12Resource *create_default_texture3d_(unsigned int line, ID3D12Device *device, + unsigned int width, unsigned int height, unsigned int depth, unsigned int miplevel_count, + DXGI_FORMAT format, D3D12_RESOURCE_FLAGS flags, D3D12_RESOURCE_STATES initial_state) +{ + return create_default_texture_(line, device, D3D12_RESOURCE_DIMENSION_TEXTURE3D, + width, height, depth, miplevel_count, format, flags, initial_state); +} + static HRESULT create_root_signature(ID3D12Device *device, const D3D12_ROOT_SIGNATURE_DESC *desc, ID3D12RootSignature **root_signature) { -- 2.19.2

1 0

[PATCH] [PATCH v3] gdi32: add D3DKMTCloseAdapter stub
by Louis Lenders 14 Mar '19

14 Mar '19

v3: fix some issues with the declaration of the parameter and add prototype to d3dkmthk.h >While you're at it, could you also do the same for >D3DKMTOpenAdapterFromHdc() and D3DKMTEscape()? If this one is ok, I`ll send updates for those later. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=46571 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/gdi32/driver.c | 13 +++++++++++++ dlls/gdi32/gdi32.spec | 1 + include/d3dukmdt.h | 2 ++ include/ddk/d3dkmthk.h | 6 ++++++ 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index 405afb986f..e8aa38edf4 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -6,7 +6,7 @@ @ stub D3DKMTCheckOcclusion @ stub D3DKMTCheckSharedResourceAccess @ stub D3DKMTCheckVidPnExclusiveOwnership -@ stub D3DKMTCloseAdapter +@ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTConfigureSharedResource @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateAllocation2 diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 8920b73f59..fd25f7d713 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -26,12 +26,16 @@ #include <stdarg.h> #include <string.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "ddrawgdi.h" #include "wine/winbase16.h" #include "winuser.h" #include "winternl.h" +#include "ddk/d3dkmthk.h" #include "gdi_private.h" #include "wine/unicode.h" @@ -1253,3 +1257,12 @@ NTSTATUS WINAPI D3DKMTEscape( const void *pData ) FIXME("(%p): stub\n", pData); return STATUS_NO_MEMORY; } + +/****************************************************************************** + * D3DKMTCloseAdapter [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *data ) +{ + FIXME("(%p): stub\n", data); + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 2dc8f0e887..6e8f0285f4 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -80,6 +80,7 @@ @ stdcall CreateScalableFontResourceA(long str str str) @ stdcall CreateScalableFontResourceW(long wstr wstr wstr) @ stdcall CreateSolidBrush(long) +@ stdcall D3DKMTCloseAdapter(ptr) @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) diff --git a/include/d3dukmdt.h b/include/d3dukmdt.h index a7be710ef1..ce2b0c2488 100644 --- a/include/d3dukmdt.h +++ b/include/d3dukmdt.h @@ -25,6 +25,8 @@ ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) #endif /* MAKEFOURCC */ +typedef UINT D3DKMT_HANDLE; + typedef enum _D3DDDIFORMAT { D3DDDIFMT_UNKNOWN = 0, diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 80c0c8a27e..bfa77da7d4 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -34,6 +34,11 @@ typedef struct _D3DKMT_CREATEDCFROMMEMORY HANDLE hBitmap; } D3DKMT_CREATEDCFROMMEMORY; +typedef struct _D3DKMT_CLOSEADAPTER +{ + D3DKMT_HANDLE hAdapter; +} D3DKMT_CLOSEADAPTER; + typedef struct _D3DKMT_DESTROYDCFROMMEMORY { HDC hDc; @@ -45,6 +50,7 @@ extern "C" { #endif /* __cplusplus */ +NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *data); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); -- 2.20.1

2 1

[PATCH v4] gdi32: Add D3DKMTCloseAdapter() stub.
by Huw Davies 14 Mar '19

14 Mar '19

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=46571 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/gdi32/driver.c | 13 +++++++++++++ dlls/gdi32/gdi32.spec | 1 + include/d3dukmdt.h | 2 ++ include/ddk/d3dkmthk.h | 6 ++++++ 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index 405afb986f..e8aa38edf4 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -6,7 +6,7 @@ @ stub D3DKMTCheckOcclusion @ stub D3DKMTCheckSharedResourceAccess @ stub D3DKMTCheckVidPnExclusiveOwnership -@ stub D3DKMTCloseAdapter +@ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTConfigureSharedResource @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateAllocation2 diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 8920b73f59..054d7cf418 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -26,12 +26,16 @@ #include <stdarg.h> #include <string.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "ddrawgdi.h" #include "wine/winbase16.h" #include "winuser.h" #include "winternl.h" +#include "ddk/d3dkmthk.h" #include "gdi_private.h" #include "wine/unicode.h" @@ -1253,3 +1257,12 @@ NTSTATUS WINAPI D3DKMTEscape( const void *pData ) FIXME("(%p): stub\n", pData); return STATUS_NO_MEMORY; } + +/****************************************************************************** + * D3DKMTCloseAdapter [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) +{ + FIXME("(%p): stub\n", desc); + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 2dc8f0e887..6e8f0285f4 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -80,6 +80,7 @@ @ stdcall CreateScalableFontResourceA(long str str str) @ stdcall CreateScalableFontResourceW(long wstr wstr wstr) @ stdcall CreateSolidBrush(long) +@ stdcall D3DKMTCloseAdapter(ptr) @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) diff --git a/include/d3dukmdt.h b/include/d3dukmdt.h index a7be710ef1..ce2b0c2488 100644 --- a/include/d3dukmdt.h +++ b/include/d3dukmdt.h @@ -25,6 +25,8 @@ ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) #endif /* MAKEFOURCC */ +typedef UINT D3DKMT_HANDLE; + typedef enum _D3DDDIFORMAT { D3DDDIFMT_UNKNOWN = 0, diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 80c0c8a27e..0000b2f653 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -21,6 +21,11 @@ #include <d3dukmdt.h> +typedef struct _D3DKMT_CLOSEADAPTER +{ + D3DKMT_HANDLE hAdapter; +} D3DKMT_CLOSEADAPTER; + typedef struct _D3DKMT_CREATEDCFROMMEMORY { void *pMemory; @@ -45,6 +50,7 @@ extern "C" { #endif /* __cplusplus */ +NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); -- 2.18.0

1 0

[PATCH] gdi32: Remove unused return value of init_system_links()
by Michael Stefaniuc 14 Mar '19

14 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/freetype.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 098faff342..2808435588 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2568,10 +2568,9 @@ static void populate_system_links(const WCHAR *name, const WCHAR *const *values) /************************************************************* * init_system_links */ -static BOOL init_system_links(void) +static void init_system_links(void) { HKEY hkey; - BOOL ret = FALSE; DWORD type, max_val, max_data, val_len, data_len, index; WCHAR *value, *data; WCHAR *entry, *next; @@ -2717,7 +2716,6 @@ skip_internal: } } list_add_tail(&system_links, &system_font_link->entry); - return ret; } static BOOL ReadFontDir(const char *dirname, BOOL external_fonts) -- 2.20.1

2 1

[PATCH] ws2_32: Handle EISCONN from sendmsg
by Rob Hughes 14 Mar '19

14 Mar '19

When calling sendmsg on a socket that's already connected, some implementations will return EISCONN if you specify a recipient (notably, Darwin/OSX with UDP connections). Newer versions of Linux and Windows will simply ignore the destination parameter. Signed-off-by: Rob Hughes <rbhughes+wine(a)gmail.com> --- dlls/ws2_32/socket.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3755338ee8..c75a7047ce 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2628,6 +2628,11 @@ static int WS2_send( int fd, struct ws2_async *wsa, int flags ) while ((ret = sendmsg(fd, &hdr, flags)) == -1) { + if (errno == EISCONN) { + hdr.msg_name = 0; + hdr.msg_namelen = 0; + continue; + } if (errno != EINTR) return -1; } -- 2.19.1

2 1

[PATCH 1/6] quartz/tests: Fix static link to GetTickCount64().
by Zebediah Figura 14 Mar '19

14 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/systemclock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index 258e19808f..9dae754b58 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -74,7 +74,7 @@ static void test_get_time(void) hr = IReferenceClock_GetTime(clock, &time1); if (pGetTickCount64) - time2 = GetTickCount64() * 10000; + time2 = pGetTickCount64() * 10000; else time2 = GetTickCount() * 10000; ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.20.1

2 9

[PATCH] dbghelp: Make SymGetLineFromAddrW64 call SymGetLineFromAddrW64
by Alistair Leslie-Hughes 14 Mar '19

14 Mar '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/symbol.c | 96 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 70 insertions(+), 26 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 96a1f87..c93c412 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1479,6 +1479,48 @@ BOOL symt_fill_func_line_info(const struct module* module, const struct symt_fun if (found) { line->FileName = (char*)source_get(module, dli->u.source_file); + + return TRUE; + } + } + return FALSE; +} + +/****************************************************************** + * sym_fill_func_line_info64W + * + * fills information about a file + */ +static BOOL symt_fill_func_line_info64W(const struct module* module, const struct symt_function* func, + DWORD64 addr, IMAGEHLP_LINEW64* line) +{ + struct line_info* dli = NULL; + BOOL found = FALSE; + int i; + + assert(func->symt.tag == SymTagFunction); + + for (i=vector_length(&func->vlines)-1; i>=0; i--) + { + dli = vector_at(&func->vlines, i); + if (!dli->is_source_file) + { + if (found || dli->u.pc_offset > addr) continue; + line->LineNumber = dli->line_number; + line->Address = dli->u.pc_offset; + line->Key = dli; + found = TRUE; + continue; + } + if (found) + { + char *filename = (char*)source_get(module, dli->u.source_file); + int len = lstrlenA(filename)+1; + + line->FileName = fetch_buffer(module->process, len * sizeof(WCHAR)); + + MultiByteToWideChar(CP_ACP, 0, filename, -1, line->FileName, len); + return TRUE; } } @@ -1548,16 +1590,17 @@ static void copy_line_64_from_32(IMAGEHLP_LINE64* l64, const IMAGEHLP_LINE* l32) * copy_line_W64_from_32 (internal) * */ -static void copy_line_W64_from_64(struct process* pcs, IMAGEHLP_LINEW64* l64w, const IMAGEHLP_LINE64* l64) +static void copy_line_64_from_W64(struct process* pcs, IMAGEHLP_LINE64* l64, const IMAGEHLP_LINEW64* l64w) { - unsigned len; + char path[MAX_PATH]; + unsigned len = WideCharToMultiByte(CP_ACP, 0, l64w->FileName, -1, path, MAX_PATH, NULL, NULL); - l64w->Key = l64->Key; - l64w->LineNumber = l64->LineNumber; - len = MultiByteToWideChar(CP_ACP, 0, l64->FileName, -1, NULL, 0); - if ((l64w->FileName = fetch_buffer(pcs, len * sizeof(WCHAR)))) - MultiByteToWideChar(CP_ACP, 0, l64->FileName, -1, l64w->FileName, len); - l64w->Address = l64->Address; + l64->Key = l64w->Key; + l64->LineNumber = l64w->LineNumber; + l64->FileName = fetch_buffer(pcs, len + 1); + lstrcpyA(l64->FileName, path); + + l64->Address = l64w->Address; } /****************************************************************** @@ -1596,23 +1639,16 @@ BOOL WINAPI SymGetLineFromAddr(HANDLE hProcess, DWORD dwAddr, BOOL WINAPI SymGetLineFromAddr64(HANDLE hProcess, DWORD64 dwAddr, PDWORD pdwDisplacement, PIMAGEHLP_LINE64 Line) { - struct module_pair pair; - struct symt_ht* symt; + IMAGEHLP_LINEW64 line64; TRACE("%p %s %p %p\n", hProcess, wine_dbgstr_longlong(dwAddr), pdwDisplacement, Line); if (Line->SizeOfStruct < sizeof(*Line)) return FALSE; - pair.pcs = process_find_by_handle(hProcess); - if (!pair.pcs) return FALSE; - pair.requested = module_find_by_addr(pair.pcs, dwAddr, DMT_UNKNOWN); - if (!module_get_debug(&pair)) return FALSE; - if ((symt = symt_find_nearest(pair.effective, dwAddr)) == NULL) return FALSE; - - if (symt->symt.tag != SymTagFunction) return FALSE; - if (!symt_fill_func_line_info(pair.effective, (struct symt_function*)symt, - dwAddr, Line)) return FALSE; - *pdwDisplacement = dwAddr - Line->Address; + line64.SizeOfStruct = sizeof(line64); + if(!SymGetLineFromAddrW64(hProcess, dwAddr, pdwDisplacement, &line64)) + return FALSE; + copy_line_64_from_W64(process_find_by_handle(hProcess), Line, &line64); return TRUE; } @@ -1620,15 +1656,23 @@ BOOL WINAPI SymGetLineFromAddr64(HANDLE hProcess, DWORD64 dwAddr, * SymGetLineFromAddrW64 (DBGHELP.@) * */ -BOOL WINAPI SymGetLineFromAddrW64(HANDLE hProcess, DWORD64 dwAddr, +BOOL WINAPI SymGetLineFromAddrW64(HANDLE hProcess, DWORD64 dwAddr, PDWORD pdwDisplacement, PIMAGEHLP_LINEW64 Line) { - IMAGEHLP_LINE64 il64; + struct module_pair pair; + struct symt_ht* symt; + + pair.pcs = process_find_by_handle(hProcess); + if (!pair.pcs) return FALSE; + pair.requested = module_find_by_addr(pair.pcs, dwAddr, DMT_UNKNOWN); + if (!module_get_debug(&pair)) return FALSE; + if ((symt = symt_find_nearest(pair.effective, dwAddr)) == NULL) return FALSE; + + if (symt->symt.tag != SymTagFunction) return FALSE; + if (!symt_fill_func_line_info64W(pair.effective, (struct symt_function*)symt, + dwAddr, Line)) return FALSE; + *pdwDisplacement = dwAddr - Line->Address; - il64.SizeOfStruct = sizeof(il64); - if (!SymGetLineFromAddr64(hProcess, dwAddr, pdwDisplacement, &il64)) - return FALSE; - copy_line_W64_from_64(process_find_by_handle(hProcess), Line, &il64); return TRUE; } -- 1.9.1

2 1

[PATCH] comsvcs/tests: Fix a typo in an ok() message.
by Francois Gouget 14 Mar '19

14 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/comsvcs/tests/dispenser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comsvcs/tests/dispenser.c b/dlls/comsvcs/tests/dispenser.c index 7af38d05a58..98d2a91bf5a 100644 --- a/dlls/comsvcs/tests/dispenser.c +++ b/dlls/comsvcs/tests/dispenser.c @@ -70,7 +70,7 @@ static HRESULT WINAPI driver_QueryInterface(IDispenserDriver *iface, REFIID riid return S_OK; } - ok(0, "Unknown iterface %s\n", wine_dbgstr_guid(riid)); + ok(0, "Unknown interface %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } -- 2.20.1

2 1

[PATCH] setupapi/tests: Add a trailing '\n' to a couple of ok() calls.
by Francois Gouget 14 Mar '19

14 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/setupapi/tests/devinst.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 0f27783d87a..004a9564014 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -63,13 +63,13 @@ static void test_create_device_list_ex(void) "Got unexpected error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); - ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoListExW(NULL, NULL, empty, NULL); - ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); -- 2.20.1

2 1

[PATCH] dbghelp: Spelling fixes in a couple of comments.
by Francois Gouget 14 Mar '19

14 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dbghelp/symbol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 96a1f8743c4..f59e322fef2 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -850,7 +850,7 @@ static void symt_get_length(struct module* module, const struct symt* symt, ULON *size = 0x1000; /* arbitrary value */ } -/* neede by symt_find_nearest */ +/* needed by symt_find_nearest */ static int symt_get_best_at(struct module* module, int idx_sorttab) { ULONG64 ref_addr; @@ -870,7 +870,7 @@ static int symt_get_best_at(struct module* module, int idx_sorttab) !cmp_sorttab_addr(module, idx_sorttab + 1, ref_addr)) idx_sorttab++; } - /* if no better symbol fond restore original */ + /* if no better symbol was found restore the original */ if (module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol) idx_sorttab = idx_sorttab_orig; } -- 2.20.1

1 0

[PATCH] vbscript/tests: A spelling fix in a comment.
by Francois Gouget 14 Mar '19

14 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/vbscript/tests/lang.vbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 9f1d24c5400..afd7c241ed5 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1366,7 +1366,7 @@ end sub call test_identifiers() sub test_dotIdentifiers - ' test keywords that can also be an indentifier after a dot + ' test keywords that can also be an identifier after a dot ' Call ok(testObj.rem = 10, "testObj.rem = " & testObj.rem & " expected 10") Call ok(testObj.true = 10, "testObj.true = " & testObj.true & " expected 10") Call ok(testObj.false = 10, "testObj.false = " & testObj.false & " expected 10") -- 2.20.1

1 0

[PATCH] vssapi: A spelling fix in a variable name.
by Francois Gouget 14 Mar '19

14 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/vsbackup.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/vsbackup.idl b/include/vsbackup.idl index b2dca11f8fe..d2d8795ce41 100644 --- a/include/vsbackup.idl +++ b/include/vsbackup.idl @@ -63,7 +63,7 @@ interface IVssBackupComponents : IUnknown HRESULT GetWriterStatus([in] UINT index, [out] VSS_ID *instance, [out] VSS_ID *id, [out] BSTR *writer, [out] VSS_WRITER_STATE *status, [out] HRESULT *failure); HRESULT SetBackupSucceeded([in] VSS_ID instance, [in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, - [in] LPCWSTR path, [in] LPCWSTR name, [in] BOOL succeded); + [in] LPCWSTR path, [in] LPCWSTR name, [in] BOOL succeeded); HRESULT SetBackupOptions([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, [in] LPCWSTR name, [in] LPCWSTR options); HRESULT SetSelectedForRestore([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, -- 2.20.1

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel