Module: wine Branch: master Commit: 0d359fb8de728ea433e43465d5897de81aebbc3d URL: https://gitlab.winehq.org/wine/wine/-/commit/0d359fb8de728ea433e43465d5897de...
Author: Eric Pouech eric.pouech@gmail.com Date: Fri Oct 7 11:54:46 2022 +0200
wined3d: Use I width modifier for debug traces on DWORD_PTR.
Signed-off-by: Eric Pouech eric.pouech@gmail.com
---
dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context_vk.c | 4 ++-- dlls/wined3d/device.c | 2 +- dlls/wined3d/shader_sm4.c | 6 +++--- dlls/wined3d/wined3d_main.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3a2263d109f..1a953f8e218 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -282,7 +282,7 @@ static BOOL buffer_process_converted_attribute(struct wined3d_buffer *buffer, DWORD_PTR idx = (data + i) % buffer->stride; if (buffer->conversion_map[idx] != conversion_type) { - TRACE("Byte %lu in vertex changed:\n", idx); + TRACE("Byte %Iu in vertex changed:\n", idx); TRACE(" It was type %#x, is %#x now.\n", buffer->conversion_map[idx], conversion_type); ret = TRUE; buffer->conversion_map[idx] = conversion_type; diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index d47f7cf5d1a..13700c6dfb9 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -781,7 +781,7 @@ static void wined3d_bo_slab_vk_free_slice(struct wined3d_bo_slab_vk *slab, struct wined3d_bo_slab_vk_key key; struct wine_rb_entry *entry;
- TRACE("slab %p, idx %lu, context_vk %p.\n", slab, idx, context_vk); + TRACE("slab %p, idx %Iu, context_vk %p.\n", slab, idx, context_vk);
wined3d_device_vk_allocator_lock(device_vk);
@@ -819,7 +819,7 @@ static void wined3d_context_vk_destroy_bo_slab_slice(struct wined3d_context_vk *
if (!(o = wined3d_context_vk_get_retired_object_vk(context_vk))) { - ERR("Leaking slab %p, slice %#lx.\n", slab, idx); + ERR("Leaking slab %p, slice %#Ix.\n", slab, idx); return; }
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e214c47f071..d1c18177d62 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1112,7 +1112,7 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win GLsizeiptr buffer_offset = 0; GLuint id = 0;
- TRACE("device_gl %p, context_gl %p, size %lu, binding %#x, usage %#x, coherent %#x, flags %#x, bo %p.\n", + TRACE("device_gl %p, context_gl %p, size %Iu, binding %#x, usage %#x, coherent %#x, flags %#x, bo %p.\n", device_gl, context_gl, size, binding, usage, coherent, flags, bo);
if (gl_info->supported[ARB_BUFFER_STORAGE]) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 73001d90833..62aba18a235 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1717,7 +1717,7 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi } if (!len || remaining < len) { - WARN("Read invalid length %u (remaining %lu).\n", len, remaining); + WARN("Read invalid length %u (remaining %Iu).\n", len, remaining); goto fail; } --len; @@ -1920,7 +1920,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size,
if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) { - WARN("Invalid chunk offset %#x (data size %#lx).\n", chunk_offset, data_size); + WARN("Invalid chunk offset %#x (data size %#Ix).\n", chunk_offset, data_size); return E_FAIL; }
@@ -1931,7 +1931,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size,
if (!require_space(chunk_ptr - data, 1, chunk_size, data_size)) { - WARN("Invalid chunk size %#x (data size %#lx, chunk offset %#x).\n", + WARN("Invalid chunk size %#x (data size %#Ix, chunk offset %#x).\n", chunk_size, data_size, chunk_offset); return E_FAIL; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 4b718746b6a..2e4dda2c473 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -630,7 +630,7 @@ static LRESULT CALLBACK wined3d_wndproc(HWND window, UINT message, WPARAM wparam { if (filter && message != WM_DISPLAYCHANGE) { - TRACE("Filtering message: window %p, message %#x, wparam %#lx, lparam %#lx.\n", + TRACE("Filtering message: window %p, message %#x, wparam %#Ix, lparam %#Ix.\n", window, message, wparam, lparam);
if (unicode)