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

[PATCH vkd3d v2] tests: Add tests for sample_b and sample_d instructions.
by Józef Kucia 02 Aug '19

02 Aug '19

From: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: Merge test_sample_instructions() and test_texture(). --- tests/d3d12.c | 272 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 234 insertions(+), 38 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 80f3f2d3093d..2e83d1671919 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -12171,21 +12171,27 @@ static void test_root_constants(void) destroy_test_context(&context); } -static void test_texture(void) +static void test_sample_instructions(void) { + ID3D12DescriptorHeap *heap, *sampler_heap, *heaps[2]; + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_DESCRIPTOR_RANGE descriptor_range[2]; + D3D12_ROOT_PARAMETER root_parameters[3]; ID3D12GraphicsCommandList *command_list; D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle; + D3D12_SAMPLER_DESC sampler_desc; struct test_context_desc desc; struct resource_readback rb; struct test_context context; unsigned int x_step, y_step; - ID3D12DescriptorHeap *heap; ID3D12CommandQueue *queue; ID3D12Resource *texture; unsigned int i, x, y; + ID3D12Device *device; + HRESULT hr; - static const DWORD ps_code[] = + static const DWORD ps_sample_code[] = { #if 0 Texture2D t; @@ -12195,12 +12201,12 @@ static void test_texture(void) { float2 p; - p.x = position.x / 32.0f; - p.y = position.y / 32.0f; + p.x = position.x / 640.0f; + p.y = position.y / 480.0f; return t.Sample(s, p); } #endif - 0x43425844, 0x7a0c3929, 0x75ff3ca4, 0xccb318b2, 0xe6965b4c, 0x00000001, 0x00000140, 0x00000003, + 0x43425844, 0xd48f8d1c, 0x91689a9a, 0x99683e50, 0xae5e3efd, 0x00000001, 0x00000140, 0x00000003, 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, @@ -12208,11 +12214,72 @@ static void test_texture(void) 0x00000029, 0x0100086a, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002, - 0x3d000000, 0x3d000000, 0x00000000, 0x00000000, 0x8b000045, 0x800000c2, 0x00155543, 0x001020f2, + 0x3acccccd, 0x3b088889, 0x00000000, 0x00000000, 0x8b000045, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; - static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + static const D3D12_SHADER_BYTECODE ps_sample = {ps_sample_code, sizeof(ps_sample_code)}; + static const DWORD ps_sample_b_code[] = + { +#if 0 + Texture2D t; + SamplerState s; + + float bias; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + float2 p; + + p.x = position.x / 640.0f; + p.y = position.y / 480.0f; + return t.SampleBias(s, p, bias); + } +#endif + 0x43425844, 0xc39b0686, 0x8244a7fc, 0x14c0b97a, 0x2900b3b7, 0x00000001, 0x00000150, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000b4, 0x00000040, + 0x0000002d, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300005a, 0x00106000, 0x00000000, + 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0a000038, 0x00100032, 0x00000000, + 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x00000000, 0x00000000, 0x0c00004a, + 0x001020f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, + 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_sample_b = {ps_sample_b_code, sizeof(ps_sample_b_code)}; + static const DWORD ps_sample_d_code[] = + { +#if 0 + Texture2D t; + SamplerState s; + + float4 dd; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + float2 p; + + p.x = position.x / 640.0f; + p.y = position.y / 480.0f; + return t.SampleGrad(s, p, float2(dd.x, dd.y), float2(dd.z, dd.w)); + } +#endif + 0x43425844, 0xecc423bc, 0x3742699c, 0xf08f6dd7, 0x9976ad55, 0x00000001, 0x00000168, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000cc, 0x00000050, + 0x00000033, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300005a, 0x00106000, + 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0a000038, 0x00100032, + 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x00000000, 0x00000000, + 0x91000049, 0x800000c2, 0x00155543, 0x001020f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, + 0x00000000, 0x00106000, 0x00000000, 0x00208046, 0x00000000, 0x00000000, 0x00208ae6, 0x00000000, + 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_sample_d = {ps_sample_d_code, sizeof(ps_sample_d_code)}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; static const unsigned int r8g8b8a8_data[] = { 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, @@ -12234,85 +12301,213 @@ static void test_texture(void) 0xff000000, 0xf0000000, 0x0f000000, 0xff000000, 0xfa000000, 0xfe000000, 0xaa000000, 0xcc000000, }; - static const struct + static const unsigned int rgba_level_0[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + static const unsigned int rgba_level_1[] = + { + 0xffffffff, 0xff0000ff, + 0xff000000, 0xff00ff00, + }; + static const unsigned int rgba_level_2[] = + { + 0xffff0000, + }; + static const unsigned int level_1_colors[] = + { + 0xffffffff, 0xffffffff, 0xff0000ff, 0xff0000ff, + 0xffffffff, 0xffffffff, 0xff0000ff, 0xff0000ff, + 0xff000000, 0xff000000, 0xff00ff00, 0xff00ff00, + 0xff000000, 0xff000000, 0xff00ff00, 0xff00ff00, + }; + static const unsigned int level_2_colors[] = + { + 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, + 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, + 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, + 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, + }; + struct texture { unsigned int width; unsigned int height; + unsigned int miplevel_count; + unsigned int array_size; DXGI_FORMAT format; - D3D12_SUBRESOURCE_DATA data; - const unsigned int *expected_data; - } - tests[] = + D3D12_SUBRESOURCE_DATA data[3]; + }; + static const struct texture r8g8b8a8_texture = { + 4, 4, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM, { - 4, 4, DXGI_FORMAT_R8G8B8A8_UNORM, {r8g8b8a8_data, 4 * sizeof(*r8g8b8a8_data), 16 * sizeof(*r8g8b8a8_data)}, - r8g8b8a8_data, }, + }; + static const struct texture a8_texture = + { + 4, 4, 1, 1, DXGI_FORMAT_A8_UNORM, { - 4, 4, DXGI_FORMAT_A8_UNORM, {a8_data, 4 * sizeof(*a8_data), 16 * sizeof(*a8_data)}, - a8_expected_data, }, }; + static const struct texture rgba_texture = + { + 4, 4, 3, 1, DXGI_FORMAT_R8G8B8A8_UNORM, + { + {rgba_level_0, 4 * sizeof(*rgba_level_0), 0}, + {rgba_level_1, 2 * sizeof(*rgba_level_1), 0}, + {rgba_level_2, sizeof(*rgba_level_2), 0}, + }, + }; + static const struct + { + const D3D12_SHADER_BYTECODE *ps_code; + const struct texture *texture; + float lod_bias; + float min_lod; + float max_lod; + float ps_constants[4]; + const unsigned int *expected_data; + } + tests[] = + { +#define MIP_MAX D3D12_FLOAT32_MAX + {&ps_sample, &r8g8b8a8_texture, 0.0f, 0.0f, MIP_MAX, {0.0f}, r8g8b8a8_data}, + {&ps_sample, &a8_texture, 0.0f, 0.0f, MIP_MAX, {0.0f}, a8_expected_data}, + {&ps_sample_b, &r8g8b8a8_texture, 0.0f, 0.0f, MIP_MAX, {0.0f}, r8g8b8a8_data}, + {&ps_sample_b, &a8_texture, 0.0f, 0.0f, MIP_MAX, {0.0f}, a8_expected_data}, + {&ps_sample_b, &rgba_texture, 0.0f, 0.0f, MIP_MAX, {0.0f}, rgba_level_0}, + {&ps_sample_b, &rgba_texture, 8.0f, 0.0f, MIP_MAX, {0.0f}, level_1_colors}, + {&ps_sample_b, &rgba_texture, 0.0f, 0.0f, MIP_MAX, {8.0f}, level_1_colors}, + {&ps_sample_b, &rgba_texture, 0.0f, 0.0f, MIP_MAX, {8.4f}, level_1_colors}, + {&ps_sample_b, &rgba_texture, 0.0f, 0.0f, MIP_MAX, {8.5f}, level_2_colors}, + {&ps_sample_b, &rgba_texture, 0.0f, 0.0f, MIP_MAX, {9.0f}, level_2_colors}, + {&ps_sample_b, &rgba_texture, 0.0f, 0.0f, 2.0f, {1.0f}, rgba_level_0}, + {&ps_sample_b, &rgba_texture, 0.0f, 0.0f, 2.0f, {9.0f}, level_2_colors}, + {&ps_sample_b, &rgba_texture, 0.0f, 0.0f, 1.0f, {9.0f}, level_1_colors}, + {&ps_sample_b, &rgba_texture, 0.0f, 0.0f, 0.0f, {9.0f}, rgba_level_0}, + {&ps_sample_d, &r8g8b8a8_texture, 0.0f, 0.0f, MIP_MAX, {0.0f, 0.0f, 0.0f, 0.0f}, r8g8b8a8_data}, + {&ps_sample_d, &a8_texture, 0.0f, 0.0f, MIP_MAX, {0.0f, 0.0f, 0.0f, 0.0f}, a8_expected_data}, + {&ps_sample_d, &rgba_texture, 0.0f, 0.0f, MIP_MAX, {0.0f, 0.0f, 0.0f, 0.0f}, rgba_level_0}, + {&ps_sample_d, &rgba_texture, 0.0f, 0.0f, MIP_MAX, {0.3f, 0.0f, 0.0f, 0.0f}, rgba_level_0}, + {&ps_sample_d, &rgba_texture, 0.0f, 0.0f, MIP_MAX, {0.4f, 0.0f, 0.0f, 0.0f}, level_1_colors}, + {&ps_sample_d, &rgba_texture, 0.0f, 0.0f, MIP_MAX, {1.0f, 0.0f, 0.0f, 0.0f}, level_2_colors}, +#undef MIP_MAX + }; memset(&desc, 0, sizeof(desc)); - desc.rt_width = desc.rt_height = 32; + desc.rt_width = 640; + desc.rt_height = 480; desc.no_root_signature = true; if (!init_test_context(&context, &desc)) return; + device = context.device; command_list = context.list; queue = context.queue; - context.root_signature = create_texture_root_signature(context.device, - D3D12_SHADER_VISIBILITY_PIXEL, 0, 0); - context.pipeline_state = create_pipeline_state(context.device, - context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL); + descriptor_range[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; + descriptor_range[0].NumDescriptors = 1; + descriptor_range[0].BaseShaderRegister = 0; + descriptor_range[0].RegisterSpace = 0; + descriptor_range[0].OffsetInDescriptorsFromTableStart = 0; + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 1; + root_parameters[0].DescriptorTable.pDescriptorRanges = &descriptor_range[0]; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; - heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + descriptor_range[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER; + descriptor_range[1].NumDescriptors = 1; + descriptor_range[1].BaseShaderRegister = 0; + descriptor_range[1].RegisterSpace = 0; + descriptor_range[1].OffsetInDescriptorsFromTableStart = 0; + root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[1].DescriptorTable.NumDescriptorRanges = 1; + root_parameters[1].DescriptorTable.pDescriptorRanges = &descriptor_range[1]; + root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; + + root_parameters[2].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS; + root_parameters[2].Constants.ShaderRegister = 0; + root_parameters[2].Constants.RegisterSpace = 0; + root_parameters[2].Constants.Num32BitValues = ARRAY_SIZE(tests->ps_constants); + root_parameters[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; + + memset(&root_signature_desc, 0, sizeof(root_signature_desc)); + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.pParameters = root_parameters; + hr = create_root_signature(device, &root_signature_desc, &context.root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap); gpu_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap); + sampler_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, 1); + for (i = 0; i < ARRAY_SIZE(tests); ++i) { vkd3d_test_set_context("Test %u", i); - texture = create_default_texture(context.device, - tests[i].width, tests[i].height, tests[i].format, 0, D3D12_RESOURCE_STATE_COPY_DEST); - upload_texture_data(texture, &tests[i].data, 1, queue, command_list); - reset_command_list(command_list, context.allocator); + memset(&sampler_desc, 0, sizeof(sampler_desc)); + sampler_desc.Filter = D3D12_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; + sampler_desc.AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; + sampler_desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; + sampler_desc.MipLODBias = tests[i].lod_bias; + sampler_desc.MinLOD = tests[i].min_lod; + sampler_desc.MaxLOD = tests[i].max_lod; + ID3D12Device_CreateSampler(device, &sampler_desc, get_cpu_sampler_handle(&context, sampler_heap, 0)); + if (context.pipeline_state) + ID3D12PipelineState_Release(context.pipeline_state); + context.pipeline_state = create_pipeline_state(device, context.root_signature, + context.render_target_desc.Format, NULL, tests[i].ps_code, NULL); + + texture = create_default_texture2d(device, tests[i].texture->width, tests[i].texture->height, + tests[i].texture->array_size, tests[i].texture->miplevel_count, tests[i].texture->format, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + upload_texture_data(texture, tests[i].texture->data, + tests[i].texture->miplevel_count * tests[i].texture->array_size, queue, command_list); + reset_command_list(command_list, context.allocator); transition_resource_state(command_list, texture, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); - ID3D12Device_CreateShaderResourceView(context.device, texture, NULL, cpu_handle); + ID3D12Device_CreateShaderResourceView(device, texture, NULL, cpu_handle); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, red, 0, NULL); + 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_SetDescriptorHeaps(command_list, 1, &heap); + heaps[0] = heap; heaps[1] = sampler_heap; + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, ARRAY_SIZE(heaps), heaps); ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 1, + get_gpu_sampler_handle(&context, sampler_heap, 0)); ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 2, + ARRAY_SIZE(tests[i].ps_constants), tests[i].ps_constants, 0); ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - x_step = desc.rt_width / tests[i].width; - y_step = desc.rt_height / tests[i].height; + x_step = desc.rt_width / tests[i].texture->width; + y_step = desc.rt_height / tests[i].texture->height; get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - for (y = 0; y < tests[i].height; ++y) + for (y = 0; y < tests[i].texture->height; ++y) { - for (x = 0; x < tests[i].width; ++x) + for (x = 0; x < tests[i].texture->width; ++x) { unsigned int color = get_readback_uint(&rb, x * x_step + x_step / 2, y * y_step + y_step / 2, 0); - ok(compare_color(color, tests[i].expected_data[tests[i].width * y + x], 1), + ok(compare_color(color, tests[i].expected_data[tests[i].texture->width * y + x], 1), "Got color 0x%08x, expected 0x%08x at (%u, %u).\n", - color, tests[i].expected_data[tests[i].width * y + x], x, y); + color, tests[i].expected_data[tests[i].texture->width * y + x], x, y); } } release_resource_readback(&rb); @@ -12325,6 +12520,7 @@ static void test_texture(void) vkd3d_test_set_context(NULL); ID3D12DescriptorHeap_Release(heap); + ID3D12DescriptorHeap_Release(sampler_heap); destroy_test_context(&context); } @@ -31516,7 +31712,7 @@ START_TEST(d3d12) run_test(test_constant_buffer_relative_addressing); run_test(test_immediate_constant_buffer); run_test(test_root_constants); - run_test(test_texture); + run_test(test_sample_instructions); run_test(test_texture_ld); run_test(test_gather); run_test(test_gather_c); -- 2.21.0

2 1

[PATCH v2] kernel32/tests: Add more debugger tests.
by Jacek Caban 02 Aug '19

02 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 478 ++++++++++++++++++++++++++++++++- 1 file changed, 464 insertions(+), 14 deletions(-)

3 4

[PATCH 1/4] msvcrt: Provide the fmaf function on i386
by Martin Storsjo 02 Aug '19

02 Aug '19

This is one of the new -f suffixed C99 math functions that actually are available on all architectures, even on i386. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- .../api-ms-win-crt-math-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 32 +++++++++---------- dlls/ucrtbase/ucrtbase.spec | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 3a5991f124..bc281ca530 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -242,7 +242,7 @@ @ cdecl floor(double) ucrtbase.floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) ucrtbase.floorf @ cdecl fma(double double double) ucrtbase.fma -@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) ucrtbase.fmaf +@ cdecl fmaf(float float float) ucrtbase.fmaf @ stub fmal @ cdecl fmax(double double) ucrtbase.fmax @ cdecl fmaxf(float float) ucrtbase.fmaxf diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 97072112af..dc887b7f1c 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2165,7 +2165,7 @@ @ cdecl floor(double) MSVCRT_floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) MSVCRT_floorf @ cdecl fma(double double double) MSVCRT_fma -@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) MSVCRT_fmaf +@ cdecl fmaf(float float float) MSVCRT_fmaf @ stub fmal @ cdecl fmax(double double) MSVCR120_fmax @ cdecl fmaxf(float float) MSVCR120_fmaxf diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 9b7727e233..c56d1a92d6 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1831,7 +1831,7 @@ @ cdecl floor(double) msvcr120.floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) msvcr120.floorf @ cdecl fma(double double double) msvcr120.fma -@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) msvcr120.fmaf +@ cdecl fmaf(float float float) msvcr120.fmaf @ stub fmal @ cdecl fmax(double double) msvcr120.fmax @ cdecl fmaxf(float float) msvcr120.fmaxf diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 63744e33e3..c29539e0e2 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -387,22 +387,6 @@ float CDECL MSVCRT_floorf( float x ) return floorf(x); } -/********************************************************************* - * fmaf (MSVCRT.@) - */ -float CDECL MSVCRT_fmaf( float x, float y, float z ) -{ -#ifdef HAVE_FMAF - float w = fmaf(x, y, z); -#else - float w = x * y + z; -#endif - if ((isinf(x) && y == 0) || (x == 0 && isinf(y))) *MSVCRT__errno() = MSVCRT_EDOM; - else if (isinf(x) && isinf(z) && x != z) *MSVCRT__errno() = MSVCRT_EDOM; - else if (isinf(y) && isinf(z) && y != z) *MSVCRT__errno() = MSVCRT_EDOM; - return w; -} - /********************************************************************* * frexpf (MSVCRT.@) */ @@ -895,6 +879,22 @@ double CDECL MSVCRT_fma( double x, double y, double z ) return w; } +/********************************************************************* + * fmaf (MSVCRT.@) + */ +float CDECL MSVCRT_fmaf( float x, float y, float z ) +{ +#ifdef HAVE_FMAF + float w = fmaf(x, y, z); +#else + float w = x * y + z; +#endif + if ((isinf(x) && y == 0) || (x == 0 && isinf(y))) *MSVCRT__errno() = MSVCRT_EDOM; + else if (isinf(x) && isinf(z) && x != z) *MSVCRT__errno() = MSVCRT_EDOM; + else if (isinf(y) && isinf(z) && y != z) *MSVCRT__errno() = MSVCRT_EDOM; + return w; +} + /********************************************************************* * fabs (MSVCRT.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 567f2009eb..e290c14f3b 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2306,7 +2306,7 @@ @ cdecl floor(double) MSVCRT_floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) MSVCRT_floorf @ cdecl fma(double double double) MSVCRT_fma -@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) MSVCRT_fmaf +@ cdecl fmaf(float float float) MSVCRT_fmaf @ stub fmal @ cdecl fmax(double double) MSVCR120_fmax @ cdecl fmaxf(float float) MSVCR120_fmaxf -- 2.17.1

4 11

[PATCH 4/4] winhttp: Set last error for invalid and unimplemented header queries.
by Hans Leidekker 02 Aug '19

02 Aug '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 8 +++++++- dlls/winhttp/tests/winhttp.c | 8 ++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 175837db0b..409ef68b5a 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -746,9 +746,15 @@ static BOOL query_headers( struct request *request, DWORD level, const WCHAR *na return ret; default: - if (attr >= ARRAY_SIZE(attribute_table) || !attribute_table[attr]) + if (attr >= ARRAY_SIZE(attribute_table)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (!attribute_table[attr]) { FIXME("attribute %u not implemented\n", attr); + SetLastError( ERROR_WINHTTP_HEADER_NOT_FOUND ); return FALSE; } TRACE("attribute %s\n", debugstr_w(attribute_table[attr])); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index b07563891b..eb7c7b54f8 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -456,6 +456,14 @@ static void test_WinHttpSendRequest (void) "Expected ERROR_SUCCESS got %u.\n", GetLastError()); ok(ret == TRUE, "WinHttpReceiveResponse failed: %u.\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_ORIG_URI, NULL, NULL, &len, NULL); + ok(!ret && GetLastError() == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_MAX + 1, NULL, NULL, &len, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + bytes_rw = -1; ret = WinHttpReadData(request, buffer, sizeof(buffer) - 1, &bytes_rw); ok(ret == TRUE, "WinHttpReadData failed: %u.\n", GetLastError()); -- 2.20.1

1 0

[PATCH 2/4] winhttp: Implement WINHTTP_QUERY_REQUEST_METHOD.
by Hans Leidekker 02 Aug '19

02 Aug '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 16 ++++++++++++++++ dlls/winhttp/tests/winhttp.c | 26 +++++++++++++++++--------- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 25f7950f2f..0e54168b79 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -729,6 +729,22 @@ static BOOL query_headers( struct request *request, DWORD level, const WCHAR *na *buflen = len; return ret; + case WINHTTP_QUERY_REQUEST_METHOD: + len = strlenW( request->verb ) * sizeof(WCHAR); + if (!buffer || len + sizeof(WCHAR) > *buflen) + { + len += sizeof(WCHAR); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + } + else + { + strcpyW( buffer, request->verb ); + TRACE("returning string: %s\n", debugstr_w(buffer)); + ret = TRUE; + } + *buflen = len; + return ret; + default: if (attr >= ARRAY_SIZE(attribute_table) || !attribute_table[attr]) { diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index dfd3c4dff2..5849257e01 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -81,7 +81,7 @@ static BOOL proxy_active(void) return active; } -static void test_QueryOption(void) +static void test_WinHttpQueryOption(void) { BOOL ret; HINTERNET session, request, connection; @@ -267,7 +267,7 @@ done: ok(ret, "WinHttpCloseHandle failed on closing session: %u\n", GetLastError()); } -static void test_OpenRequest (void) +static void test_WinHttpOpenRequest (void) { BOOL ret; HINTERNET session, request, connection; @@ -362,20 +362,21 @@ static void test_empty_headers_param(void) WinHttpCloseHandle(ses); } -static void test_SendRequest (void) +static void test_WinHttpSendRequest (void) { static const WCHAR content_type[] = {'C','o','n','t','e','n','t','-','T','y','p','e',':',' ','a','p','p','l','i','c','a','t','i','o','n', '/','x','-','w','w','w','-','f','o','r','m','-','u','r','l','e','n','c','o','d','e','d',0}; static const WCHAR test_file[] = {'t','e','s','t','s','/','p','o','s','t','.','p','h','p',0}; - static const WCHAR test_verb[] = {'P','O','S','T',0}; + static const WCHAR postW[] = {'P','O','S','T',0}; static CHAR post_data[] = "mode=Test"; static const char test_post[] = "mode => Test\0\n"; HINTERNET session, request, connection; - DWORD header_len, optional_len, total_len, bytes_rw, size, err, disable; + DWORD header_len, optional_len, total_len, bytes_rw, size, err, disable, len; DWORD_PTR context; BOOL ret; CHAR buffer[256]; + WCHAR method[8]; int i; header_len = -1L; @@ -389,7 +390,7 @@ static void test_SendRequest (void) connection = WinHttpConnect (session, test_winehq, INTERNET_DEFAULT_HTTP_PORT, 0); ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); - request = WinHttpOpenRequest(connection, test_verb, test_file, NULL, WINHTTP_NO_REFERER, + request = WinHttpOpenRequest(connection, postW, test_file, NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, WINHTTP_FLAG_BYPASS_PROXY_CACHE); if (request == NULL && GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED) { @@ -399,6 +400,13 @@ static void test_SendRequest (void) ok(request != NULL, "WinHttpOpenrequest failed to open a request, error: %u.\n", GetLastError()); if (!request) goto done; + method[0] = 0; + len = sizeof(method); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_REQUEST_METHOD, NULL, method, &len, NULL); + ok(ret, "got %u\n", GetLastError()); + ok(len == lstrlenW(postW) * sizeof(WCHAR), "got %u\n", len); + ok(!lstrcmpW(method, postW), "got %s\n", wine_dbgstr_w(method)); + context = 0xdeadbeef; ret = WinHttpSetOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(context)); ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); @@ -4728,14 +4736,14 @@ START_TEST (winhttp) HANDLE thread; DWORD ret; - test_OpenRequest(); - test_SendRequest(); + test_WinHttpOpenRequest(); + test_WinHttpSendRequest(); test_WinHttpTimeFromSystemTime(); test_WinHttpTimeToSystemTime(); test_WinHttpAddHeaders(); test_secure_connection(); test_request_parameter_defaults(); - test_QueryOption(); + test_WinHttpQueryOption(); test_set_default_proxy_config(); test_empty_headers_param(); test_timeouts(); -- 2.20.1

1 0

[PATCH 1/4] winhttp: Also trace the buffer pointer in WinHttpSendRequest.
by Hans Leidekker 02 Aug '19

02 Aug '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d3d9f572f2..25f7950f2f 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2278,8 +2278,8 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD heade BOOL ret; struct request *request; - TRACE("%p, %s, %u, %u, %u, %lx\n", hrequest, debugstr_wn(headers, headers_len), headers_len, optional_len, - total_len, context); + TRACE("%p, %s, %u, %p, %u, %u, %lx\n", hrequest, debugstr_wn(headers, headers_len), headers_len, optional, + optional_len, total_len, context); if (!(request = (struct request *)grab_object( hrequest ))) { -- 2.20.1

1 0

[PATCH v10 0/9]
by Derek Lesho 02 Aug '19

02 Aug '19

I am resending this full patchset again due to changes in patch numbers and total patch count being different from when I first started sending the patches.

1 0

[PATCH v3] ntoskrnl: Add MmIsThisAnNtAsSystem
by Alex Henrie 02 Aug '19

02 Aug '19

This function returns FALSE on all server and non-server versions of Windows since XP except for Windows Server 2003. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47578 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Remove unhelpful test v3: Add TRACE --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 92f9afab33..116dcb6947 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2971,6 +2971,14 @@ PVOID WINAPI MmGetSystemRoutineAddress(PUNICODE_STRING SystemRoutineName) return pFunc; } +/*********************************************************************** + * MmIsThisAnNtAsSystem (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI MmIsThisAnNtAsSystem(void) +{ + TRACE("\n"); + return FALSE; +} /*********************************************************************** * MmQuerySystemSize (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 439cae3097..6f4bd88538 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -699,7 +699,7 @@ @ stub MmIsDriverVerifying @ stub MmIsNonPagedSystemAddressValid @ stub MmIsRecursiveIoFault -@ stub MmIsThisAnNtAsSystem +@ stdcall MmIsThisAnNtAsSystem() @ stub MmIsVerifierEnabled @ stub MmLockPagableDataSection @ stub MmLockPagableImageSection -- 2.22.0

2 1

[PATCH v2] ntoskrnl: Add MmIsThisAnNtAsSystem
by Alex Henrie 02 Aug '19

02 Aug '19

This function returns FALSE on all server and non-server versions of Windows since XP except for Windows Server 2003. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47578 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Remove unhelpful test --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 92f9afab33..7ff5ab9cb9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2971,6 +2971,13 @@ PVOID WINAPI MmGetSystemRoutineAddress(PUNICODE_STRING SystemRoutineName) return pFunc; } +/*********************************************************************** + * MmIsThisAnNtAsSystem (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI MmIsThisAnNtAsSystem(void) +{ + return FALSE; +} /*********************************************************************** * MmQuerySystemSize (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 439cae3097..6f4bd88538 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -699,7 +699,7 @@ @ stub MmIsDriverVerifying @ stub MmIsNonPagedSystemAddressValid @ stub MmIsRecursiveIoFault -@ stub MmIsThisAnNtAsSystem +@ stdcall MmIsThisAnNtAsSystem() @ stub MmIsVerifierEnabled @ stub MmLockPagableDataSection @ stub MmLockPagableImageSection -- 2.22.0

2 1

[PATCH] ntoskrnl: Add MmIsThisAnNtAsSystem
by Alex Henrie 02 Aug '19

02 Aug '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47578 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- MSDN says that this function has been deprecated since Windows XP, so it's not surprising that it always returns FALSE on the test VMs. --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 12 ++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 92f9afab33..7ff5ab9cb9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2971,6 +2971,13 @@ PVOID WINAPI MmGetSystemRoutineAddress(PUNICODE_STRING SystemRoutineName) return pFunc; } +/*********************************************************************** + * MmIsThisAnNtAsSystem (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI MmIsThisAnNtAsSystem(void) +{ + return FALSE; +} /*********************************************************************** * MmQuerySystemSize (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 439cae3097..6f4bd88538 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -699,7 +699,7 @@ @ stub MmIsDriverVerifying @ stub MmIsNonPagedSystemAddressValid @ stub MmIsRecursiveIoFault -@ stub MmIsThisAnNtAsSystem +@ stdcall MmIsThisAnNtAsSystem() @ stub MmIsVerifierEnabled @ stub MmLockPagableDataSection @ stub MmLockPagableImageSection diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 48ddb299cf..5c04ee313c 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -32,11 +32,20 @@ static HANDLE device; +static BOOLEAN (WINAPI *pMmIsThisAnNtAsSystem)(void); static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(const WCHAR *, UNICODE_STRING *, WCHAR **, CURDIR *); static BOOL (WINAPI *pRtlFreeUnicodeString)(UNICODE_STRING *); static BOOL (WINAPI *pCancelIoEx)(HANDLE, OVERLAPPED *); static BOOL (WINAPI *pSetFileCompletionNotificationModes)(HANDLE, UCHAR); +static void test_system(void) +{ + if (!pMmIsThisAnNtAsSystem) /* 32-bit XP/7/8 */ + skip("MmIsThisAnNtAsSystem is not available\n"); + else + ok(!pMmIsThisAnNtAsSystem(), "System reports that it is an old NT Server\n"); +} + static void load_resource(const char *name, char *filename) { static char path[MAX_PATH]; @@ -347,12 +356,15 @@ START_TEST(ntoskrnl) BOOL ret; HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + pMmIsThisAnNtAsSystem = (void *)GetProcAddress(GetModuleHandleA("ntoskrnl.exe"), "MmIsThisAnNtAsSystem"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); pCancelIoEx = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "CancelIoEx"); pSetFileCompletionNotificationModes = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "SetFileCompletionNotificationModes"); + test_system(); + if (!(service = load_driver(filename, "driver.dll", "WineTestDriver"))) return; if (!start_driver(service)) -- 2.22.0

3 3