May 2022 - Wine-Devel - list.winehq.org

[PATCH 0/5] MR162: explorer: Move clipboard manager thread from display driver.
by Jacek Caban (＠jacek) May 31, 2022

May 31, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/162

4 7

[PATCH v3 0/5] MR109: wined3d: Add a memory_colour_fill path for clearing the entire level to zero.
by Stefan Dösinger May 31, 2022

May 31, 2022

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> -- v3: d3d9/tests: Extend color_fill_test. wined3d: Store clear colors in subresources. wined3d: Handle WINED3DFMT_D32_FLOAT in wined3d_format_convert_from_float. wined3d: Prepare sysmem LOCATION_CLEARED handling for non-zero colors (v2). wined3d: Add a memory_colour_fill path for clearing the entire level to zero. https://gitlab.winehq.org/wine/wine/-/merge_requests/109

5 12

[PATCH vkd3d 1/6] tests: Separate generic and d3d12-specific readback fields.
by Giovanni Mascellani May 31, 2022

May 31, 2022

From: Zebediah Figura <zfigura(a)codeweavers.com> Move the "resource" field to a new "d3d12_resource_readback" structure encapsulating struct resource_readback. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- tests/d3d12.c | 602 ++++++++++++++++++------------------ tests/d3d12_test_utils.h | 45 +-- tests/shader_runner_d3d12.c | 4 +- 3 files changed, 328 insertions(+), 323 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5f83a373..3c4a91e2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -191,29 +191,29 @@ static const DXGI_FORMAT depth_stencil_formats[] = DXGI_FORMAT_D16_UNORM, }; -static void init_readback(struct resource_readback *rb, ID3D12Resource *buffer, +static void init_readback(struct d3d12_resource_readback *rb, ID3D12Resource *buffer, uint64_t buffer_size, uint64_t width, uint64_t height, unsigned int depth, uint64_t row_pitch) { D3D12_RANGE read_range; HRESULT hr; - rb->width = width; - rb->height = height; - rb->depth = depth; + rb->rb.width = width; + rb->rb.height = height; + rb->rb.depth = depth; rb->resource = buffer; - rb->row_pitch = row_pitch; - rb->data = NULL; + rb->rb.row_pitch = row_pitch; + rb->rb.data = NULL; ID3D12Resource_AddRef(rb->resource); read_range.Begin = 0; read_range.End = buffer_size; - hr = ID3D12Resource_Map(rb->resource, 0, &read_range, &rb->data); + hr = ID3D12Resource_Map(rb->resource, 0, &read_range, &rb->rb.data); ok(hr == S_OK, "Failed to map readback buffer, hr %#x.\n", hr); } static void get_buffer_readback_with_command_list(ID3D12Resource *buffer, DXGI_FORMAT format, - struct resource_readback *rb, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) + struct d3d12_resource_readback *rb, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) { D3D12_HEAP_PROPERTIES heap_properties; D3D12_RESOURCE_DESC resource_desc; @@ -250,16 +250,16 @@ static void get_buffer_readback_with_command_list(ID3D12Resource *buffer, DXGI_F wait_queue_idle(device, queue); ID3D12Device_Release(device); - rb->width = resource_desc.Width / format_size(format); - rb->height = 1; - rb->depth = 1; + rb->rb.width = resource_desc.Width / format_size(format); + rb->rb.height = 1; + rb->rb.depth = 1; rb->resource = rb_buffer; - rb->row_pitch = resource_desc.Width; - rb->data = NULL; + rb->rb.row_pitch = resource_desc.Width; + rb->rb.data = NULL; read_range.Begin = 0; read_range.End = resource_desc.Width; - hr = ID3D12Resource_Map(rb_buffer, 0, &read_range, &rb->data); + hr = ID3D12Resource_Map(rb_buffer, 0, &read_range, &rb->rb.data); ok(SUCCEEDED(hr), "Failed to map readback buffer, hr %#x.\n", hr); } @@ -322,10 +322,10 @@ static void check_sub_resource_float_(unsigned int line, ID3D12Resource *texture unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, float expected, unsigned int max_diff) { - struct resource_readback rb; + struct d3d12_resource_readback rb; get_texture_readback_with_command_list(texture, sub_resource_idx, &rb, queue, command_list); - check_readback_data_float_(line, &rb, NULL, expected, max_diff); + check_readback_data_float_(line, &rb.rb, NULL, expected, max_diff); release_resource_readback(&rb); } @@ -363,10 +363,10 @@ static void check_sub_resource_uint8_(unsigned int line, ID3D12Resource *texture unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, uint8_t expected, unsigned int max_diff) { - struct resource_readback rb; + struct d3d12_resource_readback rb; get_texture_readback_with_command_list(texture, sub_resource_idx, &rb, queue, command_list); - check_readback_data_uint8_(line, &rb, NULL, expected, max_diff); + check_readback_data_uint8_(line, &rb.rb, NULL, expected, max_diff); release_resource_readback(&rb); } @@ -404,10 +404,10 @@ static void check_sub_resource_uint16_(unsigned int line, ID3D12Resource *textur unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, uint16_t expected, unsigned int max_diff) { - struct resource_readback rb; + struct d3d12_resource_readback rb; get_texture_readback_with_command_list(texture, sub_resource_idx, &rb, queue, command_list); - check_readback_data_uint16_(line, &rb, NULL, expected, max_diff); + check_readback_data_uint16_(line, &rb.rb, NULL, expected, max_diff); release_resource_readback(&rb); } @@ -445,10 +445,10 @@ static void check_sub_resource_uint64_(unsigned int line, ID3D12Resource *textur unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, uint64_t expected, unsigned int max_diff) { - struct resource_readback rb; + struct d3d12_resource_readback rb; get_texture_readback_with_command_list(texture, sub_resource_idx, &rb, queue, command_list); - check_readback_data_uint64_(line, &rb, NULL, expected, max_diff); + check_readback_data_uint64_(line, &rb.rb, NULL, expected, max_diff); release_resource_readback(&rb); } @@ -457,17 +457,17 @@ static void check_sub_resource_uvec4_(unsigned int line, ID3D12Resource *texture unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, const struct uvec4 *expected_value) { - struct resource_readback rb; + struct d3d12_resource_readback rb; struct uvec4 value = {0}; unsigned int x = 0, y; bool all_match = true; get_texture_readback_with_command_list(texture, sub_resource_idx, &rb, queue, command_list); - for (y = 0; y < rb.height; ++y) + for (y = 0; y < rb.rb.height; ++y) { - for (x = 0; x < rb.width; ++x) + for (x = 0; x < rb.rb.width; ++x) { - value = *get_readback_uvec4(&rb, x, y); + value = *get_readback_uvec4(&rb.rb, x, y); if (!compare_uvec4(&value, expected_value)) { all_match = false; @@ -490,10 +490,10 @@ static void check_buffer_uint_(unsigned int line, ID3D12Resource *buffer, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, unsigned int expected, unsigned int max_diff) { - struct resource_readback rb; + struct d3d12_resource_readback rb; get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - check_readback_data_uint_(line, &rb, NULL, expected, max_diff); + check_readback_data_uint_(line, &rb.rb, NULL, expected, max_diff); release_resource_readback(&rb); } @@ -4576,11 +4576,11 @@ static void test_clear_render_target_view(void) D3D12_RENDER_TARGET_VIEW_DESC rtv_desc; D3D12_HEAP_PROPERTIES heap_properties; D3D12_RESOURCE_DESC resource_desc; + struct d3d12_resource_readback rb; unsigned int rtv_increment_size; ID3D12DescriptorHeap *rtv_heap; D3D12_CLEAR_VALUE clear_value; struct test_context_desc desc; - struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Resource *resource; @@ -4822,11 +4822,11 @@ static void test_clear_render_target_view(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(resource, 0, &rb, queue, command_list); set_box(&box, 0, 0, 0, 32, 32, 2); - check_readback_data_uint(&rb, &box, 0xbf4c7f19, 1); + check_readback_data_uint(&rb.rb, &box, 0xbf4c7f19, 1); set_box(&box, 0, 0, 2, 32, 32, 4); - check_readback_data_uint(&rb, &box, 0xff00ff00, 1); + check_readback_data_uint(&rb.rb, &box, 0xff00ff00, 1); set_box(&box, 0, 0, 4, 32, 32, 32); - check_readback_data_uint(&rb, &box, 0xbf4c7f19, 1); + check_readback_data_uint(&rb.rb, &box, 0xbf4c7f19, 1); release_resource_readback(&rb); rtv_desc.Texture3D.FirstWSlice = 30; @@ -4841,9 +4841,9 @@ static void test_clear_render_target_view(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(resource, 0, &rb, queue, command_list); set_box(&box, 0, 0, 4, 32, 32, 30); - check_readback_data_uint(&rb, &box, 0xbf4c7f19, 1); + check_readback_data_uint(&rb.rb, &box, 0xbf4c7f19, 1); set_box(&box, 0, 0, 30, 32, 32, 32); - check_readback_data_uint(&rb, &box, 0xff00ff00, 1); + check_readback_data_uint(&rb.rb, &box, 0xff00ff00, 1); release_resource_readback(&rb); ID3D12Resource_Release(resource); @@ -4856,9 +4856,9 @@ static void test_clear_unordered_access_view_buffer(void) D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc; ID3D12DescriptorHeap *cpu_heap, *gpu_heap; ID3D12GraphicsCommandList *command_list; + struct d3d12_resource_readback rb; struct test_context_desc desc; struct test_context context; - struct resource_readback rb; ID3D12CommandQueue *queue; D3D12_HEAP_DESC heap_desc; ID3D12Resource *buffer; @@ -5029,14 +5029,14 @@ static void test_clear_unordered_access_view_buffer(void) get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_TYPELESS, &rb, queue, command_list); box.left = 0; box.right = uav_desc.Buffer.FirstElement; - check_readback_data_uint(&rb, &box, clear_value[0], 0); + check_readback_data_uint(&rb.rb, &box, clear_value[0], 0); box.left = uav_desc.Buffer.FirstElement; box.right = uav_desc.Buffer.FirstElement + uav_desc.Buffer.NumElements; todo_if(tests[i].is_todo) - check_readback_data_uint(&rb, &box, tests[i].expected, tests[i].is_float ? 1 : 0); + check_readback_data_uint(&rb.rb, &box, tests[i].expected, tests[i].is_float ? 1 : 0); box.left = uav_desc.Buffer.FirstElement + uav_desc.Buffer.NumElements; box.right = BUFFER_SIZE / format_size(uav_desc.Format); - check_readback_data_uint(&rb, &box, clear_value[0], 0); + check_readback_data_uint(&rb.rb, &box, clear_value[0], 0); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -5060,10 +5060,10 @@ static void test_clear_unordered_access_view_image(void) unsigned int i, j, d, p, x, y, z, layer; D3D12_HEAP_PROPERTIES heap_properties; unsigned int image_size, image_depth; + struct d3d12_resource_readback rb; D3D12_RESOURCE_DESC resource_desc; struct test_context_desc desc; struct test_context context; - struct resource_readback rb; ID3D12CommandQueue *queue; bool is_inside, success; ID3D12Resource *texture; @@ -5305,7 +5305,7 @@ static void test_clear_unordered_access_view_image(void) && layer < tests[i].first_layer + tests[i].layer_count; expected_colour = is_inside ? tests[i].expected : clear_value[0]; - actual_colour = get_readback_uint(&rb, x, y, z); + actual_colour = get_readback_uint(&rb.rb, x, y, z); success = compare_color(actual_colour, expected_colour, tests[i].is_float ? 1 : 0); todo_if(tests[i].is_todo && expected_colour) @@ -5964,10 +5964,10 @@ static void test_append_aligned_element(void) { ID3D12GraphicsCommandList *command_list; D3D12_INPUT_LAYOUT_DESC input_layout; + struct d3d12_resource_readback rb; D3D12_VERTEX_BUFFER_VIEW vbv[6]; struct test_context_desc desc; struct test_context context; - struct resource_readback rb; ID3D12CommandQueue *queue; ID3D12Resource *vb[3]; unsigned int color; @@ -6143,13 +6143,13 @@ static void test_append_aligned_element(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - color = get_readback_uint(&rb, 80, 16, 0); + color = get_readback_uint(&rb.rb, 80, 16, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 240, 16, 0); + color = get_readback_uint(&rb.rb, 240, 16, 0); ok(compare_color(color, 0xff00ff00, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 400, 16, 0); + color = get_readback_uint(&rb.rb, 400, 16, 0); ok(compare_color(color, 0xffff0000, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 560, 16, 0); + color = get_readback_uint(&rb.rb, 560, 16, 0); ok(compare_color(color, 0xffff00ff, 1), "Got unexpected color 0x%08x.\n", color); release_resource_readback(&rb); @@ -6291,10 +6291,10 @@ static void test_fragment_coords(void) static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; ID3D12GraphicsCommandList *command_list; D3D12_INPUT_LAYOUT_DESC input_layout; + struct d3d12_resource_readback rb; struct test_context_desc desc; D3D12_VERTEX_BUFFER_VIEW vbv; struct test_context context; - struct resource_readback rb; const struct vec4 *v = NULL; struct vec4 expected = {0}; ID3D12CommandQueue *queue; @@ -6422,11 +6422,11 @@ static void test_fragment_coords(void) get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); all_match = true; - for (y = 0; y < rb.height; ++y) + for (y = 0; y < rb.rb.height; ++y) { - for (x = 0; x < rb.width; ++x) + for (x = 0; x < rb.rb.width; ++x) { - v = get_readback_vec4(&rb, x, y); + v = get_readback_vec4(&rb.rb, x, y); expected.x = x + 0.5f; expected.y = y + 0.5f; expected.z = vertices[4 * i].z / vertices[4 * i].w; @@ -6459,10 +6459,10 @@ static void test_fractional_viewports(void) static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; ID3D12GraphicsCommandList *command_list; D3D12_INPUT_LAYOUT_DESC input_layout; + struct d3d12_resource_readback rb; struct test_context_desc desc; D3D12_VERTEX_BUFFER_VIEW vbv; struct test_context context; - struct resource_readback rb; ID3D12CommandQueue *queue; D3D12_VIEWPORT viewport; unsigned int i, x, y; @@ -6582,11 +6582,11 @@ static void test_fractional_viewports(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - for (y = 0; y < rb.height; ++y) + for (y = 0; y < rb.rb.height; ++y) { - for (x = 0; x < rb.width; ++x) + for (x = 0; x < rb.rb.width; ++x) { - const struct vec4 *v = get_readback_vec4(&rb, x, y); + const struct vec4 *v = get_readback_vec4(&rb.rb, x, y); struct vec4 expected = {x + 0.5f, y + 0.5f, (x + 0.5f - viewport_offsets[i]) / context.render_target_desc.Width, 1.0f - (y + 0.5f - viewport_offsets[i]) / context.render_target_desc.Height}; @@ -6610,9 +6610,9 @@ static void test_fractional_viewports(void) static void test_scissor(void) { ID3D12GraphicsCommandList *command_list; + struct d3d12_resource_readback rb; struct test_context_desc desc; struct test_context context; - struct resource_readback rb; ID3D12CommandQueue *queue; unsigned int color; RECT scissor_rect; @@ -6661,15 +6661,15 @@ static void test_scissor(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - color = get_readback_uint(&rb, 320, 60, 0); + color = get_readback_uint(&rb.rb, 320, 60, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 80, 240, 0); + color = get_readback_uint(&rb.rb, 80, 240, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 320, 240, 0); + color = get_readback_uint(&rb.rb, 320, 240, 0); ok(compare_color(color, 0xff00ff00, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 560, 240, 0); + color = get_readback_uint(&rb.rb, 560, 240, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 320, 420, 0); + color = get_readback_uint(&rb.rb, 320, 420, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); release_resource_readback(&rb); @@ -6779,9 +6779,9 @@ static void test_draw_depth_only(void) { D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; ID3D12GraphicsCommandList *command_list; + struct d3d12_resource_readback rb; struct depth_stencil_resource ds; struct test_context_desc desc; - struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; unsigned int i, j; @@ -6903,7 +6903,7 @@ static void test_draw_depth_only(void) { float obtained_depth, expected_depth; - obtained_depth = get_readback_float(&rb, 80 + j * 160, 60 + i * 120); + obtained_depth = get_readback_float(&rb.rb, 80 + j * 160, 60 + i * 120); expected_depth = 1.0f / 16.0f * (j + 4 * i); ok(compare_float(obtained_depth, expected_depth, 1), "Got unexpected depth %.8e at (%u, %u), expected %.8e.\n", @@ -7309,10 +7309,10 @@ static void test_map_placed_resources(void) ID3D12GraphicsCommandList *command_list; ID3D12Heap *upload_heap, *readback_heap; D3D12_ROOT_PARAMETER root_parameters[2]; + struct d3d12_resource_readback rb; D3D12_RESOURCE_DESC resource_desc; ID3D12Resource *readback_buffer; struct test_context_desc desc; - struct resource_readback rb; struct test_context context; ID3D12Resource *uav_buffer; D3D12_HEAP_DESC heap_desc; @@ -7475,7 +7475,7 @@ static void test_map_placed_resources(void) get_buffer_readback_with_command_list(readback_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); for (i = 0; i < ARRAY_SIZE(expected_values); ++i) { - unsigned int value = get_readback_uint(&rb, i, 0, 0); + unsigned int value = get_readback_uint(&rb.rb, i, 0, 0); ok(value == expected_values[i], "Got %#x, expected %#x at %u.\n", value, expected_values[i], i); } release_resource_readback(&rb); @@ -7494,8 +7494,8 @@ static void test_bundle_state_inheritance(void) static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; ID3D12GraphicsCommandList *command_list, *bundle; ID3D12CommandAllocator *bundle_allocator; + struct d3d12_resource_readback rb; struct test_context context; - struct resource_readback rb; ID3D12CommandQueue *queue; ID3D12Device *device; unsigned int x, y; @@ -7547,11 +7547,11 @@ static void test_bundle_state_inheritance(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - for (y = 0; y < rb.height; ++y) + for (y = 0; y < rb.rb.height; ++y) { - for (x = 0; x < rb.width; ++x) + for (x = 0; x < rb.rb.width; ++x) { - unsigned int v = get_readback_uint(&rb, x, y, 0); + unsigned int v = get_readback_uint(&rb.rb, x, y, 0); /* This works on AMD. */ ok(v == 0xffffffff || v == 0xff00ff00, "Got unexpected value 0x%08x at (%u, %u).\n", v, x, y); } @@ -7584,11 +7584,11 @@ static void test_bundle_state_inheritance(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - for (y = 0; y < rb.height; ++y) + for (y = 0; y < rb.rb.height; ++y) { - for (x = 0; x < rb.width; ++x) + for (x = 0; x < rb.rb.width; ++x) { - unsigned int v = get_readback_uint(&rb, x, y, 0); + unsigned int v = get_readback_uint(&rb.rb, x, y, 0); /* This works on AMD, even though the debug layer says that the primitive topology is undefined. */ ok(v == 0xffffffff || v == 0xff00ff00, "Got unexpected value 0x%08x at (%u, %u).\n", v, x, y); } @@ -10625,7 +10625,7 @@ static void test_compute_shader_instructions(void) const D3D12_SHADER_BYTECODE *current_cs; ID3D12GraphicsCommandList *command_list; D3D12_ROOT_PARAMETER root_parameters[2]; - struct resource_readback rb; + struct d3d12_resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Resource *buffer; @@ -10791,7 +10791,7 @@ static void test_compute_shader_instructions(void) get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); for (j = 0; j < ARRAY_SIZE(tests[i].expected_data); ++j) { - value = get_readback_uint(&rb, j, 0, 0); + value = get_readback_uint(&rb.rb, j, 0, 0); ok(value == tests[i].expected_data[j], "Test %u: Got 0x%08x, expected 0x%08x at %u.\n", i, value, tests[i].expected_data[j], j); } @@ -12407,9 +12407,9 @@ static void test_cs_constant_buffer(void) D3D12_DESCRIPTOR_HEAP_DESC heap_desc; ID3D12RootSignature *root_signature; ID3D12PipelineState *pipeline_state; + struct d3d12_resource_readback rb; ID3D12Resource *resource, *cb; unsigned int descriptor_size; - struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Device *device; @@ -12520,7 +12520,7 @@ static void test_cs_constant_buffer(void) transition_sub_resource_state(command_list, resource, 0, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(resource, uav_desc.Format, &rb, queue, command_list); - check_readback_data_float(&rb, NULL, 2.0f, 0); + check_readback_data_float(&rb.rb, NULL, 2.0f, 0); release_resource_readback(&rb); value = 6.0f; @@ -12541,7 +12541,7 @@ static void test_cs_constant_buffer(void) transition_sub_resource_state(command_list, resource, 0, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(resource, uav_desc.Format, &rb, queue, command_list); - check_readback_data_float(&rb, NULL, 6.0f, 0); + check_readback_data_float(&rb.rb, NULL, 6.0f, 0); release_resource_readback(&rb); ID3D12Resource_Release(cb); @@ -12557,7 +12557,7 @@ static void test_constant_buffer_relative_addressing(void) D3D12_ROOT_SIGNATURE_DESC root_signature_desc; D3D12_ROOT_PARAMETER root_parameters[2]; ID3D12GraphicsCommandList *command_list; - struct resource_readback rb; + struct d3d12_resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Resource *uav, *cb; @@ -12642,9 +12642,9 @@ static void test_constant_buffer_relative_addressing(void) transition_sub_resource_state(command_list, uav, 0, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(uav, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - for (i = 0; i < rb.width; ++i) + for (i = 0; i < rb.rb.width; ++i) { - unsigned int got = get_readback_uint(&rb, i, 0, 0); + unsigned int got = get_readback_uint(&rb.rb, i, 0, 0); const unsigned int *expected = &cb_data[1].x; ok(got == expected[i], "Got %#x, expected %#x at %u.\n", got, expected[i], i); } @@ -13161,9 +13161,9 @@ static void test_sample_instructions(void) ID3D12GraphicsCommandList *command_list; D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle; + struct d3d12_resource_readback rb; D3D12_SAMPLER_DESC sampler_desc; struct test_context_desc desc; - struct resource_readback rb; struct test_context context; unsigned int x_step, y_step; ID3D12CommandQueue *queue; @@ -13553,7 +13553,7 @@ static void test_sample_instructions(void) { 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); + unsigned int color = get_readback_uint(&rb.rb, x * x_step + x_step / 2, y * y_step + y_step / 2, 0); 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].texture->width * y + x], x, y); @@ -13804,8 +13804,8 @@ static void test_gather(void) ID3D12GraphicsCommandList *command_list; D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle; + struct d3d12_resource_readback rb; struct test_context_desc desc; - struct resource_readback rb; struct test_context context; ID3D12DescriptorHeap *heap; ID3D12CommandQueue *queue; @@ -13999,12 +13999,12 @@ static void test_gather(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - for (y = 0; y < rb.height; ++y) + for (y = 0; y < rb.rb.height; ++y) { - for (x = 0; x < rb.width; ++x) + for (x = 0; x < rb.rb.width; ++x) { - const struct vec4 *expected = &expected_gather4[y * rb.width + x]; - const struct vec4 *got = get_readback_vec4(&rb, x, y); + const struct vec4 *expected = &expected_gather4[y * rb.rb.width + x]; + const struct vec4 *got = get_readback_vec4(&rb.rb, x, y); ok(compare_vec4(got, expected, 0), "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", got->x, got->y, got->z, got->w, expected->x, expected->y, expected->z, expected->w); @@ -14037,12 +14037,12 @@ static void test_gather(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - for (y = 0; y < rb.height; ++y) + for (y = 0; y < rb.rb.height; ++y) { - for (x = 0; x < rb.width; ++x) + for (x = 0; x < rb.rb.width; ++x) { - const struct vec4 *expected = &expected_gather4_offset[y * rb.width + x]; - const struct vec4 *got = get_readback_vec4(&rb, x, y); + const struct vec4 *expected = &expected_gather4_offset[y * rb.rb.width + x]; + const struct vec4 *got = get_readback_vec4(&rb.rb, x, y); ok(compare_vec4(got, expected, 0), "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", got->x, got->y, got->z, got->w, expected->x, expected->y, expected->z, expected->w); @@ -14075,12 +14075,12 @@ static void test_gather(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - for (y = 0; y < rb.height; ++y) + for (y = 0; y < rb.rb.height; ++y) { - for (x = 0; x < rb.width; ++x) + for (x = 0; x < rb.rb.width; ++x) { - const struct vec4 *expected = &expected_gather4_green[y * rb.width + x]; - const struct vec4 *got = get_readback_vec4(&rb, x, y); + const struct vec4 *expected = &expected_gather4_green[y * rb.rb.width + x]; + const struct vec4 *got = get_readback_vec4(&rb.rb, x, y); ok(compare_vec4(got, expected, 0), "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", got->x, got->y, got->z, got->w, expected->x, expected->y, expected->z, expected->w); @@ -14113,12 +14113,12 @@ static void test_gather(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - for (y = 0; y < rb.height; ++y) + for (y = 0; y < rb.rb.height; ++y) { - for (x = 0; x < rb.width; ++x) + for (x = 0; x < rb.rb.width; ++x) { - const struct vec4 *expected = &expected_gather4_offset[y * rb.width + x]; - const struct vec4 *got = get_readback_vec4(&rb, x, y); + const struct vec4 *expected = &expected_gather4_offset[y * rb.rb.width + x]; + const struct vec4 *got = get_readback_vec4(&rb.rb, x, y); ok(compare_vec4(got, expected, 0), "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", got->x, got->y, got->z, got->w, expected->x, expected->y, expected->z, expected->w); @@ -14149,12 +14149,12 @@ static void test_gather(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - for (y = 0; y < rb.height; ++y) + for (y = 0; y < rb.rb.height; ++y) { - for (x = 0; x < rb.width; ++x) + for (x = 0; x < rb.rb.width; ++x) { - const struct vec4 *expected = &expected_gather4[y * rb.width + x]; - const struct vec4 *got = get_readback_vec4(&rb, x, y); + const struct vec4 *expected = &expected_gather4[y * rb.rb.width + x]; + const struct vec4 *got = get_readback_vec4(&rb.rb, x, y); ok(compare_vec4(got, expected, 0), "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", got->x, got->y, got->z, got->w, expected->x, expected->y, expected->z, expected->w); @@ -14180,8 +14180,8 @@ static void test_gather_c(void) ID3D12GraphicsCommandList *command_list; D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle; + struct d3d12_resource_readback rb; struct test_context_desc desc; - struct resource_readback rb; struct test_context context; ID3D12DescriptorHeap *heap; ID3D12CommandQueue *queue; @@ -14339,12 +14339,12 @@ static void test_gather_c(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - for (y = 0; y < rb.height; ++y) + for (y = 0; y < rb.rb.height; ++y) { - for (x = 0; x < rb.width; ++x) + for (x = 0; x < rb.rb.width; ++x) { - const struct vec4 *expected = &expected_gather4_c[y * rb.width + x]; - const struct vec4 *got = get_readback_vec4(&rb, x, y); + const struct vec4 *expected = &expected_gather4_c[y * rb.rb.width + x]; + const struct vec4 *got = get_readback_vec4(&rb.rb, x, y); ok(compare_vec4(got, expected, 0), "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", got->x, got->y, got->z, got->w, expected->x, expected->y, expected->z, expected->w); @@ -14377,12 +14377,12 @@ static void test_gather_c(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - for (y = 0; y < rb.height; ++y) + for (y = 0; y < rb.rb.height; ++y) { - for (x = 0; x < rb.width; ++x) + for (x = 0; x < rb.rb.width; ++x) { - const struct vec4 *expected = &expected_gather4_po_c[y * rb.width + x]; - const struct vec4 *got = get_readback_vec4(&rb, x, y); + const struct vec4 *expected = &expected_gather4_po_c[y * rb.rb.width + x]; + const struct vec4 *got = get_readback_vec4(&rb.rb, x, y); ok(compare_vec4(got, expected, 0), "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", got->x, got->y, got->z, got->w, expected->x, expected->y, expected->z, expected->w); @@ -14413,12 +14413,12 @@ static void test_gather_c(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - for (y = 0; y < rb.height; ++y) + for (y = 0; y < rb.rb.height; ++y) { - for (x = 0; x < rb.width; ++x) + for (x = 0; x < rb.rb.width; ++x) { - const struct vec4 *expected = &expected_gather4_c[y * rb.width + x]; - const struct vec4 *got = get_readback_vec4(&rb, x, y); + const struct vec4 *expected = &expected_gather4_c[y * rb.rb.width + x]; + const struct vec4 *got = get_readback_vec4(&rb.rb, x, y); ok(compare_vec4(got, expected, 0), "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", got->x, got->y, got->z, got->w, expected->x, expected->y, expected->z, expected->w); @@ -14438,8 +14438,8 @@ static void test_sample_c_lz(void) ID3D12GraphicsCommandList *command_list; D3D12_DEPTH_STENCIL_VIEW_DESC dsv_desc; D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; + struct d3d12_resource_readback rb; struct test_context_desc desc; - struct resource_readback rb; struct test_context context; ID3D12DescriptorHeap *heap; ID3D12CommandQueue *queue; @@ -14847,7 +14847,7 @@ static void test_sample_c_lz(void) get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); /* Avoid testing values affected by seamless cube map filtering. */ set_rect(&rect, 100, 100, 540, 380); - check_readback_data_float(&rb, &rect, tests[i].expected, 2); + check_readback_data_float(&rb.rb, &rect, tests[i].expected, 2); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -14898,7 +14898,7 @@ static void test_sample_c_lz(void) get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); /* Avoid testing values affected by seamless cube map filtering. */ set_rect(&rect, 100, 100, 540, 380); - check_readback_data_float(&rb, &rect, tests[i].expected, 2); + check_readback_data_float(&rb.rb, &rect, tests[i].expected, 2); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -15230,9 +15230,9 @@ static void test_multisample_array_texture(void) D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle; D3D12_HEAP_PROPERTIES heap_properties; + struct d3d12_resource_readback rb; D3D12_RESOURCE_DESC resource_desc; struct test_context_desc desc; - struct resource_readback rb; struct test_context context; ID3D12DescriptorHeap *heap; ID3D12Resource *uav_buffer; @@ -15431,7 +15431,7 @@ static void test_multisample_array_texture(void) get_buffer_readback_with_command_list(uav_buffer, DXGI_FORMAT_R32G32B32A32_UINT, &rb, queue, command_list); for (i = 0; i < 2; ++i) { - const struct uvec4 *v = get_readback_uvec4(&rb, i, 0); + const struct uvec4 *v = get_readback_uvec4(&rb.rb, i, 0); ok(v->x == resource_desc.Width, "Got unexpected width %u.\n", v->x); ok(v->y == resource_desc.Height, "Got unexpected height %u.\n", v->y); ok(v->z == resource_desc.DepthOrArraySize, "Got unexpected array size %u.\n", v->z); @@ -16272,7 +16272,7 @@ static void test_descriptor_tables_overlapping_bindings(void) D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc; D3D12_ROOT_PARAMETER root_parameters[3]; ID3D12GraphicsCommandList *command_list; - struct resource_readback rb; + struct d3d12_resource_readback rb; struct test_context context; ID3D12DescriptorHeap *heap; ID3D12CommandQueue *queue; @@ -16433,7 +16433,7 @@ static void test_descriptor_tables_overlapping_bindings(void) get_buffer_readback_with_command_list(output_buffers[0], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); for (i = 0; i < ARRAY_SIZE(buffer_data); ++i) { - unsigned int value = get_readback_uint(&rb, i, 0, 0); + unsigned int value = get_readback_uint(&rb.rb, i, 0, 0); ok(value == buffer_data[i], "Got %#x, expected %#x.\n", value, buffer_data[i]); } release_resource_readback(&rb); @@ -16441,7 +16441,7 @@ static void test_descriptor_tables_overlapping_bindings(void) get_buffer_readback_with_command_list(output_buffers[1], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); for (i = 0; i < ARRAY_SIZE(buffer_data2); ++i) { - unsigned int value = get_readback_uint(&rb, i, 0, 0); + unsigned int value = get_readback_uint(&rb.rb, i, 0, 0); ok(value == buffer_data2[i], "Got %#x, expected %#x.\n", value, buffer_data2[i]); } release_resource_readback(&rb); @@ -16462,8 +16462,8 @@ static void test_update_root_descriptors(void) ID3D12GraphicsCommandList *command_list; ID3D12RootSignature *root_signature; ID3D12PipelineState *pipeline_state; + struct d3d12_resource_readback rb; ID3D12Resource *resource, *cb; - struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Device *device; @@ -16559,7 +16559,7 @@ static void test_update_root_descriptors(void) for (i = 0; i < ARRAY_SIZE(input); ++i) { unsigned int offset = input[i].uav_offset + input[i].offset; - unsigned int value = get_readback_uint(&rb, offset, 0, 0); + unsigned int value = get_readback_uint(&rb.rb, offset, 0, 0); ok(value == input[i].value, "Got %#x, expected %#x.\n", value, input[i].value); } release_resource_readback(&rb); @@ -16580,9 +16580,9 @@ static void test_update_descriptor_tables(void) ID3D12DescriptorHeap *heap, *cpu_heap; D3D12_DESCRIPTOR_HEAP_DESC heap_desc; D3D12_ROOT_PARAMETER root_parameter; + struct d3d12_resource_readback rb; struct test_context_desc desc; D3D12_SUBRESOURCE_DATA data; - struct resource_readback rb; struct test_context context; ID3D12Resource *textures[3]; ID3D12CommandQueue *queue; @@ -16730,9 +16730,9 @@ static void test_update_descriptor_tables(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); set_box(&box, 0, 0, 0, 16, 32, 1); - check_readback_data_uint(&rb, &box, 0xff00407f, 1); + check_readback_data_uint(&rb.rb, &box, 0xff00407f, 1); set_box(&box, 16, 0, 0, 32, 32, 1); - check_readback_data_uint(&rb, &box, 0xff007f40, 1); + check_readback_data_uint(&rb.rb, &box, 0xff007f40, 1); release_resource_readback(&rb); for (i = 0; i < ARRAY_SIZE(textures); ++i) @@ -16755,8 +16755,8 @@ static void test_update_descriptor_heap_after_closing_command_list(void) D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; ID3D12DescriptorHeap *cpu_heap, *heap; D3D12_SUBRESOURCE_DATA texture_data; + struct d3d12_resource_readback rb; struct test_context_desc desc; - struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; unsigned int value; @@ -16862,7 +16862,7 @@ static void test_update_descriptor_heap_after_closing_command_list(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - value = get_readback_uint(&rb, 0, 0, 0); + value = get_readback_uint(&rb.rb, 0, 0, 0); todo_if(binding_tier < D3D12_RESOURCE_BINDING_TIER_3) ok(value == 0xff00ff00, "Got unexpected value %#x.\n", value); release_resource_readback(&rb); @@ -16893,10 +16893,10 @@ static void test_update_compute_descriptor_tables(void) D3D12_SUBRESOURCE_DATA subresource_data; ID3D12Resource *buffer_cb, *texture_cb; ID3D12DescriptorHeap *descriptor_heap; + struct d3d12_resource_readback rb; ID3D12Resource *output_buffers[2]; ID3D12Resource *input_buffers[5]; ID3D12Resource *textures[3]; - struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; struct cb_data cb_data; @@ -17382,7 +17382,7 @@ static void test_update_compute_descriptor_tables(void) get_buffer_readback_with_command_list(output_buffers[0], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); for (i = 0; i < ARRAY_SIZE(expected_output0); ++i) { - data = get_readback_uint(&rb, i, 0, 0); + data = get_readback_uint(&rb.rb, i, 0, 0); ok(data == expected_output0[i], "Got %#x, expected %#x at %u.\n", data, expected_output0[i], i); } release_resource_readback(&rb); @@ -17393,7 +17393,7 @@ static void test_update_compute_descriptor_tables(void) get_buffer_readback_with_command_list(output_buffers[1], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); for (i = 0; i < ARRAY_SIZE(expected_output1); ++i) { - data = get_readback_uint(&rb, i, 0, 0); + data = get_readback_uint(&rb.rb, i, 0, 0); ok(data == expected_output1[i], "Got %#x, expected %#x at %u.\n", data, expected_output1[i], i); } release_resource_readback(&rb); @@ -17650,13 +17650,13 @@ static void test_copy_descriptors(void) ID3D12GraphicsCommandList *command_list; D3D12_ROOT_PARAMETER root_parameters[4]; D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; + struct d3d12_resource_readback rb; ID3D12Resource *t[7], *u[3], *cb; struct depth_stencil_resource ds; D3D12_SAMPLER_DESC sampler_desc; struct test_context_desc desc; unsigned int descriptor_size; D3D12_SUBRESOURCE_DATA data; - struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; unsigned int sampler_size; @@ -18142,7 +18142,7 @@ static void test_copy_descriptors(void) transition_sub_resource_state(command_list, u[2], 0, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(u[2], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - result = get_readback_data(&rb, 0, 0, 0, sizeof(*result)); + result = get_readback_data(&rb.rb, 0, 0, 0, sizeof(*result)); ok(result[ 0] == cb0_data, "Got unexpected value %#x.\n", result[0]); ok(result[ 1] == cb1_data, "Got unexpected value %#x.\n", result[1]); ok(result[ 2] == cb2_data, "Got unexpected value %#x.\n", result[2]); @@ -18187,7 +18187,7 @@ static void test_copy_descriptors(void) ok(result[41] == u1_data.f, "Got unexpected value %#x.\n", result[41]); ok(result[42] == u1_data.f, "Got unexpected value %#x.\n", result[42]); ok(result[43] == 0xdeadbeef, "Got unexpected value %#x.\n", result[43]); - assert(rb.width == 44); + assert(rb.rb.width == 44); release_resource_readback(&rb); ID3D12DescriptorHeap_Release(cpu_heap); @@ -18211,10 +18211,10 @@ static void test_copy_descriptors_range_sizes(void) ID3D12Resource *green_texture, *blue_texture; UINT dst_range_sizes[1], src_range_sizes[1]; ID3D12GraphicsCommandList *command_list; + struct d3d12_resource_readback rb; ID3D12DescriptorHeap *cpu_heap; struct test_context_desc desc; D3D12_SUBRESOURCE_DATA data; - struct resource_readback rb; struct test_context context; ID3D12DescriptorHeap *heap; ID3D12CommandQueue *queue; @@ -18357,7 +18357,7 @@ static void test_copy_descriptors_range_sizes(void) for (i = 0; i < desc.rt_width; ++i) { set_box(&box, i, 0, 0, i + 1, desc.rt_height, 1); - check_readback_data_uint(&rb, &box, i % 2 ? 0xffff0000 : 0xff00ff00, 0); + check_readback_data_uint(&rb.rb, &box, i % 2 ? 0xffff0000 : 0xff00ff00, 0); } release_resource_readback(&rb); @@ -20954,7 +20954,7 @@ static void test_typed_buffer_uav(void) ID3D12DescriptorHeap *descriptor_heap; ID3D12RootSignature *root_signature; ID3D12PipelineState *pipeline_state; - struct resource_readback rb; + struct d3d12_resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Resource *resource; @@ -21035,7 +21035,7 @@ static void test_typed_buffer_uav(void) D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(resource, uav_desc.Format, &rb, queue, command_list); - check_readback_data_float(&rb, NULL, 0.5f, 0); + check_readback_data_float(&rb.rb, NULL, 0.5f, 0); release_resource_readback(&rb); ID3D12Resource_Release(resource); @@ -21197,7 +21197,7 @@ static void test_compute_shader_registers(void) D3D12_ROOT_PARAMETER root_parameters[2]; unsigned int i, x, y, group_x, group_y; ID3D12DescriptorHeap *descriptor_heap; - struct resource_readback rb; + struct d3d12_resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Resource *resource; @@ -21312,7 +21312,7 @@ static void test_compute_shader_registers(void) get_buffer_readback_with_command_list(resource, uav_desc.Format, &rb, queue, command_list); i = 0; - data = rb.data; + data = rb.rb.data; for (y = 0; y < dimensions.y; ++y) { for (group_y = 0; group_y < 2; ++group_y) @@ -21366,9 +21366,9 @@ static void test_tgsm(void) ID3D12GraphicsCommandList *command_list; D3D12_ROOT_PARAMETER root_parameters[1]; ID3D12DescriptorHeap *descriptor_heap; + struct d3d12_resource_readback rb; ID3D12Resource *buffer, *buffer2; unsigned int data, expected; - struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Device *device; @@ -21580,7 +21580,7 @@ static void test_tgsm(void) get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); for (i = 0; i < 64; ++i) { - data = get_readback_uint(&rb, i, 0, 0); + data = get_readback_uint(&rb.rb, i, 0, 0); expected = 33 * i; ok(data == expected, "Got %u, expected %u (index %u).\n", data, expected, i); } @@ -21629,7 +21629,7 @@ static void test_tgsm(void) for (i = 0; i < 32; ++i) { expected = 64 * i + 32; - data = get_readback_uint(&rb, i, 0, 0); + data = get_readback_uint(&rb.rb, i, 0, 0); ok(data == expected, "Got %u, expected %u (index %u).\n", data, expected, i); } release_resource_readback(&rb); @@ -21638,7 +21638,7 @@ static void test_tgsm(void) for (i = 0; i < 32; ++i) { expected = 64 * i + 32; - data = get_readback_uint(&rb, i, 0, 0); + data = get_readback_uint(&rb.rb, i, 0, 0); ok(data == expected || !data, "Got %u, expected %u (index %u).\n", data, expected, i); } release_resource_readback(&rb); @@ -21678,7 +21678,7 @@ static void test_tgsm(void) for (i = 0; i < 96; ++i) { expected = (i % 32 + 1) * (i / 32); - float_data = get_readback_float(&rb, i, 0); + float_data = get_readback_float(&rb.rb, i, 0); ok(float_data == expected, "Got %.8e, expected %u (index %u).\n", float_data, expected, i); } release_resource_readback(&rb); @@ -21687,7 +21687,7 @@ static void test_tgsm(void) for (i = 0; i < 96; ++i) { expected = (i % 32 + 1) * (i / 32); - data = get_readback_uint(&rb, i, 0, 0); + data = get_readback_uint(&rb.rb, i, 0, 0); ok(data == expected, "Got %u, expected %u (index %u).\n", data, expected, i); } release_resource_readback(&rb); @@ -21722,11 +21722,11 @@ static void test_uav_load(void) const struct texture *current_texture; D3D12_HEAP_PROPERTIES heap_properties; ID3D12Resource *texture, *rt_texture; + struct d3d12_resource_readback rb; D3D12_RESOURCE_DESC resource_desc; D3D12_CLEAR_VALUE clear_value; struct test_context_desc desc; struct test_context context; - struct resource_readback rb; ID3D12CommandQueue *queue; unsigned int rtv_size; ID3D12Device *device; @@ -22095,7 +22095,7 @@ static void test_uav_load(void) for (x = 0; x < 4; ++x) { unsigned int expected = test->expected_colors[y * 4 + x]; - unsigned int color = get_readback_uint(&rb, 80 + x * 160, 60 + y * 120, 0); + unsigned int color = get_readback_uint(&rb.rb, 80 + x * 160, 60 + y * 120, 0); ok(compare_color(color, expected, 0), "Test %u: Got 0x%08x, expected 0x%08x at (%u, %u).\n", i, color, expected, x, y); @@ -22129,7 +22129,7 @@ static void test_cs_uav_store(void) ID3D12DescriptorHeap *descriptor_heap; ID3D12RootSignature *root_signature; ID3D12PipelineState *pipeline_state; - struct resource_readback rb; + struct d3d12_resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Resource *resource; @@ -22440,11 +22440,11 @@ static void test_cs_uav_store(void) D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(resource, 0, &rb, queue, command_list); set_rect(&rect, 0, 0, 16, 32); - check_readback_data_float(&rb, &rect, 0.5f, 2); - set_rect(&rect, 0, 32, rb.width, rb.height); - check_readback_data_float(&rb, &rect, 1.0f, 2); - set_rect(&rect, 16, 0, rb.width, rb.height); - check_readback_data_float(&rb, &rect, 1.0f, 2); + check_readback_data_float(&rb.rb, &rect, 0.5f, 2); + set_rect(&rect, 0, 32, rb.rb.width, rb.rb.height); + check_readback_data_float(&rb.rb, &rect, 1.0f, 2); + set_rect(&rect, 16, 0, rb.rb.width, rb.rb.height); + check_readback_data_float(&rb.rb, &rect, 1.0f, 2); release_resource_readback(&rb); ID3D12PipelineState_Release(pipeline_state); @@ -22470,11 +22470,11 @@ static void test_cs_uav_store(void) D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(resource, 0, &rb, queue, command_list); set_rect(&rect, 0, 0, 60, 60); - check_readback_data_float(&rb, &rect, 0.6f, 2); - set_rect(&rect, 0, 60, rb.width, rb.height); - check_readback_data_float(&rb, &rect, 1.0f, 2); - set_rect(&rect, 60, 0, rb.width, rb.height); - check_readback_data_float(&rb, &rect, 1.0f, 2); + check_readback_data_float(&rb.rb, &rect, 0.6f, 2); + set_rect(&rect, 0, 60, rb.rb.width, rb.rb.height); + check_readback_data_float(&rb.rb, &rect, 1.0f, 2); + set_rect(&rect, 60, 0, rb.rb.width, rb.rb.height); + check_readback_data_float(&rb.rb, &rect, 1.0f, 2); release_resource_readback(&rb); memset(&input, 0, sizeof(input)); @@ -22509,14 +22509,14 @@ static void test_cs_uav_store(void) static unsigned int read_uav_counter(const struct test_context *context, ID3D12Resource *counter_buffer, size_t offset) { - struct resource_readback rb; + struct d3d12_resource_readback rb; uint32_t counter; transition_sub_resource_state(context->list, counter_buffer, 0, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(counter_buffer, DXGI_FORMAT_R32_UINT, &rb, context->queue, context->list); - counter = get_readback_uint(&rb, offset / sizeof(counter), 0, 0); + counter = get_readback_uint(&rb.rb, offset / sizeof(counter), 0, 0); release_resource_readback(&rb); reset_command_list(context->list, context->allocator); transition_sub_resource_state(context->list, counter_buffer, 0, @@ -22538,7 +22538,7 @@ static void test_uav_counters(void) ID3D12GraphicsCommandList *command_list; D3D12_ROOT_PARAMETER root_parameters[1]; ID3D12DescriptorHeap *descriptor_heap; - struct resource_readback rb; + struct d3d12_resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; uint32_t data, id[128]; @@ -22665,7 +22665,7 @@ static void test_uav_counters(void) transition_sub_resource_state(command_list, buffer, 0, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - memcpy(id, rb.data, 64 * sizeof(*id)); + memcpy(id, rb.rb.data, 64 * sizeof(*id)); release_resource_readback(&rb); qsort(id, 64, sizeof(*id), compare_id); for (j = 0; j < 64; ++j) @@ -22696,7 +22696,7 @@ static void test_uav_counters(void) counter = read_uav_counter(&context, counter_buffer, uav_desc.Buffer.CounterOffsetInBytes); ok(!counter, "Got unexpected value %u.\n", counter); get_buffer_readback_with_command_list(out_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - memcpy(id, rb.data, 64 * sizeof(*id)); + memcpy(id, rb.rb.data, 64 * sizeof(*id)); release_resource_readback(&rb); qsort(id, 64, sizeof(*id), compare_id); for (j = 0; j < 64; ++j) @@ -22745,7 +22745,7 @@ static void test_uav_counters(void) get_buffer_readback_with_command_list(out_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); for (j = 0; j < 8; ++j) { - data = get_readback_uint(&rb, j, 0, 0); + data = get_readback_uint(&rb.rb, j, 0, 0); ok(data == 0xdeadbeef, "Got data %u at %u.\n", data, j); } release_resource_readback(&rb); @@ -22911,9 +22911,9 @@ static void test_graphics_uav_counters(void) ID3D12GraphicsCommandList *command_list; ID3D12Resource *buffer, *counter_buffer; D3D12_ROOT_PARAMETER root_parameters[1]; + struct d3d12_resource_readback rb; struct test_context_desc desc; struct test_context context; - struct resource_readback rb; ID3D12CommandQueue *queue; ID3D12Device *device; uint32_t counter; @@ -23023,7 +23023,7 @@ static void test_graphics_uav_counters(void) D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); set_box(&box, 0, 0, 0, uav_desc.Buffer.NumElements, 1, 1); - check_readback_data_uint(&rb, &box, 1, 0); + check_readback_data_uint(&rb.rb, &box, 1, 0); release_resource_readback(&rb); ID3D12Resource_Release(buffer); @@ -23040,8 +23040,8 @@ static void test_atomic_instructions(void) ID3D12GraphicsCommandList *command_list; D3D12_ROOT_PARAMETER root_parameters[3]; ID3D12PipelineState *pipeline_state; + struct d3d12_resource_readback rb; struct test_context_desc desc; - struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Device *device; @@ -23253,7 +23253,7 @@ static void test_atomic_instructions(void) get_buffer_readback_with_command_list(ps_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); for (j = 0; j < ARRAY_SIZE(instructions); ++j) { - unsigned int value = get_readback_uint(&rb, j, 0, 0); + unsigned int value = get_readback_uint(&rb.rb, j, 0, 0); unsigned int expected = test->expected_result[j]; bool is_bug; @@ -23277,7 +23277,7 @@ static void test_atomic_instructions(void) { bool bug_instruction = !strcmp(imm_instructions[j], "imm_atomic_imax") || !strcmp(imm_instructions[j], "imm_atomic_imin"); - unsigned int value = get_readback_uint(&rb, j, 0, 0); + unsigned int value = get_readback_uint(&rb.rb, j, 0, 0); unsigned int expected = test->expected_result[j]; /* Fixed at least on radv with mesa >= 21.3.7. */ @@ -23295,7 +23295,7 @@ static void test_atomic_instructions(void) get_buffer_readback_with_command_list(cs_buffer2, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); for (j = 0; j < ARRAY_SIZE(instructions); ++j) { - unsigned int out_value = get_readback_uint(&rb, j, 0, 0); + unsigned int out_value = get_readback_uint(&rb.rb, j, 0, 0); ok(out_value == test->input[j], "Got original value %u, expected %u for '%s'.\n", out_value, test->input[j], imm_instructions[j]); } @@ -23338,9 +23338,9 @@ static void test_buffer_srv(void) ID3D12DescriptorHeap *descriptor_heap; const struct buffer *current_buffer; unsigned int color, expected_color; + struct d3d12_resource_readback rb; struct test_context_desc desc; struct test_context context; - struct resource_readback rb; ID3D12CommandQueue *queue; ID3D12Resource *buffer; ID3D12Device *device; @@ -23599,7 +23599,7 @@ static void test_buffer_srv(void) { for (x = 0; x < 4; ++x) { - color = get_readback_uint(&rb, 80 + x * 160, 60 + y * 120, 0); + color = get_readback_uint(&rb.rb, 80 + x * 160, 60 + y * 120, 0); expected_color = test->expected_colors[y * 4 + x]; ok(compare_color(color, expected_color, 1), "Test %u: Got 0x%08x, expected 0x%08x at (%u, %u).\n", @@ -23676,10 +23676,10 @@ static void test_query_timestamp(void) { uint64_t timestamps[4], timestamp_frequency, timestamp_diff, time_diff; ID3D12GraphicsCommandList *command_list; + struct d3d12_resource_readback rb; D3D12_QUERY_HEAP_DESC heap_desc; struct test_context_desc desc; ID3D12QueryHeap *query_heap; - struct resource_readback rb; struct test_context context; time_t time_start, time_end; ID3D12CommandQueue *queue; @@ -23722,7 +23722,7 @@ static void test_query_timestamp(void) time_end = time(NULL) + 1; for (i = 0; i < ARRAY_SIZE(timestamps); ++i) - timestamps[i] = get_readback_uint64(&rb, i, 0); + timestamps[i] = get_readback_uint64(&rb.rb, i, 0); for (i = 0; i < ARRAY_SIZE(timestamps) - 1; ++i) { @@ -23747,13 +23747,13 @@ static void test_query_pipeline_statistics(void) D3D12_QUERY_DATA_PIPELINE_STATISTICS *pipeline_statistics; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; ID3D12GraphicsCommandList *command_list; + struct d3d12_resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Device *device; D3D12_QUERY_HEAP_DESC heap_desc; ID3D12QueryHeap *query_heap; ID3D12Resource *resource; - struct resource_readback rb; unsigned int pixel_count, i; HRESULT hr; @@ -23798,11 +23798,11 @@ static void test_query_pipeline_statistics(void) for (i = 0; i < sizeof(struct D3D12_QUERY_DATA_PIPELINE_STATISTICS) / sizeof(uint64_t); ++i) { - uint64_t value = get_readback_uint64(&rb, i, 0); + uint64_t value = get_readback_uint64(&rb.rb, i, 0); ok(!value, "Element %d: Got %"PRIu64", expected 0.\n", i, value); } - pipeline_statistics = get_readback_data(&rb, 1, 0, 0, sizeof(*pipeline_statistics)); + pipeline_statistics = get_readback_data(&rb.rb, 1, 0, 0, sizeof(*pipeline_statistics)); /* We read 3 vertices that formed one primitive. */ ok(pipeline_statistics->IAVertices == 3, "IAVertices: Got %"PRIu64", expected 3.\n", @@ -23847,6 +23847,7 @@ static void test_query_occlusion(void) { struct test_context_desc desc; ID3D12GraphicsCommandList *command_list; + struct d3d12_resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Device *device; @@ -23855,7 +23856,6 @@ static void test_query_occlusion(void) D3D12_QUERY_HEAP_DESC heap_desc; ID3D12QueryHeap *query_heap; ID3D12Resource *resource; - struct resource_readback rb; unsigned int i; HRESULT hr; @@ -23960,7 +23960,7 @@ static void test_query_occlusion(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { const bool samples_passed = tests[i].draw && tests[i].clear_depth > tests[i].depth; - const uint64_t result = get_readback_uint64(&rb, i, 0); + const uint64_t result = get_readback_uint64(&rb.rb, i, 0); uint64_t expected_result; if (tests[i].type == D3D12_QUERY_TYPE_BINARY_OCCLUSION) @@ -23984,10 +23984,10 @@ static void test_resolve_non_issued_query_data(void) static const uint64_t initial_data[] = {0xdeadbeef, 0xdeadbeef, 0xdeadbabe, 0xdeadbeef}; ID3D12Resource *readback_buffer, *upload_buffer; ID3D12GraphicsCommandList *command_list; + struct d3d12_resource_readback rb; D3D12_QUERY_HEAP_DESC heap_desc; struct test_context_desc desc; ID3D12QueryHeap *query_heap; - struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Device *device; @@ -24018,7 +24018,7 @@ static void test_resolve_non_issued_query_data(void) D3D12_QUERY_TYPE_TIMESTAMP, 0, 4, readback_buffer, 0); get_buffer_readback_with_command_list(readback_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); - timestamps = get_readback_data(&rb, 0, 0, 0, sizeof(*timestamps)); + timestamps = get_readback_data(&rb.rb, 0, 0, 0, sizeof(*timestamps)); ok(timestamps[0] != initial_data[0] && timestamps[0] > 0, "Got unexpected timestamp %#"PRIx64".\n", timestamps[0]); ok(!timestamps[1], "Got unexpected timestamp %#"PRIx64".\n", timestamps[1]); @@ -24036,9 +24036,9 @@ static void test_resolve_non_issued_query_data(void) static void test_resolve_query_data_in_different_command_list(void) { ID3D12GraphicsCommandList *command_list; + struct d3d12_resource_readback rb; D3D12_QUERY_HEAP_DESC heap_desc; ID3D12Resource *readback_buffer; - struct resource_readback rb; ID3D12QueryHeap *query_heap; struct test_context context; ID3D12CommandQueue *queue; @@ -24102,7 +24102,7 @@ static void test_resolve_query_data_in_different_command_list(void) for (i = 0; i < readback_buffer_capacity; ++i) { uint64_t expected_result = context.render_target_desc.Width * context.render_target_desc.Height; - uint64_t result = get_readback_uint64(&rb, i, 0); + uint64_t result = get_readback_uint64(&rb.rb, i, 0); ok(result == expected_result, "Got unexpected result %"PRIu64" at %u.\n", result, i); } @@ -24117,9 +24117,9 @@ static void test_resolve_query_data_in_reordered_command_list(void) { ID3D12GraphicsCommandList *command_lists[2]; ID3D12CommandAllocator *command_allocator; + struct d3d12_resource_readback rb; D3D12_QUERY_HEAP_DESC heap_desc; ID3D12Resource *readback_buffer; - struct resource_readback rb; ID3D12QueryHeap *query_heap; struct test_context context; ID3D12CommandQueue *queue; @@ -24173,7 +24173,7 @@ static void test_resolve_query_data_in_reordered_command_list(void) reset_command_list(command_lists[0], context.allocator); get_buffer_readback_with_command_list(readback_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_lists[0]); - result = get_readback_uint64(&rb, 0, 0); + result = get_readback_uint64(&rb.rb, 0, 0); todo ok(result == context.render_target_desc.Width * context.render_target_desc.Height, "Got unexpected result %"PRIu64".\n", result); release_resource_readback(&rb); @@ -24195,10 +24195,10 @@ static void test_execute_indirect(void) D3D12_ROOT_PARAMETER root_parameter; ID3D12PipelineState *pipeline_state; ID3D12RootSignature *root_signature; + struct d3d12_resource_readback rb; struct test_context_desc desc; D3D12_VERTEX_BUFFER_VIEW vbv; D3D12_INDEX_BUFFER_VIEW ibv; - struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Resource *vb, *ib; @@ -24418,9 +24418,9 @@ static void test_execute_indirect(void) transition_sub_resource_state(command_list, uav, 0, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(uav, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - for (i = 0; i < rb.width; ++i) + for (i = 0; i < rb.rb.width; ++i) { - unsigned int ret = get_readback_uint(&rb, i, 0, 0); + unsigned int ret = get_readback_uint(&rb.rb, i, 0, 0); ok(ret == i, "Got unexpected result %#x at index %u.\n", ret, i); } release_resource_readback(&rb); @@ -24450,11 +24450,11 @@ static void test_execute_indirect(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); set_box(&box, 0, 0, 0, 32, 8, 1); - check_readback_data_uint(&rb, &box, 0xffffff00, 0); + check_readback_data_uint(&rb.rb, &box, 0xffffff00, 0); set_box(&box, 24, 8, 0, 32, 32, 1); - check_readback_data_uint(&rb, &box, 0xffffff00, 0); + check_readback_data_uint(&rb.rb, &box, 0xffffff00, 0); set_box(&box, 0, 8, 0, 24, 32, 1); - check_readback_data_uint(&rb, &box, 0xff00ff00, 0); + check_readback_data_uint(&rb.rb, &box, 0xff00ff00, 0); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -24497,7 +24497,7 @@ static void test_dispatch_zero_thread_groups(void) ID3D12GraphicsCommandList *command_list; D3D12_ROOT_PARAMETER root_parameters[2]; ID3D12Resource *argument_buffer, *uav; - struct resource_readback rb; + struct d3d12_resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; unsigned int ret, i; @@ -24595,9 +24595,9 @@ static void test_dispatch_zero_thread_groups(void) transition_sub_resource_state(command_list, uav, 0, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(uav, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - ret = get_readback_uint(&rb, 0, 0, 0); + ret = get_readback_uint(&rb.rb, 0, 0, 0); ok(ret == 10, "Got unexpected result %#x.\n", ret); - ret = get_readback_uint(&rb, 64, 0, 0); + ret = get_readback_uint(&rb.rb, 64, 0, 0); ok(ret == 50, "Got unexpected result %#x.\n", ret); release_resource_readback(&rb); @@ -24784,12 +24784,12 @@ static void test_instance_id(void) ID3D12GraphicsCommandList *command_list; D3D12_INPUT_LAYOUT_DESC input_layout; D3D12_CPU_DESCRIPTOR_HANDLE rtvs[2]; + struct d3d12_resource_readback rb; D3D12_VERTEX_BUFFER_VIEW vbv[3]; ID3D12Resource *argument_buffer; ID3D12Resource *render_target; struct test_context_desc desc; struct test_context context; - struct resource_readback rb; ID3D12CommandQueue *queue; ID3D12Resource *vb[3]; unsigned int i, j; @@ -25036,14 +25036,14 @@ static void test_instance_id(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); for (j = 0; j < ARRAY_SIZE(expected_results); ++j) - check_readback_data_uint(&rb, &expected_results[j].box, tests[i].expected_colors[j], 1); + check_readback_data_uint(&rb.rb, &expected_results[j].box, tests[i].expected_colors[j], 1); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(render_target, 0, &rb, queue, command_list); for (j = 0; j < ARRAY_SIZE(expected_results); ++j) - check_readback_data_uint(&rb, &expected_results[j].box, expected_results[j].instance_id, 0); + check_readback_data_uint(&rb.rb, &expected_results[j].box, expected_results[j].instance_id, 0); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -25203,11 +25203,11 @@ static void test_vertex_id(void) ID3D12GraphicsCommandList *command_list; D3D12_INPUT_LAYOUT_DESC input_layout; D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; + struct d3d12_resource_readback rb; ID3D12Resource *upload_buffer; struct test_context_desc desc; D3D12_VERTEX_BUFFER_VIEW vbv; D3D12_INDEX_BUFFER_VIEW ibv; - struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Resource *vb, *ib; @@ -25312,7 +25312,7 @@ static void test_vertex_id(void) D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(counter_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - count = get_readback_uint(&rb, 0, 0, 0); + count = get_readback_uint(&rb.rb, 0, 0, 0); ok(count == ARRAY_SIZE(expected_values) * sizeof(struct vec4), "Got counter value %u, expected %uu.\n", count, (unsigned int)(ARRAY_SIZE(expected_values) * sizeof(struct vec4))); release_resource_readback(&rb); @@ -25325,7 +25325,7 @@ static void test_vertex_id(void) { for (j = 0; j < count; ++j) { - if (!used_values[j] && compare_uvec4(get_readback_uvec4(&rb, j, 0), &expected_values[i])) + if (!used_values[j] && compare_uvec4(get_readback_uvec4(&rb.rb, j, 0), &expected_values[i])) { found_values[i] = true; used_values[j] = true; @@ -25336,7 +25336,7 @@ static void test_vertex_id(void) for (i = 0; i < count; ++i) { - const struct uvec4 *v = get_readback_uvec4(&rb, i, 0); + const struct uvec4 *v = get_readback_uvec4(&rb.rb, i, 0); ok(used_values[i], "Found unexpected value {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n", v->x, v->y, v->z, v->w); } release_resource_readback(&rb); @@ -25365,10 +25365,10 @@ static void test_copy_texture(void) ID3D12Resource *src_texture, *dst_texture; ID3D12GraphicsCommandList *command_list; D3D12_SUBRESOURCE_DATA texture_data; + struct d3d12_resource_readback rb; struct depth_stencil_resource ds; struct test_context_desc desc; struct test_context context; - struct resource_readback rb; ID3D12DescriptorHeap *heap; ID3D12CommandQueue *queue; ID3D12Device *device; @@ -25472,7 +25472,7 @@ static void test_copy_texture(void) { for (x = 0; x < 4; ++x) { - unsigned int color = get_readback_uint(&rb, x, y, 0); + unsigned int color = get_readback_uint(&rb.rb, x, y, 0); unsigned int expected = result_data[y * 4 + x]; ok(color == expected, @@ -25554,10 +25554,10 @@ static void test_copy_texture_buffer(void) D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; ID3D12GraphicsCommandList *command_list; D3D12_SUBRESOURCE_DATA texture_data; + struct d3d12_resource_readback rb; 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; @@ -25653,7 +25653,7 @@ static void test_copy_texture_buffer(void) 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); + got = get_readback_uint(&rb.rb, i, 0, 0); expected = i; if (got != expected) @@ -25669,7 +25669,7 @@ static void test_copy_texture_buffer(void) { for (x = 0; x < 64; ++x) { - got = get_readback_uint(&rb, 64 * y + x, 0, 0); + got = get_readback_uint(&rb.rb, 64 * y + x, 0, 0); expected = 64 * (31 - y) + x; if (got != expected) @@ -25688,7 +25688,7 @@ static void test_copy_texture_buffer(void) { for (x = 0; x < 64; ++x) { - got = get_readback_uint(&rb, 64 * y + x, 0, 0); + got = get_readback_uint(&rb.rb, 64 * y + x, 0, 0); expected = 64 * y + 63 - x; if (got != expected) @@ -25707,7 +25707,7 @@ static void test_copy_texture_buffer(void) { for (x = 0; x < 64; ++x) { - got = get_readback_uint(&rb, 64 * y + x, 0, 0); + got = get_readback_uint(&rb.rb, 64 * y + x, 0, 0); expected = 64 * y + x % 32; if (got != expected) @@ -25729,9 +25729,9 @@ static void test_copy_buffer_texture(void) { D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; ID3D12GraphicsCommandList *command_list; + struct d3d12_resource_readback rb; struct test_context_desc desc; struct test_context context; - struct resource_readback rb; ID3D12Resource *zero_buffer; ID3D12Resource *dst_texture; ID3D12Resource *src_buffer; @@ -25844,7 +25844,7 @@ static void test_copy_buffer_texture(void) { for (x = 0; x < 128; ++x) { - got = get_readback_uint(&rb, x, y, z); + got = get_readback_uint(&rb.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 */ @@ -25876,7 +25876,7 @@ static void test_copy_buffer_texture(void) { for (x = 0; x < 64; ++x) { - got = get_readback_uint(&rb, x, y, z); + got = get_readback_uint(&rb.rb, x, y, z); expected = (z + 1) << 16 | (y + 1) << 8 | (x + 1); if (got != expected) @@ -25904,10 +25904,10 @@ static void test_copy_block_compressed_texture(void) D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; ID3D12Resource *dst_buffer, *src_buffer; ID3D12GraphicsCommandList *command_list; + struct d3d12_resource_readback rb; struct test_context_desc desc; unsigned int x, y, block_id; struct test_context context; - struct resource_readback rb; struct uvec4 got, expected; ID3D12CommandQueue *queue; ID3D12Resource *texture; @@ -26030,7 +26030,7 @@ static void test_copy_block_compressed_texture(void) expected.y = block_id << 8 | 1; expected.z = block_id << 8 | 2; expected.w = block_id << 8 | 3; - got = *get_readback_uvec4(&rb, x, y); + got = *get_readback_uvec4(&rb.rb, x, y); if (!compare_uvec4(&got, &expected)) break; @@ -26050,7 +26050,7 @@ static void test_copy_block_compressed_texture(void) expected.y = block_id << 8 | 1; expected.z = block_id << 8 | 2; expected.w = block_id << 8 | 3; - got = *get_readback_uvec4(&rb, 0, 0); + got = *get_readback_uvec4(&rb.rb, 0, 0); release_resource_readback(&rb); ok(compare_uvec4(&got, &expected), "Got {0x%08x, 0x%08x, 0x%08x, 0x%08x}, expected {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n", @@ -26063,7 +26063,7 @@ static void test_copy_block_compressed_texture(void) expected.y = block_id << 8 | 1; expected.z = block_id << 8 | 2; expected.w = block_id << 8 | 3; - got = *get_readback_uvec4(&rb, 0, 0); + got = *get_readback_uvec4(&rb.rb, 0, 0); release_resource_readback(&rb); ok(compare_uvec4(&got, &expected), "Got {0x%08x, 0x%08x, 0x%08x, 0x%08x}, expected {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n", @@ -26090,7 +26090,7 @@ static void test_copy_block_compressed_texture(void) expected.y = block_id << 8 | 1; expected.z = block_id << 8 | 2; expected.w = block_id << 8 | 3; - got = *get_readback_uvec4(&rb, x + row_offset, 0); + got = *get_readback_uvec4(&rb.rb, x + row_offset, 0); if (!compare_uvec4(&got, &expected)) break; @@ -26118,10 +26118,10 @@ static void test_separate_bindings(void) D3D12_DESCRIPTOR_RANGE descriptor_ranges[2]; ID3D12GraphicsCommandList *command_list; D3D12_ROOT_PARAMETER root_parameters[4]; + struct d3d12_resource_readback rb; ID3D12PipelineState *compute_pso; ID3D12Resource *cs_cb, *ps_cb; struct test_context_desc desc; - struct resource_readback rb; D3D12_SUBRESOURCE_DATA data; struct test_context context; ID3D12DescriptorHeap *heap; @@ -26409,7 +26409,7 @@ static void test_separate_bindings(void) transition_resource_state(command_list, cs_raw_uav_buffer, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(cs_raw_uav_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - check_readback_data_uint(&rb, NULL, 0xffffffff, 0); + check_readback_data_uint(&rb.rb, NULL, 0xffffffff, 0); release_resource_readback(&rb); ID3D12Resource_Release(cs_cb); @@ -26796,9 +26796,9 @@ static void test_geometry_shader(void) D3D12_INPUT_LAYOUT_DESC input_layout; D3D12_CPU_DESCRIPTOR_HANDLE rtvs[2]; ID3D12PipelineState *pso_5_0, *pso; + struct d3d12_resource_readback rb; struct test_context_desc desc; D3D12_VERTEX_BUFFER_VIEW vbv; - struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Resource *texture; @@ -27023,29 +27023,29 @@ static void test_geometry_shader(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - color = get_readback_uint(&rb, 320, 190, 0); + color = get_readback_uint(&rb.rb, 320, 190, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 255, 240, 0); + color = get_readback_uint(&rb.rb, 255, 240, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 320, 240, 0); + color = get_readback_uint(&rb.rb, 320, 240, 0); ok(compare_color(color, 0xffffff00, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 385, 240, 0); + color = get_readback_uint(&rb.rb, 385, 240, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 320, 290, 0); + color = get_readback_uint(&rb.rb, 320, 290, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); get_texture_readback_with_command_list(texture, 0, &rb, queue, command_list); - color = get_readback_uint(&rb, 320, 190, 0); + color = get_readback_uint(&rb.rb, 320, 190, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 255, 240, 0); + color = get_readback_uint(&rb.rb, 255, 240, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 320, 240, 0); + color = get_readback_uint(&rb.rb, 320, 240, 0); ok(compare_color(color, 0xffffff00, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 385, 240, 0); + color = get_readback_uint(&rb.rb, 385, 240, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 320, 290, 0); + color = get_readback_uint(&rb.rb, 320, 290, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); release_resource_readback(&rb); @@ -27938,9 +27938,9 @@ static void test_quad_tessellation(void) D3D12_QUERY_HEAP_DESC query_heap_desc; D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; D3D12_INPUT_LAYOUT_DESC input_layout; + struct d3d12_resource_readback rb; struct test_context_desc desc; D3D12_VERTEX_BUFFER_VIEW vbv; - struct resource_readback rb; ID3D12QueryHeap *query_heap; struct test_context context; ID3D12CommandQueue *queue; @@ -28042,7 +28042,7 @@ static void test_quad_tessellation(void) transition_resource_state(command_list, so_buffer, D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); - check_triangles(&rb, expected_quad_ccw, ARRAY_SIZE(expected_quad_ccw)); + check_triangles(&rb.rb, expected_quad_ccw, ARRAY_SIZE(expected_quad_ccw)); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -28083,7 +28083,7 @@ static void test_quad_tessellation(void) transition_resource_state(command_list, so_buffer, D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); - check_triangles(&rb, expected_quad_cw, ARRAY_SIZE(expected_quad_cw)); + check_triangles(&rb.rb, expected_quad_cw, ARRAY_SIZE(expected_quad_cw)); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -28129,7 +28129,7 @@ static void test_quad_tessellation(void) query_heap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 0, 2, readback_buffer, 0); get_buffer_readback_with_command_list(readback_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); - so_statistics = get_readback_data(&rb, 0, 0, 0, sizeof(*so_statistics)); + so_statistics = get_readback_data(&rb.rb, 0, 0, 0, sizeof(*so_statistics)); ok(so_statistics[0].NumPrimitivesWritten == 8, "Got unexpected primitives written %u.\n", (unsigned int)so_statistics[0].NumPrimitivesWritten); ok(so_statistics[0].PrimitivesStorageNeeded == 8, "Got unexpected primitives storage needed %u.\n", @@ -28730,9 +28730,9 @@ static void test_line_tessellation(void) D3D12_QUERY_HEAP_DESC query_heap_desc; D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv[2]; D3D12_INPUT_LAYOUT_DESC input_layout; + struct d3d12_resource_readback rb; struct test_context_desc desc; D3D12_VERTEX_BUFFER_VIEW vbv; - struct resource_readback rb; ID3D12QueryHeap *query_heap; struct test_context context; const struct vec4 *expected; @@ -29011,7 +29011,7 @@ static void test_line_tessellation(void) query_heap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 0, 1, readback_buffer, 0); get_buffer_readback_with_command_list(readback_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); - so_statistics = get_readback_data(&rb, 0, 0, 0, sizeof(*so_statistics)); + so_statistics = get_readback_data(&rb.rb, 0, 0, 0, sizeof(*so_statistics)); broken_warp = broken_on_warp(so_statistics[0].NumPrimitivesWritten != 9); ok(so_statistics[0].NumPrimitivesWritten == 9 || broken_warp, "Got unexpected primitives written %u.\n", (unsigned int)so_statistics[0].NumPrimitivesWritten); @@ -29031,12 +29031,12 @@ static void test_line_tessellation(void) get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); for (i = 0; i < ARRAY_SIZE(expected_data) / 3 ; ++i) { - data = get_readback_data(&rb, i, 0, 0, sizeof(*data)); + data = get_readback_data(&rb.rb, i, 0, 0, sizeof(*data)); expected = &expected_data[3 * i + 0]; ok(compare_vec4(data, expected, 1), "Got position {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n", data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i); - data = get_readback_data(&rb, i + 2048 / (2 * sizeof(*data)), 0, 0, 2 * sizeof(*data)); + data = get_readback_data(&rb.rb, i + 2048 / (2 * sizeof(*data)), 0, 0, 2 * sizeof(*data)); expected = &expected_data[3 * i + 1]; bug_if(is_nvidia_device(context.device)) ok(compare_vec4(data, expected, 1), @@ -29387,8 +29387,8 @@ static void test_domain_shader_inputs(void) ID3D12GraphicsCommandList *command_list; D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; D3D12_INPUT_LAYOUT_DESC input_layout; + struct d3d12_resource_readback rb; struct test_context_desc desc; - struct resource_readback rb; struct test_context context; ID3D12Resource *so_buffer; ID3D12CommandQueue *queue; @@ -29573,7 +29573,7 @@ static void test_domain_shader_inputs(void) get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); for (y = 0; y < ARRAY_SIZE(reference); ++y) { - const float *elems = get_readback_data(&rb, y, 0, 0, stride); + const float *elems = get_readback_data(&rb.rb, y, 0, 0, stride); for (x = 0; x < ARRAY_SIZE(*reference); ++x) { ok(compare_float(reference[y][x], elems[x], 0), @@ -29592,8 +29592,8 @@ static void test_domain_shader_one_patch_constant_input(void) ID3D12GraphicsCommandList *command_list; D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; D3D12_INPUT_LAYOUT_DESC input_layout; + struct d3d12_resource_readback rb; struct test_context_desc desc; - struct resource_readback rb; struct test_context context; ID3D12Resource *so_buffer; ID3D12CommandQueue *queue; @@ -29747,7 +29747,7 @@ static void test_domain_shader_one_patch_constant_input(void) get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); for (y = 0; y < ARRAY_SIZE(reference); ++y) { - const float *elems = get_readback_data(&rb, y, 0, 0, stride); + const float *elems = get_readback_data(&rb.rb, y, 0, 0, stride); for (x = 0; x < ARRAY_SIZE(*reference); ++x) { ok(compare_float(reference[y][x], elems[x], 0), @@ -29951,7 +29951,7 @@ static void check_clip_distance(struct test_context *context, ID3D12PipelineStat ID3D12GraphicsCommandList *command_list = context->list; ID3D12CommandQueue *queue = context->queue; - struct resource_readback rb; + struct d3d12_resource_readback rb; struct vertex vertices[4]; unsigned int i; D3D12_BOX box; @@ -30064,9 +30064,9 @@ static void check_clip_distance(struct test_context *context, ID3D12PipelineStat D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context->render_target, 0, &rb, queue, command_list); set_box(&box, 0, 0, 0, 320, 480, 1); - check_readback_data_uint(&rb, &box, 0xff00ff00, 1); + check_readback_data_uint(&rb.rb, &box, 0xff00ff00, 1); set_box(&box, 320, 0, 0, 320, 480, 1); - check_readback_data_uint(&rb, &box, 0xffffffff, 1); + check_readback_data_uint(&rb.rb, &box, 0xffffffff, 1); release_resource_readback(&rb); reset_command_list(command_list, context->allocator); @@ -30097,9 +30097,9 @@ static void check_clip_distance(struct test_context *context, ID3D12PipelineStat D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context->render_target, 0, &rb, queue, command_list); set_box(&box, 0, 0, 0, 640, 240, 1); - check_readback_data_uint(&rb, &box, 0xff00ff00, 0); + check_readback_data_uint(&rb.rb, &box, 0xff00ff00, 0); set_box(&box, 0, 240, 0, 640, 240, 1); - check_readback_data_uint(&rb, &box, 0xffffffff, 0); + check_readback_data_uint(&rb.rb, &box, 0xffffffff, 0); release_resource_readback(&rb); reset_command_list(command_list, context->allocator); @@ -30115,9 +30115,9 @@ static void test_clip_distance(void) D3D12_ROOT_PARAMETER root_parameters[4]; ID3D12GraphicsCommandList *command_list; D3D12_INPUT_LAYOUT_DESC input_layout; + struct d3d12_resource_readback rb; D3D12_VERTEX_BUFFER_VIEW vbv[2]; struct test_context_desc desc; - struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12PipelineState *pso; @@ -30738,11 +30738,11 @@ static void test_clip_distance(void) get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); set_box(&box, 0, 0, 0, 320, 240, 1); - check_readback_data_uint(&rb, &box, 0xff00ff00, 1); + check_readback_data_uint(&rb.rb, &box, 0xff00ff00, 1); set_box(&box, 0, 240, 0, 320, 480, 1); - check_readback_data_uint(&rb, &box, 0xffffffff, 1); + check_readback_data_uint(&rb.rb, &box, 0xffffffff, 1); set_box(&box, 320, 0, 0, 640, 480, 1); - check_readback_data_uint(&rb, &box, 0xffffffff, 1); + check_readback_data_uint(&rb.rb, &box, 0xffffffff, 1); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -30787,10 +30787,10 @@ static void test_combined_clip_and_cull_distances(void) { ID3D12GraphicsCommandList *command_list; D3D12_INPUT_LAYOUT_DESC input_layout; + struct d3d12_resource_readback rb; D3D12_VERTEX_BUFFER_VIEW vbv[2]; struct test_context_desc desc; struct test_context context; - struct resource_readback rb; ID3D12CommandQueue *queue; ID3D12Resource *vb[2]; ID3D12Device *device; @@ -30996,9 +30996,9 @@ static void test_combined_clip_and_cull_distances(void) else { get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - color = get_readback_uint(&rb, 160, 240, 0); + color = get_readback_uint(&rb.rb, 160, 240, 0); ok(color == expected_color[0], "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 480, 240, 0); + color = get_readback_uint(&rb.rb, 480, 240, 0); ok(color == expected_color[1], "Got unexpected color 0x%08x.\n", color); release_resource_readback(&rb); } @@ -31203,9 +31203,9 @@ static void test_64kb_texture_alignment(void) ID3D12GraphicsCommandList *command_list; D3D12_RESOURCE_ALLOCATION_INFO info; D3D12_SUBRESOURCE_DATA texture_data; + struct d3d12_resource_readback rb; D3D12_RESOURCE_DESC resource_desc; struct test_context context; - struct resource_readback rb; ID3D12Resource *textures[2]; D3D12_HEAP_DESC heap_desc; ID3D12CommandQueue *queue; @@ -31283,7 +31283,7 @@ static void test_64kb_texture_alignment(void) D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(textures[1], 0, &rb, queue, command_list); set_box(&box, 0, 0, 0, resource_desc.Width, resource_desc.Height, 1); - check_readback_data_uint(&rb, &box, 0xcafef00d, 0); + check_readback_data_uint(&rb.rb, &box, 0xcafef00d, 0); release_resource_readback(&rb); ID3D12Resource_Release(textures[1]); @@ -31295,7 +31295,7 @@ static void test_64kb_texture_alignment(void) /* If the heap could not be used, the texture is not aliased. */ reset_command_list(command_list, context.allocator); get_texture_readback_with_command_list(textures[1], 0, &rb, queue, command_list); - check_readback_data_uint(&rb, &box, 0xdeadbeef, 0); + check_readback_data_uint(&rb.rb, &box, 0xdeadbeef, 0); release_resource_readback(&rb); free(upload_buffer); @@ -32277,9 +32277,9 @@ static void test_shader_sample_position(void) ID3D12Resource *texture, *readback_texture; ID3D12GraphicsCommandList *command_list; D3D12_HEAP_PROPERTIES heap_properties; + struct d3d12_resource_readback rb; D3D12_RESOURCE_DESC resource_desc; struct test_context_desc desc; - struct resource_readback rb; struct test_context context; ID3D12DescriptorHeap *heap; ID3D12CommandQueue *queue; @@ -32378,7 +32378,7 @@ static void test_shader_sample_position(void) get_texture_readback_with_command_list(readback_texture, 0, &rb, queue, command_list); for (i = 0; i < resource_desc.SampleDesc.Count; ++i) { - const struct vec4 *position = get_readback_vec4(&rb, i, 0); + const struct vec4 *position = get_readback_vec4(&rb.rb, i, 0); vkd3d_test_set_context("Sample %u", i); @@ -32589,11 +32589,11 @@ static void test_primitive_restart(void) D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; ID3D12GraphicsCommandList *command_list; D3D12_INPUT_LAYOUT_DESC input_layout; + struct d3d12_resource_readback rb; struct test_context_desc desc; D3D12_VERTEX_BUFFER_VIEW vbv; struct test_context context; D3D12_INDEX_BUFFER_VIEW ibv; - struct resource_readback rb; ID3D12CommandQueue *queue; unsigned int index_count; ID3D12Resource *ib, *vb; @@ -32731,15 +32731,15 @@ static void test_primitive_restart(void) if (tests[i].full_quad) { todo_if(tests[i].is_todo) - check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); + check_readback_data_uint(&rb.rb, NULL, 0xff00ff00, 0); } else { set_box(&box, 16, 0, 0, 32, 10, 1); todo_if(tests[i].is_todo) - check_readback_data_uint(&rb, &box, 0xffffffff, 0); + check_readback_data_uint(&rb.rb, &box, 0xffffffff, 0); set_box(&box, 0, 16, 0, 16, 32, 1); - check_readback_data_uint(&rb, &box, 0xff00ff00, 0); + check_readback_data_uint(&rb.rb, &box, 0xff00ff00, 0); } release_resource_readback(&rb); @@ -32763,9 +32763,9 @@ static void test_vertex_shader_stream_output(void) ID3D12Resource *counter_buffer, *so_buffer; ID3D12GraphicsCommandList *command_list; D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; + struct d3d12_resource_readback rb; ID3D12Resource *upload_buffer; struct test_context_desc desc; - struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; unsigned int counter, i; @@ -32841,7 +32841,7 @@ static void test_vertex_shader_stream_output(void) D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(counter_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - counter = get_readback_uint(&rb, 0, 0, 0); + counter = get_readback_uint(&rb.rb, 0, 0, 0); ok(counter == 3 * sizeof(struct vec4), "Got unexpected counter %u.\n", counter); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -32849,7 +32849,7 @@ static void test_vertex_shader_stream_output(void) for (i = 0; i < ARRAY_SIZE(expected_output); ++i) { const struct vec4 *expected = &expected_output[i]; - data = get_readback_vec4(&rb, i, 0); + data = get_readback_vec4(&rb.rb, i, 0); ok(compare_vec4(data, expected, 1), "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w); @@ -32869,10 +32869,10 @@ static void test_read_write_subresource(void) ID3D12GraphicsCommandList *command_list; D3D12_HEAP_PROPERTIES heap_properties; D3D12_SUBRESOURCE_DATA texture_data; + struct d3d12_resource_readback rb; D3D12_RESOURCE_DESC resource_desc; struct test_context_desc desc; struct test_context context; - struct resource_readback rb; ID3D12Resource *src_texture; ID3D12Resource *dst_texture; ID3D12CommandQueue *queue; @@ -33106,7 +33106,7 @@ static void test_read_write_subresource(void) else /* Untouched */ expected = 0; - got = get_readback_uint(&rb, x, y, z); + got = get_readback_uint(&rb.rb, x, y, z); if (got != expected) break; } @@ -33180,10 +33180,10 @@ static void test_queue_wait(void) ID3D12GraphicsCommandList *command_list; ID3D12Resource *readback_buffer, *cb; ID3D12CommandQueue *queue, *queue2; + struct d3d12_resource_readback rb; D3D12_RESOURCE_DESC resource_desc; uint64_t row_pitch, buffer_size; struct test_context_desc desc; - struct resource_readback rb; ID3D12Fence *fence, *fence2; struct test_context context; ID3D12Device *device; @@ -33286,7 +33286,7 @@ static void test_queue_wait(void) exec_command_list(queue, command_list); wait_queue_idle(device, queue); init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch); - check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); + check_readback_data_uint(&rb.rb, NULL, 0xff00ff00, 0); release_resource_readback(&rb); /* Wait() before CPU signal */ @@ -33299,7 +33299,7 @@ static void test_queue_wait(void) ret = wait_event(event, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch); - check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); + check_readback_data_uint(&rb.rb, NULL, 0xff00ff00, 0); release_resource_readback(&rb); value = ID3D12Fence_GetCompletedValue(fence2); ok(value == 0, "Got unexpected value %"PRIu64".\n", value); @@ -33311,7 +33311,7 @@ static void test_queue_wait(void) ret = wait_event(event, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch); - check_readback_data_uint(&rb, NULL, 0xffff0000, 0); + check_readback_data_uint(&rb.rb, NULL, 0xffff0000, 0); release_resource_readback(&rb); value = ID3D12Fence_GetCompletedValue(fence2); ok(value == 1, "Got unexpected value %"PRIu64".\n", value); @@ -33326,7 +33326,7 @@ static void test_queue_wait(void) ret = wait_event(event, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch); - check_readback_data_uint(&rb, NULL, 0xffff0000, 0); + check_readback_data_uint(&rb.rb, NULL, 0xffff0000, 0); release_resource_readback(&rb); value = ID3D12Fence_GetCompletedValue(fence2); ok(value == 1, "Got unexpected value %"PRIu64".\n", value); @@ -33337,7 +33337,7 @@ static void test_queue_wait(void) ret = wait_event(event, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch); - check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); + check_readback_data_uint(&rb.rb, NULL, 0xff00ff00, 0); release_resource_readback(&rb); value = ID3D12Fence_GetCompletedValue(fence2); ok(value == 2, "Got unexpected value %"PRIu64".\n", value); @@ -33352,7 +33352,7 @@ static void test_queue_wait(void) ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); wait_queue_idle(device, queue); init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch); - check_readback_data_uint(&rb, NULL, 0xffff0000, 0); + check_readback_data_uint(&rb.rb, NULL, 0xffff0000, 0); release_resource_readback(&rb); /* signal to a lower value after a GPU wait was used (test timeline semaphore replacement) */ @@ -33367,7 +33367,7 @@ static void test_queue_wait(void) exec_command_list(queue, command_list); wait_queue_idle(device, queue); init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch); - check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); + check_readback_data_uint(&rb.rb, NULL, 0xff00ff00, 0); release_resource_readback(&rb); /* Signal() and Wait() in the same command queue */ @@ -33377,7 +33377,7 @@ static void test_queue_wait(void) exec_command_list(queue, command_list); wait_queue_idle(device, queue); init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch); - check_readback_data_uint(&rb, NULL, 0xffff0000, 0); + check_readback_data_uint(&rb.rb, NULL, 0xffff0000, 0); release_resource_readback(&rb); value = ID3D12Fence_GetCompletedValue(fence); @@ -33403,8 +33403,8 @@ static void test_graphics_compute_queue_synchronization(void) ID3D12GraphicsCommandList *command_list; D3D12_ROOT_PARAMETER root_parameters[2]; ID3D12CommandAllocator *allocators[3]; + struct d3d12_resource_readback rb; struct test_context_desc desc; - struct resource_readback rb; struct test_context context; ID3D12Fence *fence, *fence2; ID3D12Resource *buffer; @@ -33590,7 +33590,7 @@ static void test_graphics_compute_queue_synchronization(void) transition_resource_state(command_list, buffer, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - value = get_readback_uint(&rb, 0, 0, 0); + value = get_readback_uint(&rb.rb, 0, 0, 0); ok(value == 24, "Got unexpected value %u.\n", value); release_resource_readback(&rb); @@ -33787,10 +33787,10 @@ static void test_conditional_rendering(void) D3D12_HEAP_PROPERTIES heap_properties; ID3D12PipelineState *pipeline_state; ID3D12RootSignature *root_signature; + struct d3d12_resource_readback rb; D3D12_RESOURCE_DESC resource_desc; struct test_context context; ID3D12Resource *buffer, *cb; - struct resource_readback rb; ID3D12CommandQueue *queue; unsigned int i; uint32_t value; @@ -33906,7 +33906,7 @@ static void test_conditional_rendering(void) get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); bug_if(is_radv_device(context.device)) - todo check_readback_data_uint(&rb, NULL, 0xffffffff, 0); + todo check_readback_data_uint(&rb.rb, NULL, 0xffffffff, 0); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -33958,7 +33958,7 @@ static void test_conditional_rendering(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - todo check_readback_data_uint(&rb, NULL, 0xffffffff, 0); + todo check_readback_data_uint(&rb.rb, NULL, 0xffffffff, 0); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, context.render_target, @@ -34075,7 +34075,7 @@ static void test_conditional_rendering(void) D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(texture_copy, 0, &rb, queue, command_list); - todo check_readback_data_uint(&rb, NULL, r8g8b8a8_data[1], 0); + todo check_readback_data_uint(&rb.rb, NULL, r8g8b8a8_data[1], 0); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -34141,7 +34141,7 @@ static void test_conditional_rendering(void) get_texture_readback_with_command_list(texture_copy, 0, &rb, queue, command_list); bug_if(is_radv_device(context.device)) - todo check_readback_data_uint(&rb, NULL, r8g8b8a8_data[1], 0); + todo check_readback_data_uint(&rb.rb, NULL, r8g8b8a8_data[1], 0); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -34205,7 +34205,7 @@ static void test_conditional_rendering(void) D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - value = get_readback_uint(&rb, 0, 0, 0); + value = get_readback_uint(&rb.rb, 0, 0, 0); ok(value == (!i ? init_value : input.value), "Got %#x, expected %#x.\n", value, input.value); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -34596,7 +34596,7 @@ static void test_write_buffer_immediate(void) ID3D12GraphicsCommandList2 *command_list2; D3D12_WRITEBUFFERIMMEDIATE_MODE modes[2]; ID3D12GraphicsCommandList *command_list; - struct resource_readback rb; + struct d3d12_resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Resource *buffer; @@ -34637,9 +34637,9 @@ static void test_write_buffer_immediate(void) reset_command_list(command_list, context.allocator); get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - value = get_readback_uint(&rb, 0, 0, 0); + value = get_readback_uint(&rb.rb, 0, 0, 0); todo ok(value == parameters[0].Value, "Got unexpected value %#x, expected %#x.\n", value, parameters[0].Value); - value = get_readback_uint(&rb, 1, 0, 0); + value = get_readback_uint(&rb.rb, 1, 0, 0); todo ok(value == parameters[1].Value, "Got unexpected value %#x, expected %#x.\n", value, parameters[1].Value); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -34656,9 +34656,9 @@ static void test_write_buffer_immediate(void) reset_command_list(command_list, context.allocator); get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - value = get_readback_uint(&rb, 0, 0, 0); + value = get_readback_uint(&rb.rb, 0, 0, 0); todo ok(value == parameters[0].Value, "Got unexpected value %#x, expected %#x.\n", value, parameters[0].Value); - value = get_readback_uint(&rb, 1, 0, 0); + value = get_readback_uint(&rb.rb, 1, 0, 0); todo ok(value == parameters[1].Value, "Got unexpected value %#x, expected %#x.\n", value, parameters[1].Value); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -35037,10 +35037,10 @@ static void test_hull_shader_relative_addressing(void) D3D12_ROOT_PARAMETER root_parameters[1]; D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; D3D12_INPUT_LAYOUT_DESC input_layout; + struct d3d12_resource_readback rb; ID3D12Resource *vb, *so_buffer; struct test_context_desc desc; D3D12_VERTEX_BUFFER_VIEW vbv; - struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; HRESULT hr; @@ -35261,7 +35261,7 @@ static void test_hull_shader_relative_addressing(void) transition_resource_state(command_list, so_buffer, D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); - check_triangles(&rb, &expected_triangle, 1); + check_triangles(&rb.rb, &expected_triangle, 1); release_resource_readback(&rb); ID3D12Resource_Release(so_buffer); @@ -35275,10 +35275,10 @@ static void test_hull_shader_patch_constant_inputs(void) ID3D12GraphicsCommandList *command_list; D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; D3D12_INPUT_LAYOUT_DESC input_layout; + struct d3d12_resource_readback rb; ID3D12Resource *vb, *so_buffer; struct test_context_desc desc; D3D12_VERTEX_BUFFER_VIEW vbv; - struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; HRESULT hr; @@ -35493,7 +35493,7 @@ static void test_hull_shader_patch_constant_inputs(void) transition_resource_state(command_list, so_buffer, D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); - check_triangles(&rb, &expected_triangle, 1); + check_triangles(&rb.rb, &expected_triangle, 1); release_resource_readback(&rb); ID3D12Resource_Release(so_buffer); @@ -35508,8 +35508,8 @@ static void test_resource_arrays(void) D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc; D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc; ID3D12GraphicsCommandList *command_list; + struct d3d12_resource_readback rb; unsigned int descriptor_count; - struct resource_readback rb; struct test_context context; ID3D12DescriptorHeap *heap; ID3D12CommandQueue *queue; @@ -35682,7 +35682,7 @@ static void test_resource_arrays(void) transition_sub_resource_state(command_list, output_buffers[i], 0, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(output_buffers[i], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - check_readback_data_uint(&rb, NULL, uav_data[i], 0); + check_readback_data_uint(&rb.rb, NULL, uav_data[i], 0); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); } @@ -35704,7 +35704,7 @@ static void test_unbounded_resource_arrays(void) D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc; D3D12_CONSTANT_BUFFER_VIEW_DESC cbv_desc; ID3D12GraphicsCommandList *command_list; - struct resource_readback rb; + struct d3d12_resource_readback rb; struct test_context context; ID3D12DescriptorHeap *heap; ID3D12CommandQueue *queue; @@ -35861,7 +35861,7 @@ static void test_unbounded_resource_arrays(void) D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(output_buffers[i], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); /* Buffers at index >= 64 are aliased. */ - check_readback_data_uint(&rb, NULL, (i < 64 ? 63 - i : 127 - i) ^ 0x35, 0); + check_readback_data_uint(&rb.rb, NULL, (i < 64 ? 63 - i : 127 - i) ^ 0x35, 0); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); } @@ -35884,9 +35884,9 @@ static void test_unbounded_samplers(void) D3D12_ROOT_SIGNATURE_DESC root_signature_desc; D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc; ID3D12GraphicsCommandList *command_list; + struct d3d12_resource_readback rb; D3D12_SAMPLER_DESC sampler_desc; D3D12_SUBRESOURCE_DATA data; - struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Device *device; @@ -36005,7 +36005,7 @@ static void test_unbounded_samplers(void) get_buffer_readback_with_command_list(output_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); for (i = 0; i < 64; ++i) { - unsigned int value = get_readback_uint(&rb, i, 0, 0); + unsigned int value = get_readback_uint(&rb.rb, i, 0, 0); unsigned int expected = (i & 1) ? 100 : 10; ok(value == expected, "Got %u, expected %u at %u.\n", value, expected, i); } diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index bb298082..061931c2 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -416,13 +416,18 @@ struct resource_readback uint64_t width; unsigned int height; unsigned int depth; - ID3D12Resource *resource; uint64_t row_pitch; void *data; }; +struct d3d12_resource_readback +{ + struct resource_readback rb; + ID3D12Resource *resource; +}; + static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsigned int sub_resource, - struct resource_readback *rb, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) + struct d3d12_resource_readback *rb, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) { D3D12_TEXTURE_COPY_LOCATION dst_location, src_location; D3D12_HEAP_PROPERTIES heap_properties; @@ -442,14 +447,14 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi "Resource %p is not texture.\n", texture); miplevel = sub_resource % resource_desc.MipLevels; - rb->width = max(1, resource_desc.Width >> miplevel); - rb->width = align(rb->width, format_block_width(resource_desc.Format)); - rb->height = max(1, resource_desc.Height >> miplevel); - rb->height = align(rb->height, format_block_height(resource_desc.Format)); - rb->depth = resource_desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D + rb->rb.width = max(1, resource_desc.Width >> miplevel); + rb->rb.width = align(rb->rb.width, format_block_width(resource_desc.Format)); + rb->rb.height = max(1, resource_desc.Height >> miplevel); + rb->rb.height = align(rb->rb.height, format_block_height(resource_desc.Format)); + rb->rb.depth = resource_desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D ? 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; + rb->rb.row_pitch = align(rb->rb.width * format_size(resource_desc.Format), D3D12_TEXTURE_DATA_PITCH_ALIGNMENT); + rb->rb.data = NULL; if (resource_desc.SampleDesc.Count > 1) { @@ -477,17 +482,17 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi src_resource = texture; } - buffer_size = rb->row_pitch * rb->height * rb->depth; + buffer_size = rb->rb.row_pitch * rb->rb.height * rb->rb.depth; rb->resource = create_readback_buffer(device, buffer_size); dst_location.pResource = rb->resource; dst_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT; dst_location.PlacedFootprint.Offset = 0; dst_location.PlacedFootprint.Footprint.Format = resource_desc.Format; - dst_location.PlacedFootprint.Footprint.Width = rb->width; - dst_location.PlacedFootprint.Footprint.Height = rb->height; - dst_location.PlacedFootprint.Footprint.Depth = rb->depth; - dst_location.PlacedFootprint.Footprint.RowPitch = rb->row_pitch; + dst_location.PlacedFootprint.Footprint.Width = rb->rb.width; + dst_location.PlacedFootprint.Footprint.Height = rb->rb.height; + dst_location.PlacedFootprint.Footprint.Depth = rb->rb.depth; + dst_location.PlacedFootprint.Footprint.RowPitch = rb->rb.row_pitch; src_location.pResource = src_resource; src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; @@ -506,7 +511,7 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi read_range.Begin = 0; read_range.End = buffer_size; - hr = ID3D12Resource_Map(rb->resource, 0, &read_range, &rb->data); + hr = ID3D12Resource_Map(rb->resource, 0, &read_range, &rb->rb.data); assert_that(hr == S_OK, "Failed to map readback buffer, hr %#x.\n", hr); } @@ -528,7 +533,7 @@ static const struct vec4 *get_readback_vec4(struct resource_readback *rb, unsign return get_readback_data(rb, x, y, 0, sizeof(struct vec4)); } -static void release_resource_readback(struct resource_readback *rb) +static void release_resource_readback(struct d3d12_resource_readback *rb) { D3D12_RANGE range = {0, 0}; ID3D12Resource_Unmap(rb->resource, 0, &range); @@ -604,10 +609,10 @@ static inline void check_sub_resource_uint_(unsigned int line, ID3D12Resource *t unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, unsigned int expected, unsigned int max_diff) { - struct resource_readback rb; + struct d3d12_resource_readback rb; get_texture_readback_with_command_list(texture, sub_resource_idx, &rb, queue, command_list); - check_readback_data_uint_(line, &rb, NULL, expected, max_diff); + check_readback_data_uint_(line, &rb.rb, NULL, expected, max_diff); release_resource_readback(&rb); } @@ -616,10 +621,10 @@ static inline void check_sub_resource_vec4_(unsigned int line, ID3D12Resource *t unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, const struct vec4 *expected, unsigned int max_diff) { - struct resource_readback rb; + struct d3d12_resource_readback rb; get_texture_readback_with_command_list(texture, sub_resource_idx, &rb, queue, command_list); - check_readback_data_vec4_(line, &rb, NULL, expected, max_diff); + check_readback_data_vec4_(line, &rb.rb, NULL, expected, max_diff); release_resource_readback(&rb); } diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 1fa2a461..1a546f21 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -314,13 +314,13 @@ static void d3d12_runner_probe_vec4(struct shader_runner *r, { struct d3d12_shader_runner *runner = d3d12_shader_runner(r); struct test_context *test_context = &runner->test_context; - struct resource_readback rb; + struct d3d12_resource_readback rb; transition_resource_state(test_context->list, test_context->render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(test_context->render_target, 0, &rb, test_context->queue, test_context->list); - todo_if (runner->r.is_todo) check_readback_data_vec4(&rb, rect, v, ulps); + todo_if (runner->r.is_todo) check_readback_data_vec4(&rb.rb, rect, v, ulps); release_resource_readback(&rb); reset_command_list(test_context->list, test_context->allocator); transition_resource_state(test_context->list, test_context->render_target, -- 2.36.1

2 11

[PATCH] winecoreaudio: Handle MIDI running status.
by Akihiro Sagawa May 31, 2022

May 31, 2022

Andew, thanks for the build. Here is the patch with Signed-off-by line. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winecoreaudio.drv/coremidi.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-)

2 1

[PATCH 0/12] MR160: secur32: Add wow64 support.
by Nikolay Sivov (＠nsivov) May 31, 2022

May 31, 2022

This seems to work for me on Linux. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/160

3 13

[PATCH v3 1/3] d2d1: Implement ID2D1Bitmap1::Map().
by Dmitry Timoshkov May 31, 2022

May 31, 2022

v2: Support only D2D1_MAP_OPTIONS_READ and always use staging resource. v3: Handle texture creation failure, fix staging resource leak. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/bitmap.c | 53 ++++++++++++++++++++++++++++++++++++++-- dlls/d2d1/d2d1_private.h | 1 + 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 971e3c7ff6b..a75a9be62be 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -66,6 +66,8 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap1 *iface) if (!refcount) { + if (bitmap->staging_resource) + ID3D11Resource_Release(bitmap->staging_resource); if (bitmap->srv) ID3D11ShaderResourceView_Release(bitmap->srv); if (bitmap->rtv) @@ -229,9 +231,56 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_GetSurface(ID2D1Bitmap1 *iface, IDXG static HRESULT STDMETHODCALLTYPE d2d_bitmap_Map(ID2D1Bitmap1 *iface, D2D1_MAP_OPTIONS options, D2D1_MAPPED_RECT *mapped_rect) { - FIXME("iface %p, options %#x, mapped_rect %p stub!\n", iface, options, mapped_rect); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); + ID3D11Device *device; + ID3D11DeviceContext *context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11Texture2D *staging_texture; + D3D11_MAPPED_SUBRESOURCE mapped_subresource; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, options %#x, mapped_rect %p.\n", iface, options, mapped_rect); + + if (options != D2D1_MAP_OPTIONS_READ) + { + FIXME("Unhandled map options %#x.\n", options); + return E_INVALIDARG; + } + + if (!(bitmap->options & D2D1_BITMAP_OPTIONS_CPU_READ)) + return E_INVALIDARG; + + if (bitmap->staging_resource) + return D2DERR_WRONG_STATE; + + ID3D11Resource_GetDevice(bitmap->resource, &device); + ID3D11Device_GetImmediateContext(device, &context); + ID3D11Texture2D_GetDesc((ID3D11Texture2D *)bitmap->resource, &texture_desc); + + texture_desc.Usage = D3D11_USAGE_STAGING; + texture_desc.BindFlags = 0; + texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; + if (SUCCEEDED(hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &staging_texture))) + { + ID3D11DeviceContext_CopyResource(context, (ID3D11Resource *)staging_texture, bitmap->resource); + if (SUCCEEDED(hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)staging_texture, 0, + D3D11_MAP_READ, 0, &mapped_subresource))) + { + mapped_rect->pitch = mapped_subresource.RowPitch; + mapped_rect->bits = mapped_subresource.pData; + bitmap->staging_resource = (ID3D11Resource *)staging_texture; + } + else + { + WARN("Failed to map resource, hr %#lx.\n", hr); + ID3D11Texture2D_Release(staging_texture); + } + } + + ID3D11DeviceContext_Release(context); + ID3D11Device_Release(device); + + return hr; } static HRESULT STDMETHODCALLTYPE d2d_bitmap_Unmap(ID2D1Bitmap1 *iface) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 8edfa030ee1..b886ac52dd9 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -395,6 +395,7 @@ struct d2d_bitmap ID3D11RenderTargetView *rtv; IDXGISurface *surface; ID3D11Resource *resource; + ID3D11Resource *staging_resource; D2D1_SIZE_U pixel_size; D2D1_PIXEL_FORMAT format; float dpi_x; -- 2.36.1

3 8

[PATCH 0/4] MR161: d2d1: Improve bitmap options handling.
by Nikolay Sivov (＠nsivov) May 31, 2022

May 31, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/161

3 5

[PATCH v2 0/6] MR159: ntdll: More heap code cleanup.
by Rémi Bernon May 31, 2022

May 31, 2022

-- v2: ntdll: Remove tail checking on large blocks. ntdll: Merge common resize case in heap_realloc. ntdll: Call valgrind alloc notifications at the topmost level. ntdll: Correctly free pending pointer in RtlDestroyHeap. ntdll: Split valgrind memory access control to separate helpers. ntdll: Fix handling of back pointer in heap_set_debug_flags. https://gitlab.winehq.org/wine/wine/-/merge_requests/159

1 6

[PATCH 0/6] MR159: ntdll: More heap code cleanup.
by Rémi Bernon May 31, 2022

May 31, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/159

3 9

[PATCH] dlls/user32: enable compilation with long types
by Eric Pouech May 31, 2022

May 31, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/user32/Makefile.in | 2 +- dlls/user32/combo.c | 6 +++-- dlls/user32/cursoricon.c | 36 +++++++++++++++---------------- dlls/user32/dde_client.c | 16 +++++++------- dlls/user32/dde_misc.c | 54 +++++++++++++++++++++++----------------------- dlls/user32/dde_server.c | 12 +++++----- dlls/user32/dialog.c | 12 +++++----- dlls/user32/edit.c | 16 +++++++------- dlls/user32/exticon.c | 8 +++---- dlls/user32/hook.c | 12 +++++----- dlls/user32/input.c | 2 +- dlls/user32/listbox.c | 4 ++- dlls/user32/mdi.c | 18 ++++++++------- dlls/user32/menu.c | 26 +++++++++++----------- dlls/user32/message.c | 22 +++++++++---------- dlls/user32/misc.c | 34 ++++++++++++++--------------- dlls/user32/msgbox.c | 4 ++- dlls/user32/nonclient.c | 16 +++++++------- dlls/user32/rawinput.c | 10 ++++----- dlls/user32/resource.c | 2 +- dlls/user32/scroll.c | 10 ++++----- dlls/user32/static.c | 4 ++- dlls/user32/user_main.c | 4 ++- dlls/user32/win.c | 10 ++++----- dlls/user32/winhelp.c | 2 +- dlls/user32/winpos.c | 2 +- dlls/user32/winproc.c | 12 +++++----- dlls/user32/winstation.c | 2 +- 28 files changed, 179 insertions(+), 179 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 4a413746de7..3f4115c5679 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_USER32_ +EXTRADEFS = -D_USER32_ MODULE = user32.dll IMPORTLIB = user32 IMPORTS = $(PNG_PE_LIBS) gdi32 version sechost advapi32 kernelbase win32u diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index d9123057295..73ec5691e88 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1459,7 +1459,7 @@ static void COMBO_Size( HEADCOMBO *lphc ) */ if( curComboHeight > newComboHeight ) { - TRACE("oldComboHeight=%d, newComboHeight=%d, oldDropBottom=%d, oldDropTop=%d\n", + TRACE("oldComboHeight=%d, newComboHeight=%d, oldDropBottom=%ld, oldDropTop=%ld\n", curComboHeight, newComboHeight, lphc->droppedRect.bottom, lphc->droppedRect.top); lphc->droppedRect.bottom = lphc->droppedRect.top + curComboHeight - newComboHeight; @@ -1720,7 +1720,7 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar { LPHEADCOMBO lphc = (LPHEADCOMBO)GetWindowLongPtrW( hwnd, 0 ); - TRACE("[%p]: msg %s wp %08lx lp %08lx\n", + TRACE("[%p]: msg %s wp %08Ix lp %08Ix\n", hwnd, SPY_GetMsgName(message, hwnd), wParam, lParam ); if (!IsWindow(hwnd)) return 0; @@ -2107,7 +2107,7 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar return TRUE; default: if (message >= WM_USER) - WARN("unknown msg WM_USER+%04x wp=%04lx lp=%08lx\n", + WARN("unknown msg WM_USER+%04x wp=%04Ix lp=%08Ix\n", message - WM_USER, wParam, lParam ); break; } diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 3ce3d3f24aa..3e83ada3ee5 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -231,7 +231,7 @@ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, *compr = header->biCompression; return 1; } - WARN("unknown/wrong size (%u) for header\n", header->biSize); + WARN("unknown/wrong size (%lu) for header\n", header->biSize); return -1; } @@ -805,12 +805,12 @@ static BOOL create_icon_frame( const BITMAPINFO *bmi, DWORD maxsize, POINT hotsp if (maxsize < sizeof(BITMAPCOREHEADER)) { - WARN( "invalid size %u\n", maxsize ); + WARN( "invalid size %lu\n", maxsize ); return FALSE; } if (maxsize < bmi->bmiHeader.biSize) { - WARN( "invalid header size %u\n", bmi->bmiHeader.biSize ); + WARN( "invalid header size %lu\n", bmi->bmiHeader.biSize ); return FALSE; } if ( (bmi->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) && @@ -818,7 +818,7 @@ static BOOL create_icon_frame( const BITMAPINFO *bmi, DWORD maxsize, POINT hotsp (bmi->bmiHeader.biCompression != BI_RGB && bmi->bmiHeader.biCompression != BI_BITFIELDS)) ) { - WARN( "invalid bitmap header %u\n", bmi->bmiHeader.biSize ); + WARN( "invalid bitmap header %lu\n", bmi->bmiHeader.biSize ); return FALSE; } @@ -829,7 +829,7 @@ static BOOL create_icon_frame( const BITMAPINFO *bmi, DWORD maxsize, POINT hotsp mask_size = get_dib_image_size( bmi_width, bmi_height / 2, 1 ); if (size > maxsize || color_size > maxsize - size) { - WARN( "truncated file %u < %u+%u+%u\n", maxsize, size, color_size, mask_size ); + WARN( "truncated file %lu < %lu+%lu+%lu\n", maxsize, size, color_size, mask_size ); return 0; } if (mask_size > maxsize - size - color_size) mask_size = 0; /* no mask */ @@ -1043,15 +1043,15 @@ typedef struct { static void dump_ani_header( const ani_header *header ) { - TRACE(" header size: %d\n", header->header_size); - TRACE(" frames: %d\n", header->num_frames); - TRACE(" steps: %d\n", header->num_steps); - TRACE(" width: %d\n", header->width); - TRACE(" height: %d\n", header->height); - TRACE(" bpp: %d\n", header->bpp); - TRACE(" planes: %d\n", header->num_planes); - TRACE(" display rate: %d\n", header->display_rate); - TRACE(" flags: 0x%08x\n", header->flags); + TRACE(" header size: %ld\n", header->header_size); + TRACE(" frames: %ld\n", header->num_frames); + TRACE(" steps: %ld\n", header->num_steps); + TRACE(" width: %ld\n", header->width); + TRACE(" height: %ld\n", header->height); + TRACE(" bpp: %ld\n", header->bpp); + TRACE(" planes: %ld\n", header->num_planes); + TRACE(" display rate: %ld\n", header->display_rate); + TRACE(" flags: 0x%08lx\n", header->flags); } @@ -1133,7 +1133,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, const unsigned char *icon_chunk; const unsigned char *icon_data; - TRACE("bits %p, bits_size %d\n", bits, bits_size); + TRACE("bits %p, bits_size %ld\n", bits, bits_size); riff_find_chunk( ANI_ACON_ID, ANI_RIFF_ID, &root_chunk, &ACON_chunk ); if (!ACON_chunk.data) @@ -1266,7 +1266,7 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, POINT hotspot; const BITMAPINFO *bmi; - TRACE_(cursor)("%p (%u bytes), ver %08x, %ix%i %s %s\n", + TRACE_(cursor)("%p (%u bytes), ver %08lx, %ix%i %s %s\n", bits, cbSize, dwVersion, width, height, bIcon ? "icon" : "cursor", (cFlag & LR_MONOCHROME) ? "mono" : "" ); @@ -1619,7 +1619,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetClipCursor( RECT *rect ) */ BOOL WINAPI SetSystemCursor(HCURSOR hcur, DWORD id) { - FIXME("(%p,%08x),stub!\n", hcur, id); + FIXME("(%p,%08lx),stub!\n", hcur, id); return TRUE; } @@ -1857,7 +1857,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) HICON ret; HDC hdc; - TRACE("color %p, mask %p, hotspot %ux%u, fIcon %d\n", + TRACE("color %p, mask %p, hotspot %lux%lu, fIcon %d\n", iconinfo->hbmColor, iconinfo->hbmMask, iconinfo->xHotspot, iconinfo->yHotspot, iconinfo->fIcon); diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 3b066bde4ec..dae520bfeb3 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -59,7 +59,7 @@ const WCHAR WDML_szClientConvClassW[] = L"WineDdeClientW"; HCONVLIST WINAPI DdeConnectList(DWORD idInst, HSZ hszService, HSZ hszTopic, HCONVLIST hConvList, PCONVCONTEXT pCC) { - FIXME("(%d,%p,%p,%p,%p): stub\n", idInst, hszService, hszTopic, hConvList, pCC); + FIXME("(%ld,%p,%p,%p,%p): stub\n", idInst, hszService, hszTopic, hConvList, pCC); return (HCONVLIST)1; } @@ -100,7 +100,7 @@ HCONV WINAPI DdeConnect(DWORD idInst, HSZ hszService, HSZ hszTopic, WDML_CONV* pConv; ATOM aSrv = 0, aTpc = 0; - TRACE("(0x%x,%p,%p,%p)\n", idInst, hszService, hszTopic, pCC); + TRACE("(0x%lx,%p,%p,%p)\n", idInst, hszService, hszTopic, pCC); pInstance = WDML_GetInstance(idInst); if (!pInstance) @@ -520,7 +520,7 @@ static WDML_QUEUE_STATE WDML_HandleRequestReply(WDML_CONV* pConv, MSG* msg, WDML case WM_DDE_DATA: UnpackDDElParam(WM_DDE_DATA, msg->lParam, &uiLo, &uiHi); - TRACE("Got the result (%08lx)\n", uiLo); + TRACE("Got the result (%08Ix)\n", uiLo); hsz = WDML_MakeHszFromAtom(pConv->instance, uiHi); @@ -1021,7 +1021,7 @@ static HDDEDATA WDML_SyncWaitTransactionReply(HCONV hConv, DWORD dwTimeout, cons DWORD err; WDML_CONV* pConv; - TRACE("Starting wait for a timeout of %d ms\n", dwTimeout); + TRACE("Starting wait for a timeout of %ld ms\n", dwTimeout); start = GetTickCount(); while ((elapsed = GetTickCount() - start) < dwTimeout) @@ -1104,7 +1104,7 @@ HDDEDATA WDML_ClientHandle(WDML_CONV *pConv, WDML_XACT *pXAct, DWORD dwTimeout, if (!PostMessageW(pConv->hwndServer, pXAct->ddeMsg, (WPARAM)pConv->hwndClient, pXAct->lParam)) { - WARN("Failed posting message %x to %p (error=0x%x)\n", + WARN("Failed posting message %x to %p (error=0x%lx)\n", pXAct->ddeMsg, pConv->hwndServer, GetLastError()); pConv->wStatus &= ~ST_CONNECTED; pConv->instance->lastError = DMLERR_POSTMSG_FAILED; @@ -1137,7 +1137,7 @@ HDDEDATA WINAPI DdeClientTransaction(LPBYTE pData, DWORD cbData, HCONV hConv, HS WDML_XACT* pXAct; HDDEDATA hDdeData; - TRACE("(%p,%d,%p,%p,%x,%x,%d,%p)\n", + TRACE("(%p,%ld,%p,%p,%x,%x,%ld,%p)\n", pData, cbData, hConv, hszItem, wFmt, wType, dwTimeout, pdwResult); if (hConv == 0) @@ -1211,7 +1211,7 @@ HDDEDATA WINAPI DdeClientTransaction(LPBYTE pData, DWORD cbData, HCONV hConv, HS WDML_QueueTransaction(pConv, pXAct); - TRACE("pConv->wStatus %04x\n", pConv->wStatus); + TRACE("pConv->wStatus %04lx\n", pConv->wStatus); if (pConv->wStatus & ST_BLOCKED) { @@ -1293,7 +1293,7 @@ static LRESULT CALLBACK WDML_ClientProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPA WDML_CONV* pConv = NULL; HSZ hszSrv, hszTpc; - TRACE("%p %04x %08lx %08lx\n", hwnd, iMsg, wParam , lParam); + TRACE("%p %04x %08Ix %08Ix\n", hwnd, iMsg, wParam, lParam); if (iMsg == WM_DDE_ACK && /* in the initial WM_INITIATE sendmessage */ diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index 7bc1656432e..1751a5f481a 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -202,7 +202,7 @@ LPARAM WINAPI ReuseDDElParam(LPARAM lParam, UINT msgIn, UINT msgOut, } params[0] = uiLo; params[1] = uiHi; - TRACE("Reusing pack %08lx %08lx\n", uiLo, uiHi); + TRACE("Reusing pack %08Ix %08Ix\n", uiLo, uiHi); GlobalUnlock( (HGLOBAL)lParam ); return lParam; @@ -512,7 +512,7 @@ DWORD WINAPI DdeQueryStringA(DWORD idInst, HSZ hsz, LPSTR psz, DWORD cchMax, INT DWORD ret = 0; WDML_INSTANCE* pInstance; - TRACE("(%d, %p, %p, %d, %d)\n", idInst, hsz, psz, cchMax, iCodePage); + TRACE("(%ld, %p, %p, %ld, %d)\n", idInst, hsz, psz, cchMax, iCodePage); /* First check instance */ @@ -523,7 +523,7 @@ DWORD WINAPI DdeQueryStringA(DWORD idInst, HSZ hsz, LPSTR psz, DWORD cchMax, INT ret = WDML_QueryString(pInstance, hsz, psz, cchMax, iCodePage); } - TRACE("returning %d (%s)\n", ret, debugstr_a(psz)); + TRACE("returning %ld (%s)\n", ret, debugstr_a(psz)); return ret; } @@ -536,7 +536,7 @@ DWORD WINAPI DdeQueryStringW(DWORD idInst, HSZ hsz, LPWSTR psz, DWORD cchMax, IN DWORD ret = 0; WDML_INSTANCE* pInstance; - TRACE("(%d, %p, %p, %d, %d)\n", idInst, hsz, psz, cchMax, iCodePage); + TRACE("(%ld, %p, %p, %ld, %d)\n", idInst, hsz, psz, cchMax, iCodePage); /* First check instance */ @@ -547,7 +547,7 @@ DWORD WINAPI DdeQueryStringW(DWORD idInst, HSZ hsz, LPWSTR psz, DWORD cchMax, IN ret = WDML_QueryString(pInstance, hsz, psz, cchMax, iCodePage); } - TRACE("returning %d (%s)\n", ret, debugstr_w(psz)); + TRACE("returning %ld (%s)\n", ret, debugstr_w(psz)); return ret; } @@ -588,7 +588,7 @@ HSZ WINAPI DdeCreateStringHandleA(DWORD idInst, LPCSTR psz, INT codepage) HSZ hsz = 0; WDML_INSTANCE* pInstance; - TRACE("(%d,%s,%d)\n", idInst, debugstr_a(psz), codepage); + TRACE("(%ld,%s,%d)\n", idInst, debugstr_a(psz), codepage); pInstance = WDML_GetInstance(idInst); if (pInstance == NULL) @@ -642,7 +642,7 @@ BOOL WINAPI DdeFreeStringHandle(DWORD idInst, HSZ hsz) WDML_INSTANCE* pInstance; BOOL ret = FALSE; - TRACE("(%d,%p):\n", idInst, hsz); + TRACE("(%ld,%p):\n", idInst, hsz); /* First check instance */ @@ -665,7 +665,7 @@ BOOL WINAPI DdeKeepStringHandle(DWORD idInst, HSZ hsz) WDML_INSTANCE* pInstance; BOOL ret = FALSE; - TRACE("(%d,%p):\n", idInst, hsz); + TRACE("(%ld,%p):\n", idInst, hsz); /* First check instance */ @@ -757,7 +757,7 @@ static void WDML_IncrementInstanceId(WDML_INSTANCE* pInstance) DWORD id = InterlockedIncrement(&WDML_MaxInstanceID); pInstance->instanceID = id; - TRACE("New instance id %d allocated\n", id); + TRACE("New instance id %ld allocated\n", id); } /****************************************************************** @@ -841,7 +841,7 @@ static UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, UINT ret; WNDCLASSEXW wndclass; - TRACE("(%p,%p,0x%x,%d,0x%x)\n", + TRACE("(%p,%p,0x%lx,%ld,0x%x)\n", pidInst, pfnCallback, afCmd, ulRes, bUnicode); if (ulRes) @@ -896,7 +896,7 @@ static UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, if (*pidInst == 0) { /* Initialisation of new Instance Identifier */ - TRACE("new instance, callback %p flags %X\n",pfnCallback,afCmd); + TRACE("new instance, callback %p flags %lX\n", pfnCallback, afCmd); EnterCriticalSection(&WDML_CritSect); @@ -999,7 +999,7 @@ static UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, else { /* Reinitialisation situation --- FIX */ - TRACE("reinitialisation of (%p,%p,0x%x,%d): stub\n", pidInst, pfnCallback, afCmd, ulRes); + TRACE("reinitialisation of (%p,%p,0x%lx,%ld): stub\n", pidInst, pfnCallback, afCmd, ulRes); EnterCriticalSection(&WDML_CritSect); @@ -1126,7 +1126,7 @@ BOOL WINAPI DdeUninitialize(DWORD idInst) WDML_CONV* pConv; WDML_CONV* pConvNext; - TRACE("(%d)\n", idInst); + TRACE("(%ld)\n", idInst); /* First check instance */ @@ -1221,7 +1221,7 @@ HDDEDATA WDML_InvokeCallback(WDML_INSTANCE* pInstance, UINT uType, UINT uFmt, H if (pInstance == NULL) return NULL; - TRACE("invoking CB[%p] (%x %x %p %p %p %p %lx %lx)\n", + TRACE("invoking CB[%p] (%x %x %p %p %p %p %Ix %Ix)\n", pInstance->callback, uType, uFmt, hConv, hsz1, hsz2, hdata, dwData1, dwData2); ret = pInstance->callback(uType, uFmt, hConv, hsz1, hsz2, hdata, dwData1, dwData2); @@ -1258,7 +1258,7 @@ WDML_INSTANCE* WDML_GetInstance(DWORD instId) LeaveCriticalSection(&WDML_CritSect); if (!pInstance) - WARN("Instance entry missing for id %04x\n", instId); + WARN("Instance entry missing for id %04lx\n", instId); return pInstance; } @@ -1308,7 +1308,7 @@ HDDEDATA WINAPI DdeCreateDataHandle(DWORD idInst, LPBYTE pSrc, DWORD cb, DWORD c psz[1] = 0; } - TRACE("(%d,%p,cb %d, cbOff %d,%p <%s>,fmt %04x,%x)\n", + TRACE("(%ld,%p,cb %ld, cbOff %ld,%p <%s>,fmt %04x,%x)\n", idInst, pSrc, cb, cbOff, hszItem, debugstr_w(psz), wFmt, afCmd); if (afCmd != 0 && afCmd != HDATA_APPOWNED) @@ -1351,7 +1351,7 @@ HDDEDATA WINAPI DdeAddData(HDDEDATA hData, LPBYTE pSrc, DWORD cb, DWORD cbOff) DWORD old_sz, new_sz; LPBYTE pDst; - TRACE("(%p,%p,cb %d, cbOff %d)\n", hData, pSrc, cb, cbOff); + TRACE("(%p,%p,cb %ld, cbOff %ld)\n", hData, pSrc, cb, cbOff); pDst = DdeAccessData(hData, &old_sz); if (!pDst) return 0; @@ -1390,7 +1390,7 @@ DWORD WINAPI DdeGetData(HDDEDATA hData, LPBYTE pDst, DWORD cbMax, DWORD cbOff) DWORD dwSize, dwRet; LPBYTE pByte; - TRACE("(%p,%p,%d,%d)\n", hData, pDst, cbMax, cbOff); + TRACE("(%p,%p,%ld,%ld)\n", hData, pDst, cbMax, cbOff); pByte = DdeAccessData(hData, &dwSize); @@ -1446,7 +1446,7 @@ LPBYTE WINAPI DdeAccessData(HDDEDATA hData, LPDWORD pcbDataSize) { *pcbDataSize = GlobalSize(hMem) - sizeof(DDE_DATAHANDLE_HEAD); } - TRACE("=> %p (%lu) fmt %04x\n", pDdh + 1, GlobalSize(hMem) - sizeof(DDE_DATAHANDLE_HEAD), pDdh->cfFormat); + TRACE("=> %p (%Iu) fmt %04x\n", pDdh + 1, GlobalSize(hMem) - sizeof(DDE_DATAHANDLE_HEAD), pDdh->cfFormat); return (LPBYTE)(pDdh + 1); } @@ -1553,7 +1553,7 @@ HDDEDATA WDML_Global2DataHandle(WDML_CONV* pConv, HGLOBAL hMem, WINE_DDEH } else { - ERR("Wrong count: %u / %d\n", size, count); + ERR("Wrong count: %lu / %d\n", size, count); } } else ERR("No bitmap header\n"); break; @@ -2043,7 +2043,7 @@ WDML_CONV* WDML_AddConv(WDML_INSTANCE* pInstance, WDML_SIDE side, pConv->next = pInstance->convs[side]; pInstance->convs[side] = pConv; - TRACE("pConv->wStatus %04x pInstance(%p)\n", pConv->wStatus, pInstance); + TRACE("pConv->wStatus %04lx pInstance(%p)\n", pConv->wStatus, pInstance); return pConv; } @@ -2137,7 +2137,7 @@ static BOOL WDML_EnableCallback(WDML_CONV *pConv, UINT wCmd) if (wCmd == EC_DISABLE) { pConv->wStatus |= ST_BLOCKED; - TRACE("EC_DISABLE: conv %p status flags %04x\n", pConv, pConv->wStatus); + TRACE("EC_DISABLE: conv %p status flags %04lx\n", pConv, pConv->wStatus); return TRUE; } @@ -2153,7 +2153,7 @@ static BOOL WDML_EnableCallback(WDML_CONV *pConv, UINT wCmd) if (wCmd == EC_ENABLEALL) { pConv->wStatus &= ~ST_BLOCKED; - TRACE("EC_ENABLEALL: conv %p status flags %04x\n", pConv, pConv->wStatus); + TRACE("EC_ENABLEALL: conv %p status flags %04lx\n", pConv, pConv->wStatus); } while (pConv->transactions) @@ -2188,7 +2188,7 @@ BOOL WINAPI DdeEnableCallback(DWORD idInst, HCONV hConv, UINT wCmd) BOOL ret = FALSE; WDML_CONV *pConv; - TRACE("(%d, %p, %04x)\n", idInst, hConv, wCmd); + TRACE("(%ld, %p, %04x)\n", idInst, hConv, wCmd); if (hConv) { @@ -2210,12 +2210,12 @@ BOOL WINAPI DdeEnableCallback(DWORD idInst, HCONV hConv, UINT wCmd) if (wCmd == EC_DISABLE) { pInstance->wStatus |= ST_BLOCKED; - TRACE("EC_DISABLE: inst %p status flags %04x\n", pInstance, pInstance->wStatus); + TRACE("EC_DISABLE: inst %p status flags %04lx\n", pInstance, pInstance->wStatus); } else if (wCmd == EC_ENABLEALL) { pInstance->wStatus &= ~ST_BLOCKED; - TRACE("EC_ENABLEALL: inst %p status flags %04x\n", pInstance, pInstance->wStatus); + TRACE("EC_ENABLEALL: inst %p status flags %04lx\n", pInstance, pInstance->wStatus); } ret = TRUE; @@ -2437,7 +2437,7 @@ UINT WINAPI DdeQueryConvInfo(HCONV hConv, DWORD id, PCONVINFO lpConvInfo) CONVINFO ci; WDML_CONV* pConv; - TRACE("(%p,%x,%p)\n", hConv, id, lpConvInfo); + TRACE("(%p,%lx,%p)\n", hConv, id, lpConvInfo); if (!hConv) { diff --git a/dlls/user32/dde_server.c b/dlls/user32/dde_server.c index 26494b835e5..7f5dff5605c 100644 --- a/dlls/user32/dde_server.c +++ b/dlls/user32/dde_server.c @@ -67,7 +67,7 @@ BOOL WINAPI DdePostAdvise(DWORD idInst, HSZ hszTopic, HSZ hszItem) ATOM atom; UINT count; - TRACE("(%d,%p,%p)\n", idInst, hszTopic, hszItem); + TRACE("(%ld,%p,%p)\n", idInst, hszTopic, hszItem); pInstance = WDML_GetInstance(idInst); @@ -169,7 +169,7 @@ HDDEDATA WINAPI DdeNameService(DWORD idInst, HSZ hsz1, HSZ hsz2, UINT afCmd) HWND hwndServer; WNDCLASSEXW wndclass; - TRACE("(%d,%p,%p,%x)\n", idInst, hsz1, hsz2, afCmd); + TRACE("(%ld,%p,%p,%x)\n", idInst, hsz1, hsz2, afCmd); /* First check instance */ @@ -237,7 +237,7 @@ HDDEDATA WINAPI DdeNameService(DWORD idInst, HSZ hsz1, HSZ hsz2, UINT afCmd) hwndServer = CreateWindowW(L"WineDdeServerName", NULL, WS_POPUP, 0, 0, 0, 0, 0, 0, 0, 0); SetWindowLongPtrW(hwndServer, GWL_WDML_INSTANCE, (ULONG_PTR)pInstance); SetWindowLongPtrW(hwndServer, GWL_WDML_SERVER, (ULONG_PTR)pServer); - TRACE("Created nameServer=%p for instance=%08x\n", hwndServer, idInst); + TRACE("Created nameServer=%p for instance=%08lx\n", hwndServer, idInst); pServer->hwndServer = hwndServer; break; @@ -338,7 +338,7 @@ static WDML_CONV* WDML_CreateServerConv(WDML_INSTANCE* pInstance, HWND hwndClien hwndServerName, 0, 0, 0); } - TRACE("Created convServer=%p (nameServer=%p) for instance=%08x unicode=%d\n", + TRACE("Created convServer=%p (nameServer=%p) for instance=%08lx unicode=%d\n", hwndServerConv, hwndServerName, pInstance->instanceID, pInstance->unicode); pConv = WDML_AddConv(pInstance, WDML_SERVER_SIDE, hszApp, hszTopic, @@ -391,7 +391,7 @@ static LRESULT CALLBACK WDML_ServerNameProc(HWND hwndServer, UINT iMsg, WPARAM w pInstance = WDML_GetInstanceFromWnd(hwndServer); if (!pInstance) return 0; - TRACE("idInst=%d, threadID=0x%x\n", pInstance->instanceID, GetCurrentThreadId()); + TRACE("idInst=%ld, threadID=0x%lx\n", pInstance->instanceID, GetCurrentThreadId()); /* don't free DDEParams, since this is a broadcast */ UnpackDDElParam(WM_DDE_INITIATE, lParam, &uiLo, &uiHi); @@ -1027,7 +1027,7 @@ static LRESULT CALLBACK WDML_ServerConvProc(HWND hwndServer, UINT iMsg, WPARAM w WDML_CONV* pConv; WDML_XACT* pXAct = NULL; - TRACE("%p %04x %08lx %08lx\n", hwndServer, iMsg, wParam, lParam); + TRACE("%p %04x %08Ix %08Ix\n", hwndServer, iMsg, wParam, lParam); if (iMsg == WM_DESTROY) { diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 95967269daf..66000995861 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -177,7 +177,7 @@ static const WORD *DIALOG_GetControl32( const WORD *p, DLG_CONTROL_INFO *info, p += lstrlenW( info->windowName ) + 1; } - TRACE(" %s %s %ld, %d, %d, %d, %d, %08x, %08x, %08x\n", + TRACE(" %s %s %Id, %d, %d, %d, %d, %08lx, %08lx, %08lx\n", debugstr_w( info->className ), debugstr_w( info->windowName ), info->id, info->x, info->y, info->cx, info->cy, info->style, info->exStyle, info->helpId ); @@ -335,11 +335,11 @@ static LPCSTR DIALOG_ParseTemplate32( LPCSTR template, DLG_TEMPLATE * result ) result->y = GET_WORD(p); p++; result->cx = GET_WORD(p); p++; result->cy = GET_WORD(p); p++; - TRACE("DIALOG%s %d, %d, %d, %d, %d\n", + TRACE("DIALOG%s %d, %d, %d, %d, %ld\n", result->dialogEx ? "EX" : "", result->x, result->y, result->cx, result->cy, result->helpId ); - TRACE(" STYLE 0x%08x\n", result->style ); - TRACE(" EXSTYLE 0x%08x\n", result->exStyle ); + TRACE(" STYLE 0x%08lx\n", result->style ); + TRACE(" EXSTYLE 0x%08lx\n", result->exStyle ); /* Get the menu name */ @@ -909,7 +909,7 @@ BOOL WINAPI EndDialog( HWND hwnd, INT_PTR retval ) DIALOGINFO * dlgInfo; HWND owner; - TRACE("%p %ld\n", hwnd, retval ); + TRACE("%p %Id\n", hwnd, retval ); if (!(dlgInfo = DIALOG_get_info( hwnd, FALSE ))) { @@ -1530,7 +1530,7 @@ DWORD WINAPI GetDialogBaseUnits(void) cx = GdiGetCharDimensions( hdc, NULL, &cy ); NtUserReleaseDC( 0, hdc ); } - TRACE( "base units = %d,%d\n", cx, cy ); + TRACE( "base units = %ld,%ld\n", cx, cy ); } return MAKELONG( MulDiv( cx, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ), diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 4e32a59df48..b7eaf2b9ddf 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -405,7 +405,7 @@ static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData_linedef(EDITSTATE *es, HD NULL, NULL, NULL, &tabdef, NULL, &line_def->ssa); if (FAILED(hr)) { - WARN("ScriptStringAnalyse failed (%x)\n",hr); + WARN("ScriptStringAnalyse failed (%lx)\n",hr); line_def->ssa = NULL; } @@ -2466,7 +2466,7 @@ static HLOCAL EDIT_EM_GetHandle(EDITSTATE *es) /* The text buffer handle belongs to the app */ es->hlocapp = hLocal; - TRACE("Returning %p, LocalSize() = %ld\n", hLocal, LocalSize(hLocal)); + TRACE("Returning %p, LocalSize() = %Id\n", hLocal, LocalSize(hLocal)); return hLocal; } @@ -4027,7 +4027,7 @@ static LRESULT EDIT_WM_StyleChanged ( EDITSTATE *es, WPARAM which, const STYLES } else if (GWL_EXSTYLE == which) { ; /* FIXME - what is needed here */ } else { - WARN ("Invalid style change %ld\n",which); + WARN ("Invalid style change %Id\n",which); } return 0; @@ -4176,7 +4176,7 @@ static LRESULT EDIT_WM_HScroll(EDITSTATE *es, INT action, INT pos) INT fw = es->format_rect.right - es->format_rect.left; ret = es->text_width ? es->x_offset * 100 / (es->text_width - fw) : 0; } - TRACE("EM_GETTHUMB: returning %ld\n", ret); + TRACE("EM_GETTHUMB: returning %Id\n", ret); return ret; } case EM_LINESCROLL: @@ -4299,7 +4299,7 @@ static LRESULT EDIT_WM_VScroll(EDITSTATE *es, INT action, INT pos) INT vlc = get_vertical_line_count(es); ret = es->line_count ? es->y_offset * 100 / (es->line_count - vlc) : 0; } - TRACE("EM_GETTHUMB: returning %ld\n", ret); + TRACE("EM_GETTHUMB: returning %Id\n", ret); return ret; } case EM_LINESCROLL: @@ -4483,7 +4483,7 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs, BOOL unicode) EDITSTATE *es; UINT alloc_size; - TRACE("Creating %s edit control, style = %08x\n", + TRACE("Creating %s edit control, style = %08lx\n", unicode ? "Unicode" : "ANSI", lpcs->style); if (!(es = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*es)))) @@ -4691,7 +4691,7 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B EDITSTATE *es = (EDITSTATE *)GetWindowLongPtrW( hwnd, 0 ); LRESULT result = 0; - TRACE("hwnd=%p msg=%x (%s) wparam=%lx lparam=%lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), wParam, lParam); + TRACE("hwnd=%p msg=%x (%s) wparam=%Ix lparam=%Ix\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), wParam, lParam); if (!es && msg != WM_NCCREATE) return DefWindowProcT(hwnd, msg, wParam, lParam, unicode); @@ -5246,7 +5246,7 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B if (IsWindow(hwnd) && es && msg != EM_GETHANDLE) EDIT_UnlockBuffer(es, FALSE); - TRACE("hwnd=%p msg=%x (%s) -- 0x%08lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), result); + TRACE("hwnd=%p msg=%x (%s) -- 0x%08Ix\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), result); return result; } diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index a9bc922a782..80106a62edb 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -297,13 +297,13 @@ static UINT ICO_ExtractIconExW( CloseHandle(hFile); if (!fmapping) { - WARN("CreateFileMapping error %d\n", GetLastError() ); + WARN("CreateFileMapping error %ld\n", GetLastError() ); return 0xFFFFFFFF; } if (!(peimage = MapViewOfFile(fmapping, FILE_MAP_READ, 0, 0, 0))) { - WARN("MapViewOfFile error %d\n", GetLastError() ); + WARN("MapViewOfFile error %ld\n", GetLastError() ); CloseHandle(fmapping); return 0xFFFFFFFF; } @@ -332,7 +332,7 @@ static UINT ICO_ExtractIconExW( LPicoICONDIR lpiID = NULL; ULONG uSize = 0; - TRACE("-- OS2/icon Signature (0x%08x)\n", sig); + TRACE("-- OS2/icon Signature (0x%08lx)\n", sig); if (pData == (BYTE*)-1) { @@ -340,7 +340,7 @@ static UINT ICO_ExtractIconExW( if (pCIDir) { iconDirCount = 1; iconCount = lpiID->idCount; - TRACE("-- icon found %p 0x%08x 0x%08x 0x%08x\n", pCIDir, uSize, iconDirCount, iconCount); + TRACE("-- icon found %p 0x%08lx 0x%08x 0x%08x\n", pCIDir, uSize, iconDirCount, iconCount); } } else while (pTInfo->type_id && !(pIconStorage && pIconDir)) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index c0ebe05684f..357a7fdb25a 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -289,14 +289,14 @@ static LRESULT call_hook_proc( HOOKPROC proc, INT id, INT code, WPARAM wparam, L { LRESULT ret; - TRACE_(relay)( "\1Call hook proc %p (id=%s,code=%x,wp=%08lx,lp=%08lx)\n", + TRACE_(relay)( "\1Call hook proc %p (id=%s,code=%x,wp=%08Ix,lp=%08Ix)\n", proc, hook_names[id-WH_MINHOOK], code, wparam, lparam ); if (!prev_unicode == !next_unicode) ret = proc( code, wparam, lparam ); else if (prev_unicode) ret = call_hook_WtoA( proc, id, code, wparam, lparam ); else ret = call_hook_AtoW( proc, id, code, wparam, lparam ); - TRACE_(relay)( "\1Ret hook proc %p (id=%s,code=%x,wp=%08lx,lp=%08lx) retval=%08lx\n", + TRACE_(relay)( "\1Ret hook proc %p (id=%s,code=%x,wp=%08Ix,lp=%08Ix) retval=%08Ix\n", proc, hook_names[id-WH_MINHOOK], code, wparam, lparam, ret ); return ret; @@ -409,7 +409,7 @@ HWINEVENTHOOK WINAPI SetWinEventHook(DWORD event_min, DWORD event_max, UNICODE_STRING str; DWORD len = 0; - TRACE("%d,%d,%p,%p,%08x,%04x,%08x\n", event_min, event_max, inst, + TRACE("%ld,%ld,%p,%p,%08lx,%04lx,%08lx\n", event_min, event_max, inst, proc, pid, tid, flags); if (inst && (!(len = GetModuleFileNameW( inst, module, MAX_PATH )) || len >= MAX_PATH)) @@ -429,14 +429,14 @@ BOOL WINAPI User32CallWinEventHook( const struct win_event_hook_params *params, if (params->module[0] && !(proc = get_hook_proc( proc, params->module, &free_module ))) return FALSE; - TRACE_(relay)( "\1Call winevent hook proc %p (hhook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%x,tid=%04x,time=%x)\n", + TRACE_(relay)( "\1Call winevent hook proc %p (hhook=%p,event=%lx,hwnd=%p,object_id=%lx,child_id=%lx,tid=%04lx,time=%lx)\n", proc, params->handle, params->event, params->hwnd, params->object_id, params->child_id, params->tid, params->time ); proc( params->handle, params->event, params->hwnd, params->object_id, params->child_id, params->tid, params->time ); - TRACE_(relay)( "\1Ret winevent hook proc %p (hhook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%x,tid=%04x,time=%x)\n", + TRACE_(relay)( "\1Ret winevent hook proc %p (hhook=%p,event=%lx,hwnd=%p,object_id=%lx,child_id=%lx,tid=%04lx,time=%lx)\n", proc, params->handle, params->event, params->hwnd, params->object_id, params->child_id, params->tid, params->time ); @@ -477,7 +477,7 @@ BOOL WINAPI User32CallWindowsHook( const struct win_hook_params *params, ULONG s BOOL WINAPI IsWinEventHookInstalled(DWORD dwEvent) { /* FIXME: Needed by Office 2007 installer */ - WARN("(%d)-stub!\n", dwEvent); + WARN("(%ld)-stub!\n", dwEvent); return TRUE; } diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 06756b5551e..5fd5fe6d044 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -578,7 +578,7 @@ HDEVNOTIFY WINAPI RegisterDeviceNotificationW( HANDLE handle, void *filter, DWOR struct device_notification_details details; DEV_BROADCAST_HDR *header = filter; - TRACE("handle %p, filter %p, flags %#x\n", handle, filter, flags); + TRACE("handle %p, filter %p, flags %#lx\n", handle, filter, flags); if (flags & ~(DEVICE_NOTIFY_SERVICE_HANDLE | DEVICE_NOTIFY_ALL_INTERFACE_CLASSES)) { diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 5c0aab5b008..0eed2fdfe65 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2688,7 +2688,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam } if (descr->style & LBS_COMBOBOX) lphc = descr->lphc; - TRACE("[%p]: msg %s wp %08lx lp %08lx\n", + TRACE("[%p]: msg %s wp %08Ix lp %08Ix\n", descr->self, SPY_GetMsgName(msg, descr->self), wParam, lParam ); switch(msg) @@ -3257,7 +3257,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam default: if ((msg >= WM_USER) && (msg < 0xc000)) - WARN("[%p]: unknown msg %04x wp %08lx lp %08lx\n", + WARN("[%p]: unknown msg %04x wp %08Ix lp %08Ix\n", hwnd, msg, wParam, lParam ); } diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index e6a391e03c3..e5a52012413 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -717,7 +717,7 @@ static LONG MDICascade( HWND client, MDICLIENTINFO *ci ) LONG posOptions = SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER; MDI_CalcDefaultChildPos(client, n++, pos, delta, NULL); - TRACE("move %p to (%d,%d) size [%d,%d]\n", + TRACE("move %p to (%ld,%ld) size [%ld,%ld]\n", win_array[i], pos[0].x, pos[0].y, pos[1].x, pos[1].y); style = GetWindowLongW(win_array[i], GWL_STYLE); @@ -1032,7 +1032,7 @@ LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM { MDICLIENTINFO *ci; - TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); + TRACE("%p %04x (%s) %08Ix %08Ix\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); if (!(ci = get_client_info( hwnd ))) { @@ -1209,7 +1209,7 @@ LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM pt.y = (short)HIWORD(lParam); child = ChildWindowFromPoint(hwnd, pt); - TRACE("notification from %p (%i,%i)\n",child,pt.x,pt.y); + TRACE("notification from %p (%li,%li)\n",child,pt.x,pt.y); if (child && child != hwnd && child != ci->hwndActiveChild) NtUserSetWindowPos( child, 0,0,0,0,0, SWP_NOSIZE | SWP_NOMOVE ); @@ -1290,7 +1290,7 @@ LRESULT WINAPI DefFrameProcW( HWND hwnd, HWND hwndMDIClient, { MDICLIENTINFO *ci = get_client_info( hwndMDIClient ); - TRACE("%p %p %04x (%s) %08lx %08lx\n", hwnd, hwndMDIClient, message, SPY_GetMsgName(message, hwnd), wParam, lParam); + TRACE("%p %p %04x (%s) %08Ix %08Ix\n", hwnd, hwndMDIClient, message, SPY_GetMsgName(message, hwnd), wParam, lParam); if (ci) { @@ -1388,7 +1388,7 @@ LRESULT WINAPI DefMDIChildProcA( HWND hwnd, UINT message, HWND client = GetParent(hwnd); MDICLIENTINFO *ci = get_client_info( client ); - TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); + TRACE("%p %04x (%s) %08Ix %08Ix\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); hwnd = WIN_GetFullHandle( hwnd ); if (!ci) return DefWindowProcA( hwnd, message, wParam, lParam ); @@ -1428,7 +1428,7 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message, HWND client = GetParent(hwnd); MDICLIENTINFO *ci = get_client_info( client ); - TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); + TRACE("%p %04x (%s) %08Ix %08Ix\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); hwnd = WIN_GetFullHandle( hwnd ); if (!ci) return DefWindowProcW( hwnd, message, wParam, lParam ); @@ -1598,7 +1598,7 @@ HWND WINAPI CreateMDIWindowA( HINSTANCE hInstance, /* [in] Handle to application instance */ LPARAM lParam) /* [in] Application-defined value */ { - TRACE("(%s,%s,%08x,%d,%d,%d,%d,%p,%p,%08lx)\n", + TRACE("(%s,%s,%08lx,%d,%d,%d,%d,%p,%p,%08Ix)\n", debugstr_a(lpClassName),debugstr_a(lpWindowName),dwStyle,X,Y, nWidth,nHeight,hWndParent,hInstance,lParam); @@ -1626,7 +1626,7 @@ HWND WINAPI CreateMDIWindowW( HINSTANCE hInstance, /* [in] Handle to application instance */ LPARAM lParam) /* [in] Application-defined value */ { - TRACE("(%s,%s,%08x,%d,%d,%d,%d,%p,%p,%08lx)\n", + TRACE("(%s,%s,%08lx,%d,%d,%d,%d,%p,%p,%08Ix)\n", debugstr_w(lpClassName), debugstr_w(lpWindowName), dwStyle, X, Y, nWidth, nHeight, hWndParent, hInstance, lParam); @@ -1668,7 +1668,7 @@ BOOL WINAPI TranslateMDISysAccel( HWND hwndClient, LPMSG msg ) default: return FALSE; } - TRACE("wParam = %04lx\n", wParam); + TRACE("wParam = %04Ix\n", wParam); SendMessageW(ci->hwndActiveChild, WM_SYSCOMMAND, wParam, msg->wParam); return TRUE; } diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index afe3c50154e..1ae722b7662 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -167,7 +167,7 @@ static void do_debug_print_menuitem(const char *prefix, const MENUITEM *mp, TRACE("%s ", prefix); if (mp) { UINT flags = mp->fType; - TRACE( "{ ID=0x%lx", mp->wID); + TRACE( "{ ID=0x%Ix", mp->wID); if ( mp->hSubMenu) TRACE( ", Sub=%p", mp->hSubMenu); if (flags) { @@ -207,7 +207,7 @@ static void do_debug_print_menuitem(const char *prefix, const MENUITEM *mp, if (mp->text) TRACE( ", Text=%s", debugstr_w(mp->text)); if (mp->dwItemData) - TRACE( ", ItemData=0x%08lx", mp->dwItemData); + TRACE( ", ItemData=0x%08Ix", mp->dwItemData); if (mp->hbmpItem) { if( IS_MAGIC_BITMAP(mp->hbmpItem)) @@ -915,7 +915,7 @@ static void MENU_DrawBitmapItem( HDC hdc, MENUITEM *lpitem, const RECT *rect, HFONT hfont, hfontsav; LOGFONTW logfont = { 0, 0, 0, 0, FW_NORMAL, 0, 0, 0, SYMBOL_CHARSET, 0, 0, 0, 0, L"Marlett" }; logfont.lfHeight = min( h, w) - 5 ; - TRACE(" height %d rect %s\n", logfont.lfHeight, wine_dbgstr_rect( rect)); + TRACE(" height %ld rect %s\n", logfont.lfHeight, wine_dbgstr_rect( rect)); hfont = CreateFontIndirectW( &logfont); hfontsav = SelectObject(hdc, hfont); TextOutW( hdc, rect->left, rect->top + 2, &bmchr, 1); @@ -1001,7 +1001,7 @@ static void MENU_CalcItemSize( HDC hdc, MENUITEM *lpitem, HWND hwndOwner, } else lpitem->rect.bottom += mis.itemHeight; - TRACE("id=%04lx size=%dx%d\n", + TRACE("id=%04Ix size=%ldx%ld\n", lpitem->wID, lpitem->rect.right-lpitem->rect.left, lpitem->rect.bottom-lpitem->rect.top); return; @@ -1747,7 +1747,7 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu ) if (menu) { - TRACE("hmenu %p Style %08x\n", hmenu, menu->dwStyle); + TRACE("hmenu %p Style %08lx\n", hmenu, menu->dwStyle); /* draw menu items */ if (menu->nItems) { @@ -2408,7 +2408,7 @@ static INT MENU_ExecFocusedItem( MTRACKER* pmt, HMENU hMenu, UINT wFlags ) item = &menu->items[menu->FocusedItem]; - TRACE("hMenu %p wID %08lx hSubMenu %p fType %04x\n", hMenu, item->wID, item->hSubMenu, item->fType); + TRACE("hMenu %p wID %08Ix hSubMenu %p fType %04x\n", hMenu, item->wID, item->hSubMenu, item->fType); if (!(item->fType & MF_POPUP)) { @@ -3444,7 +3444,7 @@ BOOL WINAPI TrackPopupMenu( HMENU hMenu, UINT wFlags, INT x, INT y, */ LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { - TRACE("hwnd=%p msg=0x%04x wp=0x%04lx lp=0x%08lx\n", hwnd, message, wParam, lParam); + TRACE("hwnd=%p msg=0x%04x wp=0x%04Ix lp=0x%08Ix\n", hwnd, message, wParam, lParam); switch(message) { @@ -3770,9 +3770,9 @@ BOOL WINAPI InsertMenuW( HMENU hMenu, UINT pos, UINT flags, MENUITEMINFOW mii; if (IS_STRING_ITEM(flags) && str) - TRACE("hMenu %p, pos %d, flags %08x, id %04lx, str %s\n", + TRACE("hMenu %p, pos %d, flags %08x, id %04Ix, str %s\n", hMenu, pos, flags, id, debugstr_w(str) ); - else TRACE("hMenu %p, pos %d, flags %08x, id %04lx, str %p (not a string)\n", + else TRACE("hMenu %p, pos %d, flags %08x, id %04Ix, str %p (not a string)\n", hMenu, pos, flags, id, str ); MENU_mnu2mnuii( flags, id, str, &mii); @@ -3834,9 +3834,9 @@ BOOL WINAPI ModifyMenuW( HMENU hMenu, UINT pos, UINT flags, MENUITEMINFOW mii; if (IS_STRING_ITEM(flags)) - TRACE("%p %d %04x %04lx %s\n", hMenu, pos, flags, id, debugstr_w(str) ); + TRACE("%p %d %04x %04Ix %s\n", hMenu, pos, flags, id, debugstr_w(str) ); else - TRACE("%p %d %04x %04lx %p\n", hMenu, pos, flags, id, str ); + TRACE("%p %d %04x %04Ix %p\n", hMenu, pos, flags, id, str ); MENU_mnu2mnuii( flags, id, str, &mii); return NtUserThunkedMenuItemInfo( hMenu, pos, flags, NtUserSetMenuItemInfo, &mii, NULL ); @@ -3944,7 +3944,7 @@ BOOL WINAPI GetMenuBarInfo( HWND hwnd, LONG idObject, LONG idItem, PMENUBARINFO HMENU hmenu = NULL; ATOM class_atom; - TRACE( "(%p,0x%08x,0x%08x,%p)\n", hwnd, idObject, idItem, pmbi ); + TRACE( "(%p,0x%08lx,0x%08lx,%p)\n", hwnd, idObject, idItem, pmbi ); switch (idObject) { @@ -4683,7 +4683,7 @@ INT WINAPI MenuItemFromPoint(HWND hWnd, HMENU hMenu, POINT ptScreen) */ DWORD WINAPI CalcMenuBar(HWND hwnd, DWORD left, DWORD right, DWORD top, RECT *rect) { - FIXME("(%p, %d, %d, %d, %p): stub\n", hwnd, left, right, top, rect); + FIXME("(%p, %ld, %ld, %ld, %p): stub\n", hwnd, left, right, top, rect); return 0; } diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 990323dde65..02c40f2ca4f 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -393,13 +393,13 @@ BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD ptr = &hpack; size = sizeof(hpack); lp = uiLo; - TRACE( "send dde-ack %lx %08lx => %p\n", uiLo, uiHi, h ); + TRACE( "send dde-ack %Ix %08Ix => %p\n", uiLo, uiHi, h ); } } else { /* uiHi should contain either an atom or 0 */ - TRACE( "send dde-ack %lx atom=%lx\n", uiLo, uiHi ); + TRACE( "send dde-ack %Ix atom=%Ix\n", uiLo, uiHi ); lp = MAKELONG( uiLo, uiHi ); } break; @@ -428,7 +428,7 @@ BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD hunlock = (HGLOBAL)uiLo; } } - TRACE( "send ddepack %u %lx\n", size, uiHi ); + TRACE( "send ddepack %u %Ix\n", size, uiHi ); break; case WM_DDE_EXECUTE: if (lparam) @@ -496,13 +496,13 @@ BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam memcpy( &hpack, *buffer, size ); hMem = unpack_ptr( hpack ); uiHi = (UINT_PTR)hMem; - TRACE("recv dde-ack %lx mem=%lx[%lx]\n", uiLo, uiHi, GlobalSize( hMem )); + TRACE("recv dde-ack %Ix mem=%Ix[%Ix]\n", uiLo, uiHi, GlobalSize( hMem )); } else { uiLo = LOWORD( *lparam ); uiHi = HIWORD( *lparam ); - TRACE("recv dde-ack %lx atom=%lx\n", uiLo, uiHi); + TRACE("recv dde-ack %Ix atom=%Ix\n", uiLo, uiHi); } *lparam = PackDDElParam( WM_DDE_ACK, uiLo, uiHi ); break; @@ -539,7 +539,7 @@ BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam { memcpy( ptr, *buffer, size ); GlobalUnlock( hMem ); - TRACE( "exec: pairing c=%08lx s=%p\n", *lparam, hMem ); + TRACE( "exec: pairing c=%08Ix s=%p\n", *lparam, hMem ); if (!dde_add_pair( (HGLOBAL)*lparam, hMem )) { GlobalFree( hMem ); @@ -1153,7 +1153,7 @@ static BOOL CALLBACK bcast_winsta( LPWSTR winsta, LPARAM lp ) { BOOL ret; HWINSTA hwinsta = OpenWindowStationW( winsta, FALSE, WINSTA_ENUMDESKTOPS ); - TRACE("hwinsta: %p/%s/%08x\n", hwinsta, debugstr_w( winsta ), GetLastError()); + TRACE("hwinsta: %p/%s/%08lx\n", hwinsta, debugstr_w( winsta ), GetLastError()); if (!hwinsta) return TRUE; ((BroadcastParm *)lp)->winsta = hwinsta; @@ -1203,7 +1203,7 @@ LONG WINAPI BroadcastSystemMessageExW( DWORD flags, LPDWORD recipients, UINT msg | BSF_POSTMESSAGE | BSF_FORCEIFHUNG | BSF_NOTIMEOUTIFNOTHUNG | BSF_ALLOWSFW | BSF_SENDNOTIFYMESSAGE | BSF_RETURNHDESK | BSF_LUID ); - TRACE("Flags: %08x, recipients: %p(0x%x), msg: %04x, wparam: %08lx, lparam: %08lx\n", flags, recipients, + TRACE("Flags: %08lx, recipients: %p(0x%lx), msg: %04x, wparam: %08Ix, lparam: %08Ix\n", flags, recipients, (recipients ? *recipients : recips), msg, wp, lp); if (flags & ~all_flags) @@ -1233,7 +1233,7 @@ LONG WINAPI BroadcastSystemMessageExW( DWORD flags, LPDWORD recipients, UINT msg ret = parm.success; } else - FIXME("Recipients %08x not supported!\n", *recipients); + FIXME("Recipients %08lx not supported!\n", *recipients); return ret; } @@ -1318,7 +1318,7 @@ BOOL WINAPI IsHungAppWindow( HWND hWnd ) */ BOOL WINAPI ChangeWindowMessageFilter( UINT message, DWORD flag ) { - FIXME( "%x %08x\n", message, flag ); + FIXME( "%x %08lx\n", message, flag ); return TRUE; } @@ -1327,6 +1327,6 @@ BOOL WINAPI ChangeWindowMessageFilter( UINT message, DWORD flag ) */ BOOL WINAPI ChangeWindowMessageFilterEx( HWND hwnd, UINT message, DWORD action, CHANGEFILTERSTRUCT *changefilter ) { - FIXME( "%p %x %d %p\n", hwnd, message, action, changefilter ); + FIXME( "%p %x %ld %p\n", hwnd, message, action, changefilter ); return TRUE; } diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 04ba0a8810c..35518578c6c 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -146,7 +146,7 @@ static UINT WM_MSIME_DOCUMENTFEED; WORD WINAPI UserSignalProc( UINT uCode, DWORD dwThreadOrProcessID, DWORD dwFlags, HMODULE16 hModule ) { - FIXME("(%04x, %08x, %04x, %04x)\n", + FIXME("(%04x, %08lx, %04lx, %04x)\n", uCode, dwThreadOrProcessID, dwFlags, hModule ); /* FIXME: Should chain to GdiSignalProc now. */ return 0; @@ -165,7 +165,7 @@ void WINAPI SetLastErrorEx( DWORD error, /* [in] Per-thread error code */ DWORD type) /* [in] Error type */ { - TRACE("(0x%08x, 0x%08x)\n", error,type); + TRACE("(0x%08lx, 0x%08lx)\n", error,type); switch(type) { case 0: break; @@ -174,7 +174,7 @@ void WINAPI SetLastErrorEx( case SLE_WARNING: /* Fall through for now */ default: - FIXME("(error=%08x, type=%08x): Unhandled type\n", error,type); + FIXME("(error=%08lx, type=%08lx): Unhandled type\n", error,type); break; } SetLastError( error ); @@ -210,7 +210,7 @@ BOOL WINAPI GetAltTabInfoW(HWND hwnd, int iItem, PALTTABINFO pati, LPWSTR pszIte */ VOID WINAPI SetDebugErrorLevel( DWORD dwLevel ) { - FIXME("(%d): stub\n", dwLevel); + FIXME("(%ld): stub\n", dwLevel); } @@ -219,7 +219,7 @@ VOID WINAPI SetDebugErrorLevel( DWORD dwLevel ) */ DWORD WINAPI SetWindowStationUser(DWORD x1,DWORD x2) { - FIXME("(0x%08x,0x%08x),stub!\n",x1,x2); + FIXME("(0x%08lx,0x%08lx),stub!\n",x1,x2); return 1; } @@ -246,7 +246,7 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) */ void WINAPI RegisterSystemThread(DWORD flags, DWORD reserved) { - FIXME("(%08x, %08x)\n", flags, reserved); + FIXME("(%08lx, %08lx)\n", flags, reserved); } /*********************************************************************** @@ -274,7 +274,7 @@ BOOL WINAPI DeregisterShellHookWindow(HWND hWnd) */ DWORD WINAPI RegisterTasklist (DWORD x) { - FIXME("0x%08x\n",x); + FIXME("0x%08lx\n",x); return TRUE; } @@ -302,7 +302,7 @@ DWORD WINAPI GetAppCompatFlags2( HTASK hTask ) */ BOOL WINAPI AlignRects(LPRECT rect, DWORD b, DWORD c, DWORD d) { - FIXME("(%p, %d, %d, %d): stub\n", rect, b, c, d); + FIXME("(%p, %ld, %ld, %ld): stub\n", rect, b, c, d); if (rect) FIXME("rect: %s\n", wine_dbgstr_rect(rect)); /* Calls OffsetRect */ @@ -327,7 +327,7 @@ BOOL WINAPI User32InitializeImmEntryTable(DWORD magic) { HMODULE imm32 = GetModuleHandleW(L"imm32.dll"); - TRACE("(%x)\n", magic); + TRACE("(%lx)\n", magic); if (!imm32 || magic != IMM_INIT_MAGIC) return FALSE; @@ -388,7 +388,7 @@ BOOL WINAPI WINNLSGetEnableStatus(HWND hwnd) */ LRESULT WINAPI SendIMEMessageExA(HWND hwnd, LPARAM lparam) { - FIXME("(%p,%lx): stub\n", hwnd, lparam); + FIXME("(%p,%Ix): stub\n", hwnd, lparam); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -399,7 +399,7 @@ LRESULT WINAPI SendIMEMessageExA(HWND hwnd, LPARAM lparam) */ LRESULT WINAPI SendIMEMessageExW(HWND hwnd, LPARAM lparam) { - FIXME("(%p,%lx): stub\n", hwnd, lparam); + FIXME("(%p,%Ix): stub\n", hwnd, lparam); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -430,7 +430,7 @@ BOOL WINAPI UserHandleGrantAccess(HANDLE handle, HANDLE job, BOOL grant) */ HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE recipient, const GUID *guid, DWORD flags) { - FIXME("(%p,%s,%x): stub\n", recipient, debugstr_guid(guid), flags); + FIXME("(%p,%s,%lx): stub\n", recipient, debugstr_guid(guid), flags); return (HPOWERNOTIFY)0xdeadbeef; } @@ -448,7 +448,7 @@ BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY handle) */ HPOWERNOTIFY WINAPI RegisterSuspendResumeNotification(HANDLE recipient, DWORD flags) { - FIXME("%p, %#x: stub.\n", recipient, flags); + FIXME("%p, %#lx: stub.\n", recipient, flags); return (HPOWERNOTIFY)0xdeadbeef; } @@ -466,7 +466,7 @@ BOOL WINAPI UnregisterSuspendResumeNotification(HPOWERNOTIFY handle) */ BOOL WINAPI GetGestureConfig( HWND hwnd, DWORD reserved, DWORD flags, UINT *count, GESTURECONFIG *config, UINT size ) { - FIXME("(%p %08x %08x %p %p %u): stub\n", hwnd, reserved, flags, count, config, size); + FIXME("(%p %08lx %08lx %p %p %u): stub\n", hwnd, reserved, flags, count, config, size); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -476,7 +476,7 @@ BOOL WINAPI GetGestureConfig( HWND hwnd, DWORD reserved, DWORD flags, UINT *coun */ BOOL WINAPI SetGestureConfig( HWND hwnd, DWORD reserved, UINT id, PGESTURECONFIG config, UINT size ) { - FIXME("(%p %08x %u %p %u): stub\n", hwnd, reserved, id, config, size); + FIXME("(%p %08lx %u %p %u): stub\n", hwnd, reserved, id, config, size); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -530,7 +530,7 @@ BOOL WINAPI GetPointerDevices(UINT32 *device_count, POINTER_DEVICE_INFO *devices */ BOOL WINAPI RegisterTouchHitTestingWindow(HWND hwnd, ULONG value) { - FIXME("(%p %d): stub\n", hwnd, value); + FIXME("(%p %ld): stub\n", hwnd, value); return TRUE; } @@ -605,7 +605,7 @@ static LRESULT ime_internal_msg( WPARAM wParam, LPARAM lParam) ImmReleaseContext(hwnd, himc); break; default: - FIXME("wParam = %lx\n", wParam); + FIXME("wParam = %Ix\n", wParam); break; } diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index c74d33092f0..cc53ab0457e 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -447,7 +447,7 @@ INT WINAPI MessageBoxExW( HWND hWnd, LPCWSTR text, LPCWSTR title, INT WINAPI MessageBoxTimeoutA( HWND hWnd, LPCSTR text, LPCSTR title, UINT type, WORD langid, DWORD timeout ) { - FIXME("timeout not supported (%u)\n", timeout); + FIXME("timeout not supported (%lu)\n", timeout); return MessageBoxExA( hWnd, text, title, type, langid ); } @@ -457,7 +457,7 @@ INT WINAPI MessageBoxTimeoutA( HWND hWnd, LPCSTR text, LPCSTR title, INT WINAPI MessageBoxTimeoutW( HWND hWnd, LPCWSTR text, LPCWSTR title, UINT type, WORD langid, DWORD timeout ) { - FIXME("timeout not supported (%u)\n", timeout); + FIXME("timeout not supported (%lu)\n", timeout); return MessageBoxExW( hWnd, text, title, type, langid ); } diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 85d1a14a195..e677f1aeb66 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -313,7 +313,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH AdjustWindowRectEx( LPRECT rect, DWORD style, BOOL { NONCLIENTMETRICSW ncm; - TRACE("(%s) %08x %d %08x\n", wine_dbgstr_rect(rect), style, menu, exStyle ); + TRACE("(%s) %08lx %d %08lx\n", wine_dbgstr_rect(rect), style, menu, exStyle ); ncm.cbSize = sizeof(ncm); SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); @@ -331,7 +331,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH AdjustWindowRectExForDpi( LPRECT rect, DWORD style { NONCLIENTMETRICSW ncm; - TRACE("(%s) %08x %d %08x %u\n", wine_dbgstr_rect(rect), style, menu, exStyle, dpi ); + TRACE("(%s) %08lx %d %08lx %u\n", wine_dbgstr_rect(rect), style, menu, exStyle, dpi ); ncm.cbSize = sizeof(ncm); SystemParametersInfoForDpi( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0, dpi ); @@ -366,7 +366,7 @@ void NC_HandleNCCalcSize( HWND hwnd, WPARAM wparam, RECT *winRect ) if (((style & (WS_CHILD | WS_POPUP)) != WS_CHILD) && GetMenu(hwnd)) { - TRACE("Calling GetMenuBarHeight with hwnd %p, width %d, at (%d, %d).\n", + TRACE("Calling GetMenuBarHeight with hwnd %p, width %ld, at (%ld, %ld).\n", hwnd, winRect->right - winRect->left, -tmpRect.left, -tmpRect.top ); winRect->top += @@ -458,7 +458,7 @@ LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) RECT rect, rcClient; DWORD style, ex_style; - TRACE("hwnd=%p pt=%d,%d\n", hwnd, pt.x, pt.y ); + TRACE("hwnd=%p pt=%ld,%ld\n", hwnd, pt.x, pt.y ); WIN_GetRectangles( hwnd, COORDS_SCREEN, &rect, &rcClient ); if (!PtInRect( &rect, pt )) return HTNOWHERE; @@ -634,7 +634,7 @@ LRESULT NC_HandleNCMouseMove(HWND hwnd, WPARAM wParam, LPARAM lParam) RECT rect; POINT pt; - TRACE("hwnd=%p wparam=%#lx lparam=%#lx\n", hwnd, wParam, lParam); + TRACE("hwnd=%p wparam=%#Ix lparam=%#Ix\n", hwnd, wParam, lParam); if (wParam != HTHSCROLL && wParam != HTVSCROLL) return 0; @@ -1538,7 +1538,7 @@ LRESULT NC_HandleNCLButtonDblClk( HWND hwnd, WPARAM wParam, LPARAM lParam ) */ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) { - TRACE("hwnd %p WM_SYSCOMMAND %lx %lx\n", hwnd, wParam, lParam ); + TRACE("hwnd %p WM_SYSCOMMAND %Ix %Ix\n", hwnd, wParam, lParam ); if (!NtUserMessageCall( hwnd, WM_SYSCOMMAND, wParam, lParam, 0, NtUserDefWindowProc, FALSE )) return 0; @@ -1602,7 +1602,7 @@ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) case SC_ARRANGE: case SC_NEXTWINDOW: case SC_PREVWINDOW: - FIXME("unimplemented WM_SYSCOMMAND %04lx!\n", wParam); + FIXME("unimplemented WM_SYSCOMMAND %04Ix!\n", wParam); break; } return 0; @@ -1624,7 +1624,7 @@ BOOL WINAPI GetTitleBarInfo(HWND hwnd, PTITLEBARINFO tbi) { } if(tbi->cbSize != sizeof(TITLEBARINFO)) { - TRACE("Invalid TITLEBARINFO size: %d\n", tbi->cbSize); + TRACE("Invalid TITLEBARINFO size: %ld\n", tbi->cbSize); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index a014066f988..d706e19d64f 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -107,14 +107,14 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) SetupDiGetDeviceInterfaceDetailW(set, iface, NULL, 0, &size, &device_data); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) { - ERR("Failed to get device path, error %#x.\n", GetLastError()); + ERR("Failed to get device path, error %#lx.\n", GetLastError()); return FALSE; } if (!SetupDiGetDevicePropertyW(set, &device_data, &DEVPROPKEY_HID_HANDLE, &type, (BYTE *)&handle, sizeof(handle), NULL, 0) || type != DEVPROP_TYPE_UINT32) { - ERR("Failed to get device handle, error %#x.\n", GetLastError()); + ERR("Failed to get device handle, error %#lx.\n", GetLastError()); return NULL; } @@ -133,7 +133,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); if (file == INVALID_HANDLE_VALUE) { - ERR("Failed to open device file %s, error %u.\n", debugstr_w(detail->DevicePath), GetLastError()); + ERR("Failed to open device file %s, error %lu.\n", debugstr_w(detail->DevicePath), GetLastError()); free(detail); return NULL; } @@ -506,11 +506,11 @@ BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(const RAWINPUTDEVICE *devi for (i = 0; i < device_count; ++i) { - TRACE("device %u: page %#x, usage %#x, flags %#x, target %p.\n", + TRACE("device %u: page %#x, usage %#x, flags %#lx, target %p.\n", i, devices[i].usUsagePage, devices[i].usUsage, devices[i].dwFlags, devices[i].hwndTarget); if (devices[i].dwFlags & ~(RIDEV_REMOVE|RIDEV_NOLEGACY|RIDEV_INPUTSINK|RIDEV_DEVNOTIFY)) - FIXME("Unhandled flags %#x for device %u.\n", devices[i].dwFlags, i); + FIXME("Unhandled flags %#lx for device %u.\n", devices[i].dwFlags, i); d[i].usage_page = devices[i].usUsagePage; d[i].usage = devices[i].usUsage; diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index 1031ee2da65..3714b05ce8d 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -237,7 +237,7 @@ DWORD WINAPI GetGuiResources( HANDLE hProcess, DWORD uiFlags ) static BOOL warn = TRUE; if (warn) { - FIXME("(%p,%x): stub\n",hProcess,uiFlags); + FIXME("(%p,%lx): stub\n",hProcess,uiFlags); warn = FALSE; } diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 1909d4082ce..8bf1f4312ab 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -752,7 +752,7 @@ static void SCROLL_RefreshScrollBar( HWND hwnd, INT nBar, */ static void SCROLL_HandleKbdEvent(HWND hwnd, WPARAM wParam, LPARAM lParam) { - TRACE("hwnd=%p wParam=%ld lParam=%ld\n", hwnd, wParam, lParam); + TRACE("hwnd=%p wParam=%Id lParam=%Id\n", hwnd, wParam, lParam); /* hide caret on first KEYDOWN to prevent flicker */ if ((lParam & PFD_DOUBLEBUFFER_DONTCARE) == 0) @@ -923,7 +923,7 @@ void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt ) return; /* Should never happen */ } - TRACE("Event: hwnd=%p bar=%d msg=%s pt=%d,%d hit=%d\n", + TRACE("Event: hwnd=%p bar=%d msg=%s pt=%ld,%ld hit=%d\n", hwnd, nBar, SPY_GetMsgName(msg,hwnd), pt.x, pt.y, hittest ); switch (g_tracking_info.hit_test) @@ -1574,13 +1574,13 @@ LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARA case 0x00ed: case 0x00ee: case 0x00ef: - ERR("unknown Win32 msg %04x wp=%08lx lp=%08lx\n", + ERR("unknown Win32 msg %04x wp=%08Ix lp=%08Ix\n", message, wParam, lParam ); break; default: if (message >= WM_USER) - WARN("unknown msg %04x wp=%04lx lp=%08lx\n", + WARN("unknown msg %04x wp=%04Ix lp=%08Ix\n", message, wParam, lParam ); if (unicode) return DefWindowProcW( hwnd, message, wParam, lParam ); @@ -1825,7 +1825,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetScrollInfo(HWND hwnd, INT nBar, LPSCROLLINFO in */ BOOL WINAPI GetScrollBarInfo(HWND hwnd, LONG idObject, LPSCROLLBARINFO info) { - TRACE("hwnd=%p idObject=%d info=%p\n", hwnd, idObject, info); + TRACE("hwnd=%p idObject=%ld info=%p\n", hwnd, idObject, info); /* Refer OBJID_CLIENT requests to the window */ if (idObject == OBJID_CLIENT) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 3c9b67b20ac..cfcbe92cd98 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -344,7 +344,7 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam case WM_CREATE: if (style < 0L || style > SS_TYPEMASK) { - ERR("Unknown style 0x%02x\n", style ); + ERR("Unknown style 0x%02lx\n", style ); return -1; } STATIC_InitColours(); @@ -527,7 +527,7 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, full_style ); break; default: - FIXME("STM_SETIMAGE: Unhandled type %lx\n", wParam); + FIXME("STM_SETIMAGE: Unhandled type %Ix\n", wParam); break; } STATIC_TryPaintFcn( hwnd, full_style ); diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 9cd9bd60146..bdb878c9f51 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -93,7 +93,7 @@ static void dpiaware_init(void) if (!LdrQueryImageFileExecutionOptions( &NtCurrentTeb()->Peb->ProcessParameters->ImagePathName, L"dpiAwareness", REG_DWORD, &option, sizeof(option), NULL )) { - TRACE( "got option %x\n", option ); + TRACE( "got option %lx\n", option ); if (option <= 2) { SetProcessDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~(ULONG_PTR)option ); @@ -347,7 +347,7 @@ BOOL WINAPI LockWorkStation(void) */ int WINAPI RegisterServicesProcess(DWORD ServicesProcessId) { - FIXME("(0x%x): stub\n", ServicesProcessId); + FIXME("(0x%lx): stub\n", ServicesProcessId); return 0; } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 99ee93adba7..9b9dde82561 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -458,7 +458,7 @@ static void dump_window_styles( DWORD style, DWORD exstyle ) WS_MINIMIZEBOX | \ WS_MAXIMIZEBOX)) - if(style & ~DUMPED_STYLES) TRACE(" %08x", style & ~DUMPED_STYLES); + if(style & ~DUMPED_STYLES) TRACE(" %08lx", style & ~DUMPED_STYLES); TRACE("\n"); #undef DUMPED_STYLES @@ -510,7 +510,7 @@ static void dump_window_styles( DWORD style, DWORD exstyle ) WS_EX_COMPOSITED |\ WS_EX_NOACTIVATE)) - if(exstyle & ~DUMPED_EX_STYLES) TRACE(" %08x", exstyle & ~DUMPED_EX_STYLES); + if(exstyle & ~DUMPED_EX_STYLES) TRACE(" %08lx", exstyle & ~DUMPED_EX_STYLES); TRACE("\n"); #undef DUMPED_EX_STYLES } @@ -536,7 +536,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, if (!get_class_info( module, className, &info, &class, FALSE )) return FALSE; - TRACE("%s %s%s%s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", + TRACE("%s %s%s%s ex=%08lx style=%08lx %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName), debugstr_w(className), class.Buffer != className ? "->" : "", class.Buffer != className ? debugstr_wn(class.Buffer, class.Length / sizeof(WCHAR)) : "", @@ -1753,7 +1753,7 @@ LONG_PTR WINAPI SetWindowLongPtrA( HWND hwnd, INT offset, LONG_PTR newval ) */ BOOL WINAPI RegisterTouchWindow(HWND hwnd, ULONG flags) { - FIXME("(%p %08x): stub\n", hwnd, flags); + FIXME("(%p %08lx): stub\n", hwnd, flags); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -1820,7 +1820,7 @@ BOOL WINAPI GetWindowDisplayAffinity(HWND hwnd, DWORD *affinity) */ BOOL WINAPI SetWindowDisplayAffinity(HWND hwnd, DWORD affinity) { - FIXME("(%p, %u): stub\n", hwnd, affinity); + FIXME("(%p, %lu): stub\n", hwnd, affinity); if (!hwnd) { diff --git a/dlls/user32/winhelp.c b/dlls/user32/winhelp.c index 2b4ca5b89b5..b689cffbf5b 100644 --- a/dlls/user32/winhelp.c +++ b/dlls/user32/winhelp.c @@ -149,7 +149,7 @@ BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand, ULONG_PTR dwD lpwh->ofsData = sizeof(WINHELP) + nlen; } else lpwh->ofsData = 0; - TRACE("Sending[%u]: cmd=%u data=%08x fn=%s\n", + TRACE("Sending[%u]: cmd=%u data=%08lx fn=%s\n", lpwh->size, lpwh->command, lpwh->data, lpwh->ofsFilename ? (LPSTR)lpwh + lpwh->ofsFilename : ""); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 03fe731ee0e..d38a3df18da 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -516,7 +516,7 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) capturePoint = pt; NtUserClipCursor( NULL ); - TRACE("hwnd %p command %04lx, hittest %d, pos %d,%d\n", + TRACE("hwnd %p command %04Ix, hittest %ld, pos %ld,%ld\n", hwnd, syscommand, hittest, pt.x, pt.y); if (syscommand == SC_MOVE) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 9e90906bc5d..098bd17fbc0 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -137,12 +137,12 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRES { WNDPROC proc = arg; - TRACE_(relay)( "\1Call window proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n", + TRACE_(relay)( "\1Call window proc %p (hwnd=%p,msg=%s,wp=%08Ix,lp=%08Ix)\n", proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp ); *result = WINPROC_wrapper( proc, hwnd, msg, wp, lp ); - TRACE_(relay)( "\1Ret window proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx) retval=%08lx\n", + TRACE_(relay)( "\1Ret window proc %p (hwnd=%p,msg=%s,wp=%08Ix,lp=%08Ix) retval=%08Ix\n", proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp, *result ); return *result; } @@ -157,7 +157,7 @@ static LRESULT call_dialog_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRES USER_CheckNotLock(); hwnd = WIN_GetFullHandle( hwnd ); - TRACE_(relay)( "\1Call dialog proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n", + TRACE_(relay)( "\1Call dialog proc %p (hwnd=%p,msg=%s,wp=%08Ix,lp=%08Ix)\n", proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp ); context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); @@ -165,7 +165,7 @@ static LRESULT call_dialog_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRES *result = GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); SetThreadDpiAwarenessContext( context ); - TRACE_(relay)( "\1Ret dialog proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx) retval=%08lx result=%08lx\n", + TRACE_(relay)( "\1Ret dialog proc %p (hwnd=%p,msg=%s,wp=%08Ix,lp=%08Ix) retval=%08Ix result=%08Ix\n", proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp, ret, *result ); return ret; } @@ -212,7 +212,7 @@ LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, { LRESULT ret = 0; - TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n", + TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08Ix,lp=%08Ix)\n", hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam); switch(msg) @@ -473,7 +473,7 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN { LRESULT ret = 0; - TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n", + TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08Ix,lp=%08Ix)\n", hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam); switch(msg) diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index c0c8ec7a14f..23844482f2c 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -404,7 +404,7 @@ BOOL WINAPI SetUserObjectInformationA( HANDLE handle, INT index, LPVOID info, DW BOOL WINAPI GetUserObjectSecurity( HANDLE handle, PSECURITY_INFORMATION info, PSECURITY_DESCRIPTOR sid, DWORD len, LPDWORD needed ) { - FIXME( "(%p %p %p len=%d %p),stub!\n", handle, info, sid, len, needed ); + FIXME( "(%p %p %p len=%ld %p),stub!\n", handle, info, sid, len, needed ); if (needed) *needed = sizeof(SECURITY_DESCRIPTOR); if (len < sizeof(SECURITY_DESCRIPTOR))

1 0