- wine-devel - winehq.org

[PATCH v2 0/5] MR169: user32/tests: Cleanup some tests.
by Rémi Bernon (＠rbernon) 01 Jun '22

01 Jun '22

-- v2: user32/tests: Process messages while waiting in WindowFromPoint tests. user32/tests: Check for window class registration failure normally. user32/tests: Remove SetForegroundWindow success checks. user32/tests: Remove unnecessary test skipping checks. user32/tests: Fix indentation to silence a warning. https://gitlab.winehq.org/wine/wine/-/merge_requests/169

5 17

[PATCH 0/2] MR89: Use +threadname channel for thread names.
by Brendan Shanks (＠bshanks) 01 Jun '22

01 Jun '22

Currently, the two methods of setting thread names in Windows (SetThreadDescription() and the 0x406D1388 exception) log to different channels. I think it would be useful for these to both log to the same +threadname channel. My thinking is that this would be similar to +debugstr, in that all messages are human-readable descriptions which would be useful for debugging crashes. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/89

3 3

[PATCH 0/6] MR165: ntdll: Improve block size rounding compatibility.
by Rémi Bernon (＠rbernon) 01 Jun '22

01 Jun '22

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

4 11

[PATCH] xaudio2/tests: Remove failing legacy CLSID tests
by Andrew Eikum 01 Jun '22

01 Jun '22

Modern Windows fails these tests, and no application is known to need this behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52998 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/tests/xaudio2.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 9d50944b8d3..f4f808c2656 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -1067,10 +… [View More]

1 0

[PATCH 0/5] MR169: user32/tests: Cleanup some msg.c tests.
by Rémi Bernon (＠rbernon) 01 Jun '22

01 Jun '22

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

4 11

[PATCH v2 4/6] d3dx10_43: Add D3DX10CreateAsyncTextureInfoProcessor stub.
by Piotr Caban 01 Jun '22

01 Jun '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 6 ++++++ dlls/d3dx10_43/d3dx10_43.spec | 2 +- include/d3dx10.h | 2 +- include/d3dx10async.h | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-)

3 4

[PATCH 0/4] MR168: winemac: PE conversion preparation
by Jacek Caban (＠jacek) 01 Jun '22

01 Jun '22

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

3 5

Re: [PATCH v2 0/5] MR162: explorer: Move clipboard manager thread from display driver.
by Martin Storsjö (＠mstorsjo) 01 Jun '22

01 Jun '22

This (in particular, the “explorer: …” commit) caused a regression for me. In an entirely headless configuration (configured with `--without-x`) on arm32 (probably happens on other architectures too, but that’s where it happened for me), when bootstrapping a new wineprefix (setting `WINEPREFIX` to a new, nonexistent directory, running `wine wineboot`), it can hang, printing errors like these: ``` 0048:err:sync:RtlpWaitForCriticalSection section 7BC8A3F0 "../src/dlls/ntdll /loader.c: … [View More]

1 0

[PATCH v2 6/6] d3dx10_43/tests: Add D3DX10CreateAsyncTextureInfoProcessor tests.
by Piotr Caban 01 Jun '22

01 Jun '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 43 +++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)

2 1

[PATCH v2 3/6] d3dx10_43: Share code for resource data loading.
by Piotr Caban 01 Jun '22

01 Jun '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 93 ++++++++++++++++++++++++++++---------- dlls/d3dx10_43/compiler.c | 34 ++------------ dlls/d3dx10_43/dxhelpers.h | 4 ++ dlls/d3dx10_43/texture.c | 70 ++++------------------------ 4 files changed, 89 insertions(+), 112 deletions(-)

2 1

[PATCH v2 2/6] d3dx10_43: Share code for file data loading.
by Piotr Caban 01 Jun '22

01 Jun '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 39 +++++++++++++++--------- dlls/d3dx10_43/dxhelpers.h | 19 ++++++++++++ dlls/d3dx10_43/texture.c | 62 +++++--------------------------------- 3 files changed, 51 insertions(+), 69 deletions(-) create mode 100644 dlls/d3dx10_43/dxhelpers.h

2 1

[PATCH v2 1/6] d3dx10_43: Try loading the resource as bitmap in D3DX10CreateAsyncResourceLoader.
by Piotr Caban 01 Jun '22

01 Jun '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - include patch with tests (no changes to patches 1..5) dlls/d3dx10_43/async.c | 4 ++++ 1 file changed, 4 insertions(+)

2 1

[tools] testbot/build: Fix passing the BuildWine() target list in Reconfig.
by Francois Gouget 01 Jun '22

01 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Broken yesterday :-( --- testbot/bin/build/Reconfig.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 9e1043aa1..4f07eeefc 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -57,9 +57,9 @@ sub UpdateWineBuilds($$) my $Configure = "--without-x --without-freetype --disable-winetest"; return … [View More]

1 0

[tools] testbot/TestWTBS: Provide finer grained support for 32-/64-bit reports.
by Francois Gouget 01 Jun '22

01 Jun '22

This allows specifying different expected errors for 32-bit and 64-bit report files. This is in particular needed when trying to match Wine exception messages since they contain the bitness. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 49 ++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index e5cd44832..139f011ef 100755 --- a/testbot/tests/… [View More]TestWTBS +++ b/testbot/tests/TestWTBS @@ -337,7 +337,7 @@ sub LoadTestInfo($) foreach my $RawGroupName (@{$RawInfo->{ErrGroupNames}}) { my $GroupName = lcfirst($RawGroupName); - if ($GroupName =~ s/^(tasks|tests|build|win|win32|win64|wine|wine:build|wine:test|wine:module)\.(report|log|testbot)\.//) + if ($GroupName =~ s/^(tasks|tests|build|win|win32|win64|wine|wine:build|wine:test|wine:module)\.(win32|wow32|wow64|report|log|testbot)\.//) { my $ErrInfo = ($TestInfo->{$1}->{"$2.errors"} ||= {}); push @{$ErrInfo->{ErrGroupNames}}, $GroupName; @@ -381,8 +381,8 @@ sub LoadTestInfo($) if (ref($SrcVal) eq "HASH" and $Field !~ /\.errors$/) { # Simply propagating hashtable references would result in changes to - # win32 to impact the parent win / test parent which is not what we - # want. So subsets of properties are not supported. + # win32 to impact the win / test parent which is not what we want. + # So subsets of properties are not supported. # .errors properties are the exception because their values are a # LoadLogErrors() structure. As a result they are read-only, and are # not merged. @@ -445,7 +445,7 @@ sub LoadTestInfo($) foreach my $TaskType ("tasks", "tests", "build", "win", "win32", "win64", "wine", "wine:build", "wine:test", "wine:module") { - foreach my $LogType ("report", "log", "testbot") + foreach my $LogType ("win32", "wow32", "wow64", "report", "log", "testbot") { my $Array = $TestInfo->{$TaskType}->{"$LogType.$GrepType"}; next if (!defined $Array); @@ -483,6 +483,30 @@ sub LoadTestInfo($) SetDefault($TestInfo, "webpatch", "Status", $Status); } + # Propagate the 'report.*' settings to win32, wow32 and wow64 + foreach my $TaskType ("wine", "wine:build", "wine:test", "wine:module") + { + my $TaskInfo = $TestInfo->{$TaskType}; + foreach my $ReportField (keys %$TaskInfo) + { + next if (!$ReportField =~ /^report\./); + if (ref($TaskInfo->{$ReportField}) eq "HASH" and + $ReportField !~ /\.errors$/) + { + # See the previous task-type propagation comment. + fail("internal error: $TaskType.$ReportField should not be a hash in $FileName"); + next; + } + foreach my $LogType ("win32", "wow32", "wow64") + { + my $LogField = $ReportField; + $LogField =~ s/^report/$LogType/; + next if (defined $TaskInfo->{$LogField}); + $TaskInfo->{$LogField} = $TaskInfo->{$ReportField}; + } + } + } + return $TestInfo; } @@ -643,13 +667,14 @@ sub IsTimeoutError($$) } =pod -=item <tasks.(report|log|testbot).groupname> +=item <tasks.(win32|wow32|wow64|report|log|testbot).groupname> Verifies the presence of new errors in the specified error log or report of the tasks in the specified category. For this, list the group and errors that are expected to appear; where the group name is prefixed by the task -category and either 'report' for the test reports, 'log' for 'task.log', or -'testbot' for 'testbot.log'. +category and either 'win32' for 'win32.report', 'wow32' for 'wow32.report', +'wow64' for 'wow64.report', 'report' for any of the test reports, +'log' for 'task.log', or 'testbot' for 'testbot.log'. For instance: g 0 tests.report.kernel32 @@ -678,7 +703,7 @@ Finally, note that while the error directives are inherited by subcategories, they are not merged. So if both win and win32 have error-matching directives, win32 will not inherit anything from the win category. -=item <tasks.(report|log|testbot).Errors> +=item <tasks.(win32|wow32|wow64|report|log|testbot).Errors> Inheritance of the reference error lists cannot be prevented but can be ignored by setting this property to 'ignore'. @@ -856,8 +881,8 @@ depend on whether the test was the last one run by the task (in the Wine case). By default this check is skipped and timeout errors are reported like any other unexpected error. -=item <tasks.(report|log|testbot).Grep> -=item <tasks.(report|log|testbot).GrepV> +=item <tasks.(win32|wow32|wow64|report|log|testbot).Grep> +=item <tasks.(win32|wow32|wow64|report|log|testbot).GrepV> Verifies the presence or absence of specific regular expressions in the specified error log or reports of the tasks in the specified category. @@ -940,7 +965,9 @@ sub CheckTask($$$$) my $LogType = "log"; if ($LogName =~ /\.report$/) { - $LogType = "report"; + $LogType = $LogName =~ /^wow32/ ? "wow32" : + $LogName =~ /^wow64/ ? "wow64" : + "win32"; $ReportCount++; ok($ReportTypes{$LogName}, "Check that $LogName is expected"); -- 2.30.2 [View Less]

1 0

[tools] testbot/orm: Take the filters into account in DBIBackend::DeleteAll().
by Francois Gouget 01 Jun '22

01 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 940d37f65..07b838d74 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -738,6 +738,22 @@ sub DeleteAll($$) push @Data, @{$MasterColValues}; } + my $Filter = $Collection->… [View More]

1 0

[PATCH 0/2] MR157: win32u/clipboard: Set bitmap and palette as system object.
by Jactry Zeng (＠jactry) 01 Jun '22

01 Jun '22

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

3 5

[PATCH v3 0/2] MR138: d3drm: IDirect3DRMTexture3 Get/SetDecalTransparency
by Alistair Leslie-Hughes (＠alesliehughes) 01 Jun '22

01 Jun '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v3: d3drm: IDirect3DRMTexture3 Get/SetDecalSize d3drm: IDirect3DRMTexture3 Get/SetDecalTransparency https://gitlab.winehq.org/wine/wine/-/merge_requests/138

2 3

[PATCH 0/1] MR167: d3drm: IDirect3DRMMeshBuilder3::Load support loading from resource
by Alistair Leslie-Hughes (＠alesliehughes) 01 Jun '22

01 Jun '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/167

2 1

[PATCH 0/1] MR166: include: Add touch and pointer input related winuser.h declarations.
by Rémi Bernon (＠rbernon) 01 Jun '22

01 Jun '22

This is a bit exhaustive but as it really hurts compilation it's probably better to declare as much as we can. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/166

2 1

[PATCH 0/1] MR163: avicap32: Add fallback Unixlib function and thunk to use when V4L is unavailable.
by Brendan Shanks (＠bshanks) 01 Jun '22

01 Jun '22

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

3 2

[PATCH 0/1] MR164: winex11.drv: Avoid adding duplicate GPUs.
by Paul Gofman (＠gofman) 01 Jun '22

01 Jun '22

On certain dual GPU configurations (AMD integrated / discrete GPU laptop in my case) vkGetRandROutputDisplayEXT() doesn't work the way we currently expect. That is, it returns success and a valid VkDisplay handler for any randr provider and GPU combination. The configuration ends up broken in various aspects, the same GPU gets added twice with identical parameters while another GPU is not represented at all. I think it is not a Vulkan or xrandr bug, this behaviour probably reflects the fact … [View More]

3 3

[PATCH 0/1] MR158: winex11: Check for invalid format in get_tile_pict
by Alex Henrie (＠alexhenrie) 01 Jun '22

01 Jun '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52747 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/158

3 4

[PATCH vkd3d v2] vkd3d: Replace descriptor mutexes with atomic operations.
by Conor McCarthy 01 Jun '22

01 Jun '22

Atomic ops can be used if the descriptor struct elements are replaced with a pointer to an allocated object. SRV, UAV and sampler descriptors already had view object pointers, so this doesn't affect performance for them, but CBVs now require dereferencing another (possibly distant) memory location in addition to the descriptor, which is not great for memory cache efficiency when copying CBVs. However, the descriptor heap buffer is now much smaller, and in most cases it's probably a good … [View More]tradeoff for removing mutexes. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v2: Handle the case in d3d12_desc_get_object_ref() where a descriptor object was already freed and reused elsewhere when the refcount was incremented. --- include/private/vkd3d_common.h | 13 + include/vkd3d_windows.h | 1 + libs/vkd3d/command.c | 90 ++++--- libs/vkd3d/device.c | 58 ++--- libs/vkd3d/resource.c | 425 +++++++++++++++------------------ libs/vkd3d/vkd3d_private.h | 128 +++++++--- 6 files changed, 390 insertions(+), 325 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index c041b52d..e4a636c4 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -219,6 +219,10 @@ static inline LONG InterlockedAdd(LONG volatile *x, LONG val) { return __sync_add_and_fetch(x, val); } +static inline LONG InterlockedCompareExchange(LONG volatile *x, LONG xchg, LONG cmp) +{ + return __sync_val_compare_and_swap(x, cmp, xchg); +} # else # error "InterlockedIncrement() not implemented for this platform" # endif /* HAVE_SYNC_ADD_AND_FETCH */ @@ -231,6 +235,15 @@ static inline LONG InterlockedDecrement(LONG volatile *x) # else # error "InterlockedDecrement() not implemented for this platform" # endif + +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) +static inline PVOID InterlockedExchangePointer(PVOID volatile *x, PVOID val) +{ + return __atomic_exchange_n(x, val, __ATOMIC_SEQ_CST); +} +# else +# error "InterlockedExchangePointer() not implemented for this platform" +# endif #endif /* _WIN32 */ static inline void vkd3d_parse_version(const char *version, int *major, int *minor) diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index 002ff667..7570113b 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -103,6 +103,7 @@ typedef unsigned short WCHAR; typedef wchar_t WCHAR; # endif /* VKD3D_WIN32_WCHAR */ typedef void *HANDLE; +typedef void *PVOID; /* GUID */ # ifdef __WIDL__ diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d0782e5a..2f518af9 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1525,13 +1525,13 @@ static bool d3d12_command_allocator_add_descriptor_pool(struct d3d12_command_all } static bool d3d12_command_allocator_add_view(struct d3d12_command_allocator *allocator, - struct vkd3d_view *view) + struct vkd3d_view_desc *view) { if (!vkd3d_array_reserve((void **)&allocator->views, &allocator->views_size, allocator->view_count + 1, sizeof(*allocator->views))) return false; - vkd3d_view_incref(view); + vkd3d_desc_incref(view); allocator->views[allocator->view_count++] = view; return true; @@ -1718,7 +1718,7 @@ static void d3d12_command_allocator_free_resources(struct d3d12_command_allocato for (i = 0; i < allocator->view_count; ++i) { - vkd3d_view_decref(allocator->views[i], device); + vkd3d_view_desc_decref(allocator->views[i], device); } allocator->view_count = 0; @@ -2868,28 +2868,31 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des unsigned int index, bool use_array) { uint32_t descriptor_range_magic = range->descriptor_magic; - const struct vkd3d_view *view = descriptor->u.view_info.view; + union d3d12_desc_object u = descriptor->u; uint32_t vk_binding = range->binding; + VkDescriptorType vk_descriptor_type; uint32_t set = range->set; - if (descriptor->magic != descriptor_range_magic) + if (!u.header || u.header->magic != descriptor_range_magic) return false; + vk_descriptor_type = u.header->vk_descriptor_type; + vk_descriptor_write->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; vk_descriptor_write->pNext = NULL; vk_descriptor_write->dstSet = vk_descriptor_sets[set]; vk_descriptor_write->dstBinding = use_array ? vk_binding : vk_binding + index; vk_descriptor_write->dstArrayElement = use_array ? index : 0; vk_descriptor_write->descriptorCount = 1; - vk_descriptor_write->descriptorType = descriptor->vk_descriptor_type; + vk_descriptor_write->descriptorType = vk_descriptor_type; vk_descriptor_write->pImageInfo = NULL; vk_descriptor_write->pBufferInfo = NULL; vk_descriptor_write->pTexelBufferView = NULL; - switch (descriptor->magic) + switch (u.header->magic) { case VKD3D_DESCRIPTOR_MAGIC_CBV: - vk_descriptor_write->pBufferInfo = &descriptor->u.vk_cbv_info; + vk_descriptor_write->pBufferInfo = &u.cb_desc->vk_cbv_info; break; case VKD3D_DESCRIPTOR_MAGIC_SRV: @@ -2900,8 +2903,8 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des * in pairs in one set. */ if (range->descriptor_count == UINT_MAX) { - if (descriptor->vk_descriptor_type != VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER - && descriptor->vk_descriptor_type != VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) + if (vk_descriptor_type != VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER + && vk_descriptor_type != VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) { vk_descriptor_write->dstSet = vk_descriptor_sets[set + 1]; vk_descriptor_write->dstBinding = 0; @@ -2911,21 +2914,21 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des { if (!use_array) vk_descriptor_write->dstBinding = vk_binding + 2 * index; - if (descriptor->vk_descriptor_type != VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER - && descriptor->vk_descriptor_type != VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) + if (vk_descriptor_type != VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER + && vk_descriptor_type != VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) ++vk_descriptor_write->dstBinding; } - if (descriptor->vk_descriptor_type == VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER - || descriptor->vk_descriptor_type == VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) + if (vk_descriptor_type == VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER + || vk_descriptor_type == VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) { - vk_descriptor_write->pTexelBufferView = &view->u.vk_buffer_view; + vk_descriptor_write->pTexelBufferView = &u.view_desc->view.u.vk_buffer_view; } else { vk_image_info->sampler = VK_NULL_HANDLE; - vk_image_info->imageView = view->u.vk_image_view; - vk_image_info->imageLayout = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_SRV + vk_image_info->imageView = u.view_desc->view.u.vk_image_view; + vk_image_info->imageLayout = u.header->magic == VKD3D_DESCRIPTOR_MAGIC_SRV ? VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL : VK_IMAGE_LAYOUT_GENERAL; vk_descriptor_write->pImageInfo = vk_image_info; @@ -2933,7 +2936,7 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des break; case VKD3D_DESCRIPTOR_MAGIC_SAMPLER: - vk_image_info->sampler = view->u.vk_sampler; + vk_image_info->sampler = u.view_desc->view.u.vk_sampler; vk_image_info->imageView = VK_NULL_HANDLE; vk_image_info->imageLayout = VK_IMAGE_LAYOUT_UNDEFINED; @@ -2941,7 +2944,7 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des break; default: - ERR("Invalid descriptor %#x.\n", descriptor->magic); + ERR("Invalid descriptor %#x.\n", u.header->magic); return false; } @@ -2996,6 +2999,11 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list for (j = 0; j < descriptor_count; ++j, ++descriptor) { unsigned int register_idx = range->base_register_idx + j; + union d3d12_desc_object u = descriptor->u; + VkBufferView vk_counter_view; + + vk_counter_view = (u.header && u.header->magic == VKD3D_DESCRIPTOR_MAGIC_UAV) + ? u.view_desc->view.vk_counter_view : VK_NULL_HANDLE; /* Track UAV counters. */ if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV) @@ -3005,8 +3013,6 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list if (state->uav_counters.bindings[k].register_space == range->register_space && state->uav_counters.bindings[k].register_index == register_idx) { - VkBufferView vk_counter_view = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV - ? descriptor->u.view_info.view->vk_counter_view : VK_NULL_HANDLE; if (bindings->vk_uav_counter_views[k] != vk_counter_view) bindings->uav_counters_dirty = true; bindings->vk_uav_counter_views[k] = vk_counter_view; @@ -3016,7 +3022,7 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list } /* Not all descriptors are necessarily populated if the range is unbounded. */ - if (descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_FREE) + if (!u.header) continue; if (!vk_write_descriptor_set_from_d3d12_desc(current_descriptor_write, current_image_info, @@ -4956,8 +4962,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface); const struct d3d12_rtv_desc *rtv_desc; const struct d3d12_dsv_desc *dsv_desc; + struct vkd3d_view_desc *view; VkFormat prev_dsv_format; - struct vkd3d_view *view; unsigned int i; TRACE("iface %p, render_target_descriptor_count %u, render_target_descriptors %p, " @@ -5003,7 +5009,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi WARN("Failed to add view.\n"); } - list->rtvs[i] = view->u.vk_image_view; + list->rtvs[i] = view->view.u.vk_image_view; list->fb_width = max(list->fb_width, rtv_desc->width); list->fb_height = max(list->fb_height, rtv_desc->height); list->fb_layer_count = max(list->fb_layer_count, rtv_desc->layer_count); @@ -5027,7 +5033,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi list->dsv = VK_NULL_HANDLE; } - list->dsv = view->u.vk_image_view; + list->dsv = view->view.u.vk_image_view; list->fb_width = max(list->fb_width, dsv_desc->width); list->fb_height = max(list->fb_height, dsv_desc->height); list->fb_layer_count = max(list->fb_layer_count, dsv_desc->layer_count); @@ -5049,7 +5055,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi static void d3d12_command_list_clear(struct d3d12_command_list *list, const struct VkAttachmentDescription *attachment_desc, const struct VkAttachmentReference *color_reference, const struct VkAttachmentReference *ds_reference, - struct vkd3d_view *view, size_t width, size_t height, unsigned int layer_count, + struct vkd3d_view_desc *view, size_t width, size_t height, unsigned int layer_count, const union VkClearValue *clear_value, unsigned int rect_count, const D3D12_RECT *rects) { const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; @@ -5119,7 +5125,7 @@ static void d3d12_command_list_clear(struct d3d12_command_list *list, fb_desc.flags = 0; fb_desc.renderPass = vk_render_pass; fb_desc.attachmentCount = 1; - fb_desc.pAttachments = &view->u.vk_image_view; + fb_desc.pAttachments = &view->view.u.vk_image_view; fb_desc.width = width; fb_desc.height = height; fb_desc.layers = layer_count; @@ -5322,7 +5328,7 @@ static void vkd3d_uav_clear_state_get_image_pipeline(const struct vkd3d_uav_clea } static void d3d12_command_list_clear_uav(struct d3d12_command_list *list, - struct d3d12_resource *resource, struct vkd3d_view *view, const VkClearColorValue *clear_colour, + struct d3d12_resource *resource, struct vkd3d_view_desc *view_desc, const VkClearColorValue *clear_colour, unsigned int rect_count, const D3D12_RECT *rects) { const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; @@ -5332,6 +5338,7 @@ static void d3d12_command_list_clear_uav(struct d3d12_command_list *list, VkDescriptorImageInfo image_info; D3D12_RECT full_rect, curr_rect; VkWriteDescriptorSet write_set; + const struct vkd3d_view *view; d3d12_command_list_track_resource_usage(list, resource); d3d12_command_list_end_current_render_pass(list); @@ -5340,8 +5347,9 @@ static void d3d12_command_list_clear_uav(struct d3d12_command_list *list, d3d12_command_list_invalidate_bindings(list, list->state); d3d12_command_list_invalidate_root_parameters(list, VKD3D_PIPELINE_BIND_POINT_COMPUTE); - if (!d3d12_command_allocator_add_view(list->allocator, view)) + if (!d3d12_command_allocator_add_view(list->allocator, view_desc)) WARN("Failed to add view.\n"); + view = &view_desc->view; clear_args.colour = *clear_colour; @@ -5454,18 +5462,21 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID const UINT values[4], UINT rect_count, const D3D12_RECT *rects) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface); + struct vkd3d_view_desc *descriptor, *uint_view = NULL; struct d3d12_device *device = list->device; - struct vkd3d_view *view, *uint_view = NULL; struct vkd3d_texture_view_desc view_desc; const struct vkd3d_format *uint_format; struct d3d12_resource *resource_impl; + const struct vkd3d_view *view; VkClearColorValue colour; TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p.\n", iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects); resource_impl = unsafe_impl_from_ID3D12Resource(resource); - view = d3d12_desc_from_cpu_handle(cpu_handle)->u.view_info.view; + if (!(descriptor = d3d12_desc_from_cpu_handle(cpu_handle)->u.view_desc)) + return; + view = &descriptor->view; memcpy(colour.uint32, values, sizeof(colour.uint32)); if (view->format->type != VKD3D_FORMAT_TYPE_UINT) @@ -5479,8 +5490,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID if (d3d12_resource_is_buffer(resource_impl)) { - if (!vkd3d_create_buffer_view(device, resource_impl->u.vk_buffer, uint_format, - view->info.buffer.offset, view->info.buffer.size, &uint_view)) + if (!vkd3d_create_buffer_view_desc(device, VKD3D_DESCRIPTOR_MAGIC_UAV, resource_impl->u.vk_buffer, + uint_format, view->info.buffer.offset, view->info.buffer.size, &uint_view)) { ERR("Failed to create buffer view.\n"); return; @@ -5496,19 +5507,19 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID view_desc.layer_idx = view->info.texture.layer_idx; view_desc.layer_count = view->info.texture.layer_count; - if (!vkd3d_create_texture_view(device, resource_impl->u.vk_image, &view_desc, &uint_view)) + if (!vkd3d_create_texture_view_desc(device, VKD3D_DESCRIPTOR_MAGIC_UAV, resource_impl->u.vk_image, &view_desc, &uint_view)) { ERR("Failed to create image view.\n"); return; } } - view = uint_view; + descriptor = uint_view; } - d3d12_command_list_clear_uav(list, resource_impl, view, &colour, rect_count, rects); + d3d12_command_list_clear_uav(list, resource_impl, descriptor, &colour, rect_count, rects); if (uint_view) - vkd3d_view_decref(uint_view, device); + vkd3d_view_desc_decref(uint_view, device); } static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(ID3D12GraphicsCommandList2 *iface, @@ -5517,14 +5528,15 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(I { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface); struct d3d12_resource *resource_impl; + struct vkd3d_view_desc *view; VkClearColorValue colour; - struct vkd3d_view *view; TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p.\n", iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects); resource_impl = unsafe_impl_from_ID3D12Resource(resource); - view = d3d12_desc_from_cpu_handle(cpu_handle)->u.view_info.view; + if (!(view = d3d12_desc_from_cpu_handle(cpu_handle)->u.view_desc)) + return; memcpy(colour.float32, values, sizeof(colour.float32)); d3d12_command_list_clear_uav(list, resource_impl, view, &colour, rect_count, rects); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index eaedc444..7b56e033 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2575,6 +2575,25 @@ static void vkd3d_init_descriptor_pool_sizes(VkDescriptorPoolSize *pool_sizes, VKD3D_MAX_VIRTUAL_HEAP_DESCRIPTORS_PER_TYPE); }; +static void vkd3d_desc_object_cache_init(struct vkd3d_desc_object_cache *cache) +{ + vkd3d_mutex_init(&cache->mutex); + cache->cache = NULL; + cache->capacity = 0; + cache->count = 0; + cache->reserve = 0; +} + +static void vkd3d_desc_object_cache_cleanup(struct vkd3d_desc_object_cache *cache) +{ + size_t i; + + vkd3d_mutex_destroy(&cache->mutex); + for (i = 0; i < cache->count; ++i) + vkd3d_free(cache->cache[i]); + vkd3d_free(cache->cache); +} + /* ID3D12Device */ static inline struct d3d12_device *impl_from_ID3D12Device(ID3D12Device *iface) { @@ -2615,7 +2634,6 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) { struct d3d12_device *device = impl_from_ID3D12Device(iface); ULONG refcount = InterlockedDecrement(&device->refcount); - size_t i; TRACE("%p decreasing refcount to %u.\n", device, refcount); @@ -2634,8 +2652,8 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) vkd3d_render_pass_cache_cleanup(&device->render_pass_cache, device); d3d12_device_destroy_pipeline_cache(device); d3d12_device_destroy_vkd3d_queues(device); - for (i = 0; i < ARRAY_SIZE(device->desc_mutex); ++i) - vkd3d_mutex_destroy(&device->desc_mutex[i]); + vkd3d_desc_object_cache_cleanup(&device->view_desc_cache); + vkd3d_desc_object_cache_cleanup(&device->cbuffer_desc_cache); VK_CALL(vkDestroyDevice(device->vk_device, NULL)); if (device->parent) IUnknown_Release(device->parent); @@ -3548,32 +3566,20 @@ static void d3d12_desc_buffered_copy_atomic(struct d3d12_desc *dst, const struct { struct d3d12_desc_copy_location *location; enum vkd3d_vk_descriptor_set_index set; - struct vkd3d_mutex *mutex; + union d3d12_desc_object src_u; - mutex = d3d12_device_get_descriptor_mutex(device, src); - vkd3d_mutex_lock(mutex); - - if (src->magic == VKD3D_DESCRIPTOR_MAGIC_FREE) + if (!(src_u.object = d3d12_desc_get_object_ref(src, device))) { - /* Source must be unlocked first, and therefore can't be used as a null source. */ - static const struct d3d12_desc null = {0}; - vkd3d_mutex_unlock(mutex); - d3d12_desc_write_atomic(dst, &null, device); + d3d12_desc_destroy(dst, device); return; } - set = vkd3d_vk_descriptor_set_index_from_vk_descriptor_type(src->vk_descriptor_type); + set = vkd3d_vk_descriptor_set_index_from_vk_descriptor_type(src_u.header->vk_descriptor_type); location = &locations[set][infos[set].count++]; + location->src = src_u; - location->src = *src; - - if (location->src.magic & VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) - vkd3d_view_incref(location->src.u.view_info.view); - - vkd3d_mutex_unlock(mutex); - - infos[set].uav_counter |= (location->src.magic == VKD3D_DESCRIPTOR_MAGIC_UAV) - && !!location->src.u.view_info.view->vk_counter_view; + infos[set].uav_counter |= (src_u.header->magic == VKD3D_DESCRIPTOR_MAGIC_UAV) + && !!src_u.view_desc->view.vk_counter_view; location->dst = dst; if (infos[set].count == ARRAY_SIZE(locations[0])) @@ -3633,8 +3639,7 @@ static void d3d12_device_vk_heaps_copy_descriptors(struct d3d12_device *device, * mutex is only intended to prevent use-after-free of the vkd3d_view caused by a * race condition in the calling app. It is unnecessary to protect this test as it's * the app's race condition, not ours. */ - if (dst[dst_idx].magic == src[src_idx].magic && (dst[dst_idx].magic & VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) - && dst[dst_idx].u.view_info.written_serial_id == src[src_idx].u.view_info.view->serial_id) + if (dst[dst_idx].u.object == src[src_idx].u.object) continue; d3d12_desc_buffered_copy_atomic(&dst[dst_idx], &src[src_idx], locations, infos, descriptor_heap, device); } @@ -4242,7 +4247,6 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, { const struct vkd3d_vk_device_procs *vk_procs; HRESULT hr; - size_t i; device->ID3D12Device_iface.lpVtbl = &d3d12_device_vtbl; device->refcount = 1; @@ -4285,8 +4289,8 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, device->blocked_queue_count = 0; - for (i = 0; i < ARRAY_SIZE(device->desc_mutex); ++i) - vkd3d_mutex_init(&device->desc_mutex[i]); + vkd3d_desc_object_cache_init(&device->view_desc_cache); + vkd3d_desc_object_cache_init(&device->cbuffer_desc_cache); vkd3d_init_descriptor_pool_sizes(device->vk_pool_sizes, &device->vk_info.descriptor_limits); diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 68c28cd1..71d3c743 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2078,57 +2078,131 @@ ULONG vkd3d_resource_decref(ID3D12Resource *resource) return d3d12_resource_decref(impl_from_ID3D12Resource(resource)); } -/* CBVs, SRVs, UAVs */ -static struct vkd3d_view *vkd3d_view_create(enum vkd3d_view_type type) +/* Objects are cached so that vkd3d_desc_incref() can safely check the refcount + * of an object freed by another thread. */ +static void *vkd3d_desc_object_cache_get(struct vkd3d_desc_object_cache *cache, size_t size) { - struct vkd3d_view *view; + void *object = NULL; - if ((view = vkd3d_malloc(sizeof(*view)))) + vkd3d_mutex_lock(&cache->mutex); + + if (cache->count) + { + object = cache->cache[--cache->count]; + } + else + { + object = vkd3d_malloc(size); + ++cache->reserve; + } + + vkd3d_mutex_unlock(&cache->mutex); + return object; +} + +static void vkd3d_desc_object_cache_put(struct vkd3d_desc_object_cache *cache, void *object) +{ + vkd3d_mutex_lock(&cache->mutex); + + if (!vkd3d_array_reserve((void **)&cache->cache, &cache->capacity, max(cache->count + 1, cache->reserve), + sizeof(*cache->cache))) + { + ERR("Failed to allocate cache.\n"); + vkd3d_free(object); + return; + } + else { - view->refcount = 1; - view->type = type; - view->serial_id = InterlockedIncrement64(&object_global_serial_id); - view->vk_counter_view = VK_NULL_HANDLE; + cache->cache[cache->count++] = object; } - return view; + + vkd3d_mutex_unlock(&cache->mutex); } -void vkd3d_view_incref(struct vkd3d_view *view) +static struct vkd3d_cbuffer_desc *vkd3d_cbuffer_desc_create(struct d3d12_device *device) { - InterlockedIncrement(&view->refcount); + struct vkd3d_cbuffer_desc *desc; + + if (!(desc = vkd3d_desc_object_cache_get(&device->cbuffer_desc_cache, sizeof(*desc)))) + return NULL; + + desc->h.magic = VKD3D_DESCRIPTOR_MAGIC_CBV; + desc->h.vk_descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; + desc->h.refcount = 1; + + return desc; } -static void vkd3d_view_destroy(struct vkd3d_view *view, struct d3d12_device *device) +static struct vkd3d_view_desc *vkd3d_view_desc_create(uint32_t magic, VkDescriptorType vk_descriptor_type, + enum vkd3d_view_type type, struct d3d12_device *device) +{ + struct vkd3d_view_desc *desc; + + if (!(desc = vkd3d_desc_object_cache_get(&device->view_desc_cache, sizeof(*desc)))) + { + ERR("Failed to allocate descriptor object.\n"); + return NULL; + } + + desc->h.magic = magic; + desc->h.vk_descriptor_type = vk_descriptor_type; + desc->h.refcount = 1; + desc->view.type = type; + desc->view.vk_counter_view = VK_NULL_HANDLE; + + return desc; +} + +static void vkd3d_view_desc_destroy(struct vkd3d_view_desc *view, struct d3d12_device *device) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; TRACE("Destroying view %p.\n", view); - switch (view->type) + switch (view->view.type) { case VKD3D_VIEW_TYPE_BUFFER: - VK_CALL(vkDestroyBufferView(device->vk_device, view->u.vk_buffer_view, NULL)); + VK_CALL(vkDestroyBufferView(device->vk_device, view->view.u.vk_buffer_view, NULL)); break; case VKD3D_VIEW_TYPE_IMAGE: - VK_CALL(vkDestroyImageView(device->vk_device, view->u.vk_image_view, NULL)); + VK_CALL(vkDestroyImageView(device->vk_device, view->view.u.vk_image_view, NULL)); break; case VKD3D_VIEW_TYPE_SAMPLER: - VK_CALL(vkDestroySampler(device->vk_device, view->u.vk_sampler, NULL)); + VK_CALL(vkDestroySampler(device->vk_device, view->view.u.vk_sampler, NULL)); break; default: - WARN("Unhandled view type %d.\n", view->type); + WARN("Unhandled view type %d.\n", view->view.type); } - if (view->vk_counter_view) - VK_CALL(vkDestroyBufferView(device->vk_device, view->vk_counter_view, NULL)); + if (view->view.vk_counter_view) + VK_CALL(vkDestroyBufferView(device->vk_device, view->view.vk_counter_view, NULL)); - vkd3d_free(view); + vkd3d_desc_object_cache_put(&device->view_desc_cache, view); } -void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device) +void vkd3d_view_desc_decref(struct vkd3d_view_desc *view, struct d3d12_device *device) { - if (!InterlockedDecrement(&view->refcount)) - vkd3d_view_destroy(view, device); + if (!InterlockedDecrement(&view->h.refcount)) + vkd3d_view_desc_destroy(view, device); +} + +void vkd3d_desc_decref(void *desc, struct d3d12_device *device) +{ + union d3d12_desc_object u = {desc}; + + if (InterlockedDecrement(&u.header->refcount)) + return; + + if (u.header->magic & VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) + vkd3d_view_desc_destroy(u.view_desc, device); + else + vkd3d_desc_object_cache_put(&device->cbuffer_desc_cache, u.object); +} + +void d3d12_desc_replace(struct d3d12_desc *dst, void *desc, struct d3d12_device *device) +{ + if ((desc = InterlockedExchangePointer(&dst->u.object, desc))) + vkd3d_desc_decref(desc, device); } /* TODO: write null descriptors to all applicable sets (invalid behaviour workaround). */ @@ -2137,14 +2211,14 @@ static void d3d12_descriptor_heap_write_vk_descriptor_range(struct d3d12_descrip { unsigned int i, info_index = 0, write_index = 0; - switch (locations[0].src.vk_descriptor_type) + switch (locations[0].src.header->vk_descriptor_type) { case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: for (; write_index < write_count; ++write_index) { descriptor_set->vk_descriptor_writes[write_index].pBufferInfo = &descriptor_set->vk_buffer_infos[info_index]; for (i = 0; i < descriptor_set->vk_descriptor_writes[write_index].descriptorCount; ++i, ++info_index) - descriptor_set->vk_buffer_infos[info_index] = locations[info_index].src.u.vk_cbv_info; + descriptor_set->vk_buffer_infos[info_index] = locations[info_index].src.cb_desc->vk_cbv_info; } break; case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: @@ -2153,7 +2227,7 @@ static void d3d12_descriptor_heap_write_vk_descriptor_range(struct d3d12_descrip { descriptor_set->vk_descriptor_writes[write_index].pImageInfo = &descriptor_set->vk_image_infos[info_index]; for (i = 0; i < descriptor_set->vk_descriptor_writes[write_index].descriptorCount; ++i, ++info_index) - descriptor_set->vk_image_infos[info_index].imageView = locations[info_index].src.u.view_info.view->u.vk_image_view; + descriptor_set->vk_image_infos[info_index].imageView = locations[info_index].src.view_desc->view.u.vk_image_view; } break; case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: @@ -2162,7 +2236,7 @@ static void d3d12_descriptor_heap_write_vk_descriptor_range(struct d3d12_descrip { descriptor_set->vk_descriptor_writes[write_index].pTexelBufferView = &descriptor_set->vk_buffer_views[info_index]; for (i = 0; i < descriptor_set->vk_descriptor_writes[write_index].descriptorCount; ++i, ++info_index) - descriptor_set->vk_buffer_views[info_index] = locations[info_index].src.u.view_info.view->u.vk_buffer_view; + descriptor_set->vk_buffer_views[info_index] = locations[info_index].src.view_desc->view.u.vk_buffer_view; } break; case VK_DESCRIPTOR_TYPE_SAMPLER: @@ -2170,11 +2244,11 @@ static void d3d12_descriptor_heap_write_vk_descriptor_range(struct d3d12_descrip { descriptor_set->vk_descriptor_writes[write_index].pImageInfo = &descriptor_set->vk_image_infos[info_index]; for (i = 0; i < descriptor_set->vk_descriptor_writes[write_index].descriptorCount; ++i, ++info_index) - descriptor_set->vk_image_infos[info_index].sampler = locations[info_index].src.u.view_info.view->u.vk_sampler; + descriptor_set->vk_image_infos[info_index].sampler = locations[info_index].src.view_desc->view.u.vk_sampler; } break; default: - ERR("Unhandled descriptor type %#x.\n", locations[0].src.vk_descriptor_type); + ERR("Unhandled descriptor type %#x.\n", locations[0].src.header->vk_descriptor_type); break; } } @@ -2220,46 +2294,44 @@ static void d3d12_desc_write_vk_heap_null_descriptor(struct d3d12_descriptor_hea } } -/* dst and src contain the same data unless another thread overwrites dst. The array index is - * calculated from dst, and src is thread safe. */ -static void d3d12_desc_write_vk_heap(const struct d3d12_desc *dst, const struct d3d12_desc *src, - struct d3d12_device *device) +void d3d12_desc_write_vk_heap(const struct d3d12_desc *src, void *object, struct d3d12_device *device) { struct d3d12_descriptor_heap_vk_set *descriptor_set; struct d3d12_descriptor_heap *descriptor_heap; const struct vkd3d_vk_device_procs *vk_procs; + union d3d12_desc_object u = {object}; bool is_null = false; - descriptor_heap = vkd3d_gpu_descriptor_allocator_heap_from_descriptor(&device->gpu_descriptor_allocator, dst); + descriptor_heap = vkd3d_gpu_descriptor_allocator_heap_from_descriptor(&device->gpu_descriptor_allocator, src); descriptor_set = &descriptor_heap->vk_descriptor_sets[vkd3d_vk_descriptor_set_index_from_vk_descriptor_type( - src->vk_descriptor_type)]; + u.header->vk_descriptor_type)]; vk_procs = &device->vk_procs; vkd3d_mutex_lock(&descriptor_heap->vk_sets_mutex); - descriptor_set->vk_descriptor_writes[0].dstArrayElement = dst + descriptor_set->vk_descriptor_writes[0].dstArrayElement = src - (const struct d3d12_desc *)descriptor_heap->descriptors; descriptor_set->vk_descriptor_writes[0].descriptorCount = 1; - switch (src->vk_descriptor_type) + switch (u.header->vk_descriptor_type) { case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: - descriptor_set->vk_descriptor_writes[0].pBufferInfo = &src->u.vk_cbv_info; - is_null = !src->u.vk_cbv_info.buffer; + descriptor_set->vk_descriptor_writes[0].pBufferInfo = &u.cb_desc->vk_cbv_info; + is_null = !u.cb_desc->vk_cbv_info.buffer; break; case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: - is_null = !(descriptor_set->vk_image_infos[0].imageView = src->u.view_info.view->u.vk_image_view); + is_null = !(descriptor_set->vk_image_infos[0].imageView = u.view_desc->view.u.vk_image_view); break; case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: - descriptor_set->vk_descriptor_writes[0].pTexelBufferView = &src->u.view_info.view->u.vk_buffer_view; - is_null = !src->u.view_info.view->u.vk_buffer_view; + descriptor_set->vk_descriptor_writes[0].pTexelBufferView = &u.view_desc->view.u.vk_buffer_view; + is_null = !u.view_desc->view.u.vk_buffer_view; break; case VK_DESCRIPTOR_TYPE_SAMPLER: - descriptor_set->vk_image_infos[0].sampler = src->u.view_info.view->u.vk_sampler; + descriptor_set->vk_image_infos[0].sampler = u.view_desc->view.u.vk_sampler; break; default: - ERR("Unhandled descriptor type %#x.\n", src->vk_descriptor_type); + ERR("Unhandled descriptor type %#x.\n", u.header->vk_descriptor_type); break; } if (is_null && device->vk_info.EXT_robustness2) @@ -2272,75 +2344,19 @@ static void d3d12_desc_write_vk_heap(const struct d3d12_desc *dst, const struct VK_CALL(vkUpdateDescriptorSets(device->vk_device, 1, descriptor_set->vk_descriptor_writes, 0, NULL)); - if (src->magic == VKD3D_DESCRIPTOR_MAGIC_UAV && src->u.view_info.view->vk_counter_view) + if (u.header->magic == VKD3D_DESCRIPTOR_MAGIC_UAV && u.view_desc->view.vk_counter_view) { descriptor_set = &descriptor_heap->vk_descriptor_sets[VKD3D_SET_INDEX_UAV_COUNTER]; - descriptor_set->vk_descriptor_writes[0].dstArrayElement = dst + descriptor_set->vk_descriptor_writes[0].dstArrayElement = src - (const struct d3d12_desc *)descriptor_heap->descriptors; descriptor_set->vk_descriptor_writes[0].descriptorCount = 1; - descriptor_set->vk_descriptor_writes[0].pTexelBufferView = &src->u.view_info.view->vk_counter_view; + descriptor_set->vk_descriptor_writes[0].pTexelBufferView = &u.view_desc->view.vk_counter_view; VK_CALL(vkUpdateDescriptorSets(device->vk_device, 1, descriptor_set->vk_descriptor_writes, 0, NULL)); } vkd3d_mutex_unlock(&descriptor_heap->vk_sets_mutex); } -static void d3d12_desc_write_atomic_d3d12_only(struct d3d12_desc *dst, const struct d3d12_desc *src, struct d3d12_device *device) -{ - struct vkd3d_view *defunct_view; - struct vkd3d_mutex *mutex; - - mutex = d3d12_device_get_descriptor_mutex(device, dst); - vkd3d_mutex_lock(mutex); - - if (!(dst->magic & VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) || InterlockedDecrement(&dst->u.view_info.view->refcount)) - { - *dst = *src; - vkd3d_mutex_unlock(mutex); - return; - } - - defunct_view = dst->u.view_info.view; - *dst = *src; - vkd3d_mutex_unlock(mutex); - - /* Destroy the view after unlocking to reduce wait time. */ - vkd3d_view_destroy(defunct_view, device); -} - -void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *src, - struct d3d12_device *device) -{ - struct vkd3d_view *defunct_view = NULL; - struct vkd3d_mutex *mutex; - - mutex = d3d12_device_get_descriptor_mutex(device, dst); - vkd3d_mutex_lock(mutex); - - /* Nothing to do for VKD3D_DESCRIPTOR_MAGIC_CBV. */ - if ((dst->magic & VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) - && !InterlockedDecrement(&dst->u.view_info.view->refcount)) - defunct_view = dst->u.view_info.view; - - *dst = *src; - - vkd3d_mutex_unlock(mutex); - - /* Destroy the view after unlocking to reduce wait time. */ - if (defunct_view) - vkd3d_view_destroy(defunct_view, device); - - if (device->use_vk_heaps && dst->magic) - d3d12_desc_write_vk_heap(dst, src, device); -} - -static void d3d12_desc_destroy(struct d3d12_desc *descriptor, struct d3d12_device *device) -{ - static const struct d3d12_desc null_desc = {0}; - - d3d12_desc_write_atomic(descriptor, &null_desc, device); -} - void d3d12_desc_copy_vk_heap_range(struct d3d12_desc_copy_location *locations, const struct d3d12_desc_copy_info *info, struct d3d12_descriptor_heap *descriptor_heap, enum vkd3d_vk_descriptor_set_index set, struct d3d12_device *device) @@ -2353,7 +2369,7 @@ void d3d12_desc_copy_vk_heap_range(struct d3d12_desc_copy_location *locations, c for (i = 0, write_count = 0; i < info->count; ++i) { - d3d12_desc_write_atomic_d3d12_only(locations[i].dst, &locations[i].src, device); + d3d12_desc_replace(locations[i].dst, locations[i].src.object, device); if (i && locations[i].dst == locations[i - 1].dst + 1) { @@ -2377,9 +2393,11 @@ void d3d12_desc_copy_vk_heap_range(struct d3d12_desc_copy_location *locations, c for (i = 0, write_count = 0; i < info->count; ++i) { - if (!locations[i].src.u.view_info.view->vk_counter_view) + VkBufferView vk_counter_view; + + if (!(vk_counter_view = locations[i].src.view_desc->view.vk_counter_view)) continue; - descriptor_set->vk_buffer_views[write_count] = locations[i].src.u.view_info.view->vk_counter_view; + descriptor_set->vk_buffer_views[write_count] = vk_counter_view; descriptor_set->vk_descriptor_writes[write_count].pTexelBufferView = &descriptor_set->vk_buffer_views[write_count]; descriptor_set->vk_descriptor_writes[write_count].dstArrayElement = locations[i].dst - (const struct d3d12_desc *)descriptor_heap->descriptors; @@ -2395,22 +2413,14 @@ void d3d12_desc_copy(struct d3d12_desc *dst, const struct d3d12_desc *src, struct d3d12_device *device) { struct d3d12_desc tmp; - struct vkd3d_mutex *mutex; assert(dst != src); - /* Shadow of the Tomb Raider and possibly other titles sometimes destroy - * and rewrite a descriptor in another thread while it is being copied. */ - mutex = d3d12_device_get_descriptor_mutex(device, src); - vkd3d_mutex_lock(mutex); - - if (src->magic & VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) - vkd3d_view_incref(src->u.view_info.view); - - tmp = *src; - - vkd3d_mutex_unlock(mutex); - + /* Shadow of the Tomb Raider and possibly other titles sometimes copy a + * descriptor to the same location concurrently in multiple threads. It + * doesn't seem to copy from a location while destroying it in another + * thread, but we handle this too. */ + tmp.u.object = d3d12_desc_get_object_ref(src, device); d3d12_desc_write_atomic(dst, &tmp, device); } @@ -2472,36 +2482,39 @@ static bool vkd3d_create_vk_buffer_view(struct d3d12_device *device, return vr == VK_SUCCESS; } -bool vkd3d_create_buffer_view(struct d3d12_device *device, VkBuffer vk_buffer, const struct vkd3d_format *format, - VkDeviceSize offset, VkDeviceSize size, struct vkd3d_view **view) +bool vkd3d_create_buffer_view_desc(struct d3d12_device *device, uint32_t magic, VkBuffer vk_buffer, + const struct vkd3d_format *format, VkDeviceSize offset, VkDeviceSize size, + struct vkd3d_view_desc **view_desc) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkBufferView vk_view = VK_NULL_HANDLE; - struct vkd3d_view *object; + struct vkd3d_view_desc *object; if (vk_buffer && !vkd3d_create_vk_buffer_view(device, vk_buffer, format, offset, size, &vk_view)) return false; - if (!(object = vkd3d_view_create(VKD3D_VIEW_TYPE_BUFFER))) + if (!(object = vkd3d_view_desc_create(magic, magic == VKD3D_DESCRIPTOR_MAGIC_UAV + ? VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER : VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, + VKD3D_VIEW_TYPE_BUFFER, device))) { VK_CALL(vkDestroyBufferView(device->vk_device, vk_view, NULL)); return false; } - object->u.vk_buffer_view = vk_view; - object->format = format; - object->info.buffer.offset = offset; - object->info.buffer.size = size; - *view = object; + object->view.u.vk_buffer_view = vk_view; + object->view.format = format; + object->view.info.buffer.offset = offset; + object->view.info.buffer.size = size; + *view_desc = object; return true; } #define VKD3D_VIEW_RAW_BUFFER 0x1 static bool vkd3d_create_buffer_view_for_resource(struct d3d12_device *device, - struct d3d12_resource *resource, DXGI_FORMAT view_format, + uint32_t magic, struct d3d12_resource *resource, DXGI_FORMAT view_format, unsigned int offset, unsigned int size, unsigned int structure_stride, - unsigned int flags, struct vkd3d_view **view) + unsigned int flags, struct vkd3d_view_desc **view_desc) { const struct vkd3d_format *format; VkDeviceSize element_size; @@ -2530,8 +2543,8 @@ static bool vkd3d_create_buffer_view_for_resource(struct d3d12_device *device, assert(d3d12_resource_is_buffer(resource)); - return vkd3d_create_buffer_view(device, resource->u.vk_buffer, - format, offset * element_size, size * element_size, view); + return vkd3d_create_buffer_view_desc(device, magic, resource->u.vk_buffer, + format, offset * element_size, size * element_size, view_desc); } static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components, @@ -2758,14 +2771,14 @@ static void vkd3d_texture_view_desc_normalise(struct vkd3d_texture_view_desc *de desc->layer_count = max_layer_count; } -bool vkd3d_create_texture_view(struct d3d12_device *device, VkImage vk_image, - const struct vkd3d_texture_view_desc *desc, struct vkd3d_view **view) +bool vkd3d_create_texture_view_desc(struct d3d12_device *device, uint32_t magic, VkImage vk_image, + const struct vkd3d_texture_view_desc *desc, struct vkd3d_view_desc **view) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; const struct vkd3d_format *format = desc->format; struct VkImageViewCreateInfo view_desc; VkImageView vk_view = VK_NULL_HANDLE; - struct vkd3d_view *object; + struct vkd3d_view_desc *object; VkResult vr; if (vk_image) @@ -2791,18 +2804,19 @@ bool vkd3d_create_texture_view(struct d3d12_device *device, VkImage vk_image, } } - if (!(object = vkd3d_view_create(VKD3D_VIEW_TYPE_IMAGE))) + if (!(object = vkd3d_view_desc_create(magic, magic == VKD3D_DESCRIPTOR_MAGIC_UAV ? VK_DESCRIPTOR_TYPE_STORAGE_IMAGE + : VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, VKD3D_VIEW_TYPE_IMAGE, device))) { VK_CALL(vkDestroyImageView(device->vk_device, vk_view, NULL)); return false; } - object->u.vk_image_view = vk_view; - object->format = format; - object->info.texture.vk_view_type = desc->view_type; - object->info.texture.miplevel_idx = desc->miplevel_idx; - object->info.texture.layer_idx = desc->layer_idx; - object->info.texture.layer_count = desc->layer_count; + object->view.u.vk_image_view = vk_view; + object->view.format = format; + object->view.info.texture.vk_view_type = desc->view_type; + object->view.info.texture.miplevel_idx = desc->miplevel_idx; + object->view.info.texture.layer_idx = desc->layer_idx; + object->view.info.texture.layer_count = desc->layer_count; *view = object; return true; } @@ -2811,6 +2825,7 @@ void d3d12_desc_create_cbv(struct d3d12_desc *descriptor, struct d3d12_device *device, const D3D12_CONSTANT_BUFFER_VIEW_DESC *desc) { struct VkDescriptorBufferInfo *buffer_info; + struct vkd3d_cbuffer_desc *cb_desc; struct d3d12_resource *resource; if (!desc) @@ -2819,13 +2834,19 @@ void d3d12_desc_create_cbv(struct d3d12_desc *descriptor, return; } + if (!(cb_desc = vkd3d_cbuffer_desc_create(device))) + { + ERR("Failed to allocate descriptor object.\n"); + return; + } + if (desc->SizeInBytes & (D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT - 1)) { WARN("Size is not %u bytes aligned.\n", D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT); return; } - buffer_info = &descriptor->u.vk_cbv_info; + buffer_info = &cb_desc->vk_cbv_info; if (desc->BufferLocation) { resource = vkd3d_gpu_va_allocator_dereference(&device->gpu_va_allocator, desc->BufferLocation); @@ -2841,8 +2862,7 @@ void d3d12_desc_create_cbv(struct d3d12_desc *descriptor, buffer_info->range = VK_WHOLE_SIZE; } - descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_CBV; - descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; + descriptor->u.cb_desc = cb_desc; } static unsigned int vkd3d_view_flags_from_d3d12_buffer_srv_flags(D3D12_BUFFER_SRV_FLAGS flags) @@ -2859,7 +2879,6 @@ static void vkd3d_create_null_srv(struct d3d12_desc *descriptor, { struct vkd3d_null_resources *null_resources = &device->null_resources; struct vkd3d_texture_view_desc vkd3d_desc; - struct vkd3d_view *view; VkImage vk_image; if (!desc) @@ -2874,15 +2893,9 @@ static void vkd3d_create_null_srv(struct d3d12_desc *descriptor, if (!device->vk_info.EXT_robustness2) WARN("Creating NULL buffer SRV %#x.\n", desc->Format); - if (vkd3d_create_buffer_view(device, null_resources->vk_buffer, + vkd3d_create_buffer_view_desc(device, VKD3D_DESCRIPTOR_MAGIC_SRV, null_resources->vk_buffer, vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false), - 0, VKD3D_NULL_BUFFER_SIZE, &view)) - { - descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; - descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; - descriptor->u.view_info.view = view; - descriptor->u.view_info.written_serial_id = view->serial_id; - } + 0, VKD3D_NULL_BUFFER_SIZE, &descriptor->u.view_desc); return; case D3D12_SRV_DIMENSION_TEXTURE2D: @@ -2920,20 +2933,13 @@ static void vkd3d_create_null_srv(struct d3d12_desc *descriptor, vkd3d_desc.components.a = VK_COMPONENT_SWIZZLE_ZERO; vkd3d_desc.allowed_swizzle = true; - if (!vkd3d_create_texture_view(device, vk_image, &vkd3d_desc, &view)) - return; - - descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; - descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; - descriptor->u.view_info.view = view; - descriptor->u.view_info.written_serial_id = view->serial_id; + vkd3d_create_texture_view_desc(device, VKD3D_DESCRIPTOR_MAGIC_SRV, vk_image, &vkd3d_desc, &descriptor->u.view_desc); } static void vkd3d_create_buffer_srv(struct d3d12_desc *descriptor, struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_SHADER_RESOURCE_VIEW_DESC *desc) { - struct vkd3d_view *view; unsigned int flags; if (!desc) @@ -2949,15 +2955,9 @@ static void vkd3d_create_buffer_srv(struct d3d12_desc *descriptor, } flags = vkd3d_view_flags_from_d3d12_buffer_srv_flags(desc->u.Buffer.Flags); - if (!vkd3d_create_buffer_view_for_resource(device, resource, desc->Format, + vkd3d_create_buffer_view_for_resource(device, VKD3D_DESCRIPTOR_MAGIC_SRV, resource, desc->Format, desc->u.Buffer.FirstElement, desc->u.Buffer.NumElements, - desc->u.Buffer.StructureByteStride, flags, &view)) - return; - - descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; - descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; - descriptor->u.view_info.view = view; - descriptor->u.view_info.written_serial_id = view->serial_id; + desc->u.Buffer.StructureByteStride, flags, &descriptor->u.view_desc); } static VkImageAspectFlags vk_image_aspect_flags_from_d3d12_plane_slice(const struct vkd3d_format *format, @@ -2986,7 +2986,6 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, const D3D12_SHADER_RESOURCE_VIEW_DESC *desc) { struct vkd3d_texture_view_desc vkd3d_desc; - struct vkd3d_view *view; if (!resource) { @@ -3082,13 +3081,8 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, } } - if (!vkd3d_create_texture_view(device, resource->u.vk_image, &vkd3d_desc, &view)) - return; - - descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; - descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; - descriptor->u.view_info.view = view; - descriptor->u.view_info.written_serial_id = view->serial_id; + vkd3d_create_texture_view_desc(device, VKD3D_DESCRIPTOR_MAGIC_SRV, resource->u.vk_image, &vkd3d_desc, + &descriptor->u.view_desc); } static unsigned int vkd3d_view_flags_from_d3d12_buffer_uav_flags(D3D12_BUFFER_UAV_FLAGS flags) @@ -3105,7 +3099,6 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, { struct vkd3d_null_resources *null_resources = &device->null_resources; struct vkd3d_texture_view_desc vkd3d_desc; - struct vkd3d_view *view; VkImage vk_image; if (!desc) @@ -3120,15 +3113,9 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, if (!device->vk_info.EXT_robustness2) WARN("Creating NULL buffer UAV %#x.\n", desc->Format); - if (vkd3d_create_buffer_view(device, null_resources->vk_storage_buffer, + vkd3d_create_buffer_view_desc(device, VKD3D_DESCRIPTOR_MAGIC_UAV, null_resources->vk_storage_buffer, vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false), - 0, VKD3D_NULL_BUFFER_SIZE, &view)) - { - descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; - descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; - descriptor->u.view_info.view = view; - descriptor->u.view_info.written_serial_id = view->serial_id; - } + 0, VKD3D_NULL_BUFFER_SIZE, &descriptor->u.view_desc); return; case D3D12_UAV_DIMENSION_TEXTURE2D: @@ -3166,20 +3153,14 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, vkd3d_desc.components.a = VK_COMPONENT_SWIZZLE_A; vkd3d_desc.allowed_swizzle = false; - if (!vkd3d_create_texture_view(device, vk_image, &vkd3d_desc, &view)) - return; - - descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; - descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; - descriptor->u.view_info.view = view; - descriptor->u.view_info.written_serial_id = view->serial_id; + vkd3d_create_texture_view_desc(device, VKD3D_DESCRIPTOR_MAGIC_UAV, vk_image, &vkd3d_desc, &descriptor->u.view_desc); } static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_device *device, struct d3d12_resource *resource, struct d3d12_resource *counter_resource, const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc) { - struct vkd3d_view *view; + struct vkd3d_view_desc *view_desc; unsigned int flags; if (!desc) @@ -3195,16 +3176,11 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ } flags = vkd3d_view_flags_from_d3d12_buffer_uav_flags(desc->u.Buffer.Flags); - if (!vkd3d_create_buffer_view_for_resource(device, resource, desc->Format, + if (!vkd3d_create_buffer_view_for_resource(device, VKD3D_DESCRIPTOR_MAGIC_UAV, resource, desc->Format, desc->u.Buffer.FirstElement, desc->u.Buffer.NumElements, - desc->u.Buffer.StructureByteStride, flags, &view)) + desc->u.Buffer.StructureByteStride, flags, &view_desc)) return; - descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; - descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; - descriptor->u.view_info.view = view; - descriptor->u.view_info.written_serial_id = view->serial_id; - if (counter_resource) { const struct vkd3d_format *format; @@ -3214,13 +3190,16 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ format = vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); if (!vkd3d_create_vk_buffer_view(device, counter_resource->u.vk_buffer, format, - desc->u.Buffer.CounterOffsetInBytes, sizeof(uint32_t), &view->vk_counter_view)) + desc->u.Buffer.CounterOffsetInBytes, sizeof(uint32_t), &view_desc->view.vk_counter_view)) { WARN("Failed to create counter buffer view.\n"); - view->vk_counter_view = VK_NULL_HANDLE; - d3d12_desc_destroy(descriptor, device); + view_desc->view.vk_counter_view = VK_NULL_HANDLE; + vkd3d_view_desc_decref(view_desc, device); + return; } } + + descriptor->u.view_desc = view_desc; } static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, @@ -3228,7 +3207,6 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc) { struct vkd3d_texture_view_desc vkd3d_desc; - struct vkd3d_view *view; if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0)) return; @@ -3273,13 +3251,8 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, } } - if (!vkd3d_create_texture_view(device, resource->u.vk_image, &vkd3d_desc, &view)) - return; - - descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; - descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; - descriptor->u.view_info.view = view; - descriptor->u.view_info.written_serial_id = view->serial_id; + vkd3d_create_texture_view_desc(device, VKD3D_DESCRIPTOR_MAGIC_UAV, resource->u.vk_image, &vkd3d_desc, + &descriptor->u.view_desc); } void d3d12_desc_create_uav(struct d3d12_desc *descriptor, struct d3d12_device *device, @@ -3414,7 +3387,7 @@ static VkResult d3d12_create_sampler(struct d3d12_device *device, D3D12_FILTER f void d3d12_desc_create_sampler(struct d3d12_desc *sampler, struct d3d12_device *device, const D3D12_SAMPLER_DESC *desc) { - struct vkd3d_view *view; + struct vkd3d_view_desc *view_desc; if (!desc) { @@ -3428,21 +3401,19 @@ void d3d12_desc_create_sampler(struct d3d12_desc *sampler, FIXME("Ignoring border color {%.8e, %.8e, %.8e, %.8e}.\n", desc->BorderColor[0], desc->BorderColor[1], desc->BorderColor[2], desc->BorderColor[3]); - if (!(view = vkd3d_view_create(VKD3D_VIEW_TYPE_SAMPLER))) + if (!(view_desc = vkd3d_view_desc_create(VKD3D_DESCRIPTOR_MAGIC_SAMPLER, VK_DESCRIPTOR_TYPE_SAMPLER, + VKD3D_VIEW_TYPE_SAMPLER, device))) return; if (d3d12_create_sampler(device, desc->Filter, desc->AddressU, desc->AddressV, desc->AddressW, desc->MipLODBias, desc->MaxAnisotropy, - desc->ComparisonFunc, desc->MinLOD, desc->MaxLOD, &view->u.vk_sampler) < 0) + desc->ComparisonFunc, desc->MinLOD, desc->MaxLOD, &view_desc->view.u.vk_sampler) < 0) { - vkd3d_free(view); + vkd3d_free(view_desc); return; } - sampler->magic = VKD3D_DESCRIPTOR_MAGIC_SAMPLER; - sampler->vk_descriptor_type = VK_DESCRIPTOR_TYPE_SAMPLER; - sampler->u.view_info.view = view; - sampler->u.view_info.written_serial_id = view->serial_id; + sampler->u.view_desc = view_desc; } HRESULT vkd3d_create_static_sampler(struct d3d12_device *device, @@ -3467,7 +3438,7 @@ static void d3d12_rtv_desc_destroy(struct d3d12_rtv_desc *rtv, struct d3d12_devi if (rtv->magic != VKD3D_DESCRIPTOR_MAGIC_RTV) return; - vkd3d_view_decref(rtv->view, device); + vkd3d_view_desc_decref(rtv->view, device); memset(rtv, 0, sizeof(*rtv)); } @@ -3475,7 +3446,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev struct d3d12_resource *resource, const D3D12_RENDER_TARGET_VIEW_DESC *desc) { struct vkd3d_texture_view_desc vkd3d_desc; - struct vkd3d_view *view; + struct vkd3d_view_desc *view; d3d12_rtv_desc_destroy(rtv_desc, device); @@ -3543,7 +3514,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev assert(d3d12_resource_is_texture(resource)); - if (!vkd3d_create_texture_view(device, resource->u.vk_image, &vkd3d_desc, &view)) + if (!vkd3d_create_texture_view_desc(device, VKD3D_DESCRIPTOR_MAGIC_RTV, resource->u.vk_image, &vkd3d_desc, &view)) return; rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV; @@ -3562,7 +3533,7 @@ static void d3d12_dsv_desc_destroy(struct d3d12_dsv_desc *dsv, struct d3d12_devi if (dsv->magic != VKD3D_DESCRIPTOR_MAGIC_DSV) return; - vkd3d_view_decref(dsv->view, device); + vkd3d_view_desc_decref(dsv->view, device); memset(dsv, 0, sizeof(*dsv)); } @@ -3570,7 +3541,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev struct d3d12_resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc) { struct vkd3d_texture_view_desc vkd3d_desc; - struct vkd3d_view *view; + struct vkd3d_view_desc *view; d3d12_dsv_desc_destroy(dsv_desc, device); @@ -3628,7 +3599,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev assert(d3d12_resource_is_texture(resource)); - if (!vkd3d_create_texture_view(device, resource->u.vk_image, &vkd3d_desc, &view)) + if (!vkd3d_create_texture_view_desc(device, VKD3D_DESCRIPTOR_MAGIC_DSV, resource->u.vk_image, &vkd3d_desc, &view)) return; dsv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_DSV; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index f00181a2..4167c81a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -660,9 +660,7 @@ enum vkd3d_view_type struct vkd3d_view { - LONG refcount; enum vkd3d_view_type type; - uint64_t serial_id; union { VkBufferView vk_buffer_view; @@ -688,9 +686,6 @@ struct vkd3d_view } info; }; -void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device); -void vkd3d_view_incref(struct vkd3d_view *view); - struct vkd3d_texture_view_desc { VkImageViewType view_type; @@ -704,28 +699,88 @@ struct vkd3d_texture_view_desc bool allowed_swizzle; }; -bool vkd3d_create_buffer_view(struct d3d12_device *device, VkBuffer vk_buffer, const struct vkd3d_format *format, - VkDeviceSize offset, VkDeviceSize size, struct vkd3d_view **view); -bool vkd3d_create_texture_view(struct d3d12_device *device, VkImage vk_image, - const struct vkd3d_texture_view_desc *desc, struct vkd3d_view **view); +struct vkd3d_desc_header +{ + uint32_t magic; + LONG refcount; + VkDescriptorType vk_descriptor_type; +}; + +struct vkd3d_view_desc +{ + struct vkd3d_desc_header h; + struct vkd3d_view view; +}; -struct vkd3d_view_info +struct vkd3d_cbuffer_desc { - uint64_t written_serial_id; - struct vkd3d_view *view; + struct vkd3d_desc_header h; + VkDescriptorBufferInfo vk_cbv_info; }; struct d3d12_desc { - uint32_t magic; - VkDescriptorType vk_descriptor_type; - union + union d3d12_desc_object { - VkDescriptorBufferInfo vk_cbv_info; - struct vkd3d_view_info view_info; + struct vkd3d_desc_header *header; + struct vkd3d_view_desc *view_desc; + struct vkd3d_cbuffer_desc *cb_desc; + void *object; } u; }; +bool vkd3d_create_buffer_view_desc(struct d3d12_device *device, uint32_t magic, VkBuffer vk_buffer, + const struct vkd3d_format *format, VkDeviceSize offset, VkDeviceSize size, + struct vkd3d_view_desc **view_desc); +bool vkd3d_create_texture_view_desc(struct d3d12_device *device, uint32_t magic, VkImage vk_image, + const struct vkd3d_texture_view_desc *desc, struct vkd3d_view_desc **view); + +void vkd3d_view_desc_decref(struct vkd3d_view_desc *view_desc, struct d3d12_device *device); +void vkd3d_desc_decref(void *desc, struct d3d12_device *device); +void d3d12_desc_replace(struct d3d12_desc *dst, void *desc, struct d3d12_device *device); + +static inline bool vkd3d_desc_incref(void *desc) +{ + struct vkd3d_desc_header *h = desc; + LONG refcount; + + do + { + refcount = h->refcount; + /* Avoid incrementing a freed object. Reading the value is safe because objects are recycled. */ + if (refcount <= 0) + return false; + } + while (InterlockedCompareExchange(&h->refcount, refcount + 1, refcount) != refcount); + + return true; +} + +static inline void *d3d12_desc_get_object_ref(const volatile struct d3d12_desc *src, struct d3d12_device *device) +{ + void *desc; + + for (;;) + { + do + { + desc = src->u.object; + } while (desc && !vkd3d_desc_incref(desc)); + + /* Check if the object is still in src to handle the case where it was + * already freed and reused elsewhere when the refcount was incremented. */ + if (desc == src->u.object) + return desc; + + vkd3d_desc_decref(desc, device); + } +} + +static inline void d3d12_desc_destroy(struct d3d12_desc *descriptor, struct d3d12_device *device) +{ + d3d12_desc_replace(descriptor, NULL, device); +} + static inline struct d3d12_desc *d3d12_desc_from_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle) { return (struct d3d12_desc *)cpu_handle.ptr; @@ -746,7 +801,7 @@ void d3d12_desc_create_uav(struct d3d12_desc *descriptor, struct d3d12_device *d struct d3d12_resource *resource, struct d3d12_resource *counter_resource, const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc); void d3d12_desc_create_sampler(struct d3d12_desc *sampler, struct d3d12_device *device, const D3D12_SAMPLER_DESC *desc); -void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *src, struct d3d12_device *device); +void d3d12_desc_write_vk_heap(const struct d3d12_desc *src, void *object, struct d3d12_device *device); bool vkd3d_create_raw_buffer_view(struct d3d12_device *device, D3D12_GPU_VIRTUAL_ADDRESS gpu_address, VkBufferView *vk_buffer_view); @@ -761,7 +816,7 @@ struct d3d12_rtv_desc uint64_t width; unsigned int height; unsigned int layer_count; - struct vkd3d_view *view; + struct vkd3d_view_desc *view; struct d3d12_resource *resource; }; @@ -781,7 +836,7 @@ struct d3d12_dsv_desc uint64_t width; unsigned int height; unsigned int layer_count; - struct vkd3d_view *view; + struct vkd3d_view_desc *view; struct d3d12_resource *resource; }; @@ -861,7 +916,7 @@ HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, struct d3d12_desc_copy_location { - struct d3d12_desc src; + union d3d12_desc_object src; struct d3d12_desc *dst; }; @@ -1156,7 +1211,7 @@ struct d3d12_command_allocator size_t descriptor_pools_size; size_t descriptor_pool_count; - struct vkd3d_view **views; + struct vkd3d_view_desc **views; size_t views_size; size_t view_count; @@ -1450,6 +1505,15 @@ struct vkd3d_uav_clear_state HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d3d12_device *device); void vkd3d_uav_clear_state_cleanup(struct vkd3d_uav_clear_state *state, struct d3d12_device *device); +struct vkd3d_desc_object_cache +{ + struct vkd3d_mutex mutex; + void **cache; + size_t capacity; + size_t count; + size_t reserve; +}; + #define VKD3D_DESCRIPTOR_POOL_COUNT 6 /* ID3D12Device */ @@ -1468,7 +1532,8 @@ struct d3d12_device struct vkd3d_gpu_va_allocator gpu_va_allocator; struct vkd3d_mutex mutex; - struct vkd3d_mutex desc_mutex[8]; + struct vkd3d_desc_object_cache view_desc_cache; + struct vkd3d_desc_object_cache cbuffer_desc_cache; struct vkd3d_render_pass_cache render_pass_cache; VkPipelineCache vk_pipeline_cache; @@ -1542,17 +1607,16 @@ static inline unsigned int d3d12_device_get_descriptor_handle_increment_size(str return ID3D12Device_GetDescriptorHandleIncrementSize(&device->ID3D12Device_iface, descriptor_type); } -static inline struct vkd3d_mutex *d3d12_device_get_descriptor_mutex(struct d3d12_device *device, - const struct d3d12_desc *descriptor) +static inline void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *src, + struct d3d12_device *device) { - STATIC_ASSERT(!(ARRAY_SIZE(device->desc_mutex) & (ARRAY_SIZE(device->desc_mutex) - 1))); - uintptr_t idx = (uintptr_t)descriptor; - - idx ^= idx >> 12; - idx ^= idx >> 6; - idx ^= idx >> 3; + void *object = src->u.object; - return &device->desc_mutex[idx & (ARRAY_SIZE(device->desc_mutex) - 1)]; + /* Write the Vulkan descriptor first. Otherwise, while it's unlikely the dst + * and src would be destroyed before the write occurs, it is possible. */ + if (device->use_vk_heaps && object) + d3d12_desc_write_vk_heap(dst, object, device); + d3d12_desc_replace(dst, object, device); } /* utils */ -- 2.36.1 [View Less]

1 0

[PATCH v2 0/4] MR9: ntdll: Implement __fastfail().
by Jinoh Kang (＠iamahuman) 31 May '22

31 May '22

__fastfail() is used by the Visual C++ runtime and Windows system libraries to signal that the in-process state is corrupted and unrecoverable. If __fastfail() is invoked, the NT kernel raises a second-chance non-continuable exception STATUS_STACK_BUFFER_OVERRUN. This quickly terminates the process, bypassing all in-process exception handlers (since they all rely on the potentially corrupted process state). -- v2: ntdll: Properly parse UDF instruction in ARM. ntdll: Implement … [View More]

4 8

Re: [PATCH v2 0/5] MR162: explorer: Move clipboard manager thread from display driver. - approved
by Alexandre Julliard (＠julliard) 31 May '22

31 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/162

1 0

Re: [PATCH v4 0/5] MR109: wined3d: Add a memory_colour_fill path for clearing the entire level to zero. - approved
by Alexandre Julliard (＠julliard) 31 May '22

31 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/109

1 0

Re: [PATCH v2 0/4] MR161: d2d1: Improve bitmap options handling. - approved
by Alexandre Julliard (＠julliard) 31 May '22

31 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/161

1 0

[PATCH v4 0/2] MR156: Stubs for Kvaser CanKing
by Alex Henrie (＠alexhenrie) 31 May '22

31 May '22

-- v4: ntoskrnl: Add KeLowerIrql stub. ntoskrnl: Add KfRaiseIrql stub. https://gitlab.winehq.org/wine/wine/-/merge_requests/156

3 3

Re: [PATCH v3 0/6] MR159: ntdll: More heap code cleanup. - approved
by Alexandre Julliard (＠julliard) 31 May '22

31 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/159

1 0

[PATCH 1/2] wined3d: Do not accelerate NOOVERWRITE maps if we cannot map persistently.
by Zebediah Figura 31 May '22

31 May '22

I.e. if ARB_buffer_storage is not supported. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Somehow I had forgotten to protect against this... dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/buffer.c | 4 +++- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 0d9f6953de3..05e8c112388 100644 --- a/dlls/wined3d/… [View More]adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5231,6 +5231,7 @@ static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_ d3d_info->fences = wined3d_fence_supported(gl_info); d3d_info->feature_level = feature_level_from_caps(gl_info, &shader_caps, &fragment_caps); d3d_info->filling_convention_offset = gl_info->filling_convention_offset; + d3d_info->persistent_map = !!gl_info->supported[ARB_BUFFER_STORAGE]; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index cd1748afe90..3b87ab63ee5 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2351,6 +2351,7 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ d3d_info->feature_level = feature_level_from_caps(&shader_caps); d3d_info->subpixel_viewport = true; d3d_info->fences = true; + d3d_info->persistent_map = true; /* Like GL, Vulkan doesn't explicitly specify a filling convention and only mandates that a * shared edge of two adjacent triangles generate a fragment for exactly one of the triangles. diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 0d6550bf613..9b0d98139ce 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1008,11 +1008,13 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc addr.buffer_object = buffer->buffer_object; addr.addr = 0; buffer->map_ptr = wined3d_context_map_bo_address(context, &addr, resource->size, flags); + /* We are accessing buffer->resource.client from the CS thread, * but it's safe because the client thread will wait for the * map to return, thus completely serializing this call with * other client code. */ - buffer->resource.client.addr = addr; + if (context->d3d_info->persistent_map) + buffer->resource.client.addr = addr; if (((DWORD_PTR)buffer->map_ptr) & (RESOURCE_ALIGNMENT - 1)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ce4d7384066..9304de4e9d6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -243,6 +243,7 @@ struct wined3d_d3d_info uint32_t pbo : 1; uint32_t subpixel_viewport : 1; uint32_t fences : 1; + uint32_t persistent_map : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location; -- 2.35.1 [View Less]

2 3

[tools] testbot/orm: Don't assume that key columns don't need conversion.
by Francois Gouget 31 May '22

31 May '22

This allows using booleans and timestamps in the key columns. It also makes GetUpdateData() consistent with GetInsertData(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 94e4be6b7..940d37f65 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/… [View More]

1 0

[tools] testbot/build: Run make depend before rebuilding the tests.
by Francois Gouget 31 May '22

31 May '22

'make buildtest' only generates the headers needed by the tests. So it's possible for a patch to introduce a dependency on a header that was not build by Reconfig. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 4 ++-- testbot/lib/Build/Utils.pm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 23ab68587..8502f212d 100755 --- a/testbot/bin/build/Build.pl +++… [View More]

1 0

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

31 May '22

-- 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 (＠stefan) 31 May '22

31 May '22

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

6 12

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

31 May '22

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(+), … [View More]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 [View Less]

2 11

[PATCH] winecoreaudio: Handle MIDI running status.
by Akihiro Sagawa 31 May '22

31 May '22

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) 31 May '22

31 May '22

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 31 May '22

31 May '22

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 @@… [View More] -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 [View Less]

3 8

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

31 May '22

-- 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 (＠rbernon) 31 May '22

31 May '22

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

2 6

[PATCH 0/6] MR159: ntdll: More heap code cleanup.
by Rémi Bernon (＠rbernon) 31 May '22

31 May '22

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

4 9

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

31 May '22

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 | … [View More]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)) [View Less]

1 0

[PATCH v3 0/6] MR73: Improvement in PDB's types record handling
by eric pouech (＠epo) 31 May '22

31 May '22

This serie tackles several issues encountered while loading PDB files through dbghelp. It happens that PDB allows to have several type records for user defined types (struct / enums) with the same name. This seems to be generated by a) compiler (when modifying a structure definition between several compilation phases), b) the incremental linker (likely an optimisation of previous case, but not 100% certain when it's triggered). Wine's dbghelp ended up not picking the right record, hence … [View More]

2 7

[PATCH v2 0/6] MR73: Improvement in PDB's types record handling
by eric pouech (＠epo) 31 May '22

31 May '22

This serie tackles several issues encountered while loading PDB files through dbghelp. It happens that PDB allows to have several type records for user defined types (struct / enums) with the same name. This seems to be generated by a) compiler (when modifying a structure definition between several compilation phases), b) the incremental linker (likely an optimisation of previous case, but not 100% certain when it's triggered). Wine's dbghelp ended up not picking the right record, hence … [View More]

3 7

[PATCH 0/1] MR134: ntdll: Don't hard-code the battery and AC adapter names on Linux
by Alex Henrie (＠alexhenrie) 31 May '22

31 May '22

Look through all of the devices in /sys/class/power_supply and take the statistics from the first battery and the first AC adapter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52831 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/134

3 2

[PATCH v2 0/1] MR155: ntdll: Fix reading state Information from IOSB.
by Jinoh Kang (＠iamahuman) 31 May '22

31 May '22

Enforce proper atomic update so that other threads do not read stale data from IO_STATUS_BLOCK. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v2: ntdll: Fix reading stale Information from IOSB. https://gitlab.winehq.org/wine/wine/-/merge_requests/155

4 6

[PATCH v3 0/2] MR156: Stubs for Kvaser CanKing
by Alex Henrie (＠alexhenrie) 30 May '22

30 May '22

-- v3: ntoskrnl: Add KeLowerIrql stub. ntoskrnl: Add KfRaiseIrql stub. https://gitlab.winehq.org/wine/wine/-/merge_requests/156

2 3

[PATCH v2 0/2] MR156: Stubs for Kvaser CanKing
by Alex Henrie (＠alexhenrie) 30 May '22

30 May '22

-- v2: ntoskrnl: Add KeLowerIrql stub. ntoskrnl: Add KfRaiseIrql stub. https://gitlab.winehq.org/wine/wine/-/merge_requests/156

3 4

[PATCH 0/2] MR156: Stubs for Kvaser CanKing
by Alex Henrie (＠alexhenrie) 30 May '22

30 May '22

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

3 3

Re: [PATCH v2 0/6] MR154: winemac: PE conversion preparation - approved
by Alexandre Julliard (＠julliard) 30 May '22

30 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/154

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel