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

[PATCH 1/5] wined3d: Use the chunk allocator for GL indirect draw buffers.
by Zebediah Figura Feb. 9, 2022

Feb. 9, 2022

From: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/context_gl.c | 258 +++++++++++++++++++++++++++++---- dlls/wined3d/device.c | 110 ++++++++++++++ dlls/wined3d/wined3d_private.h | 66 ++++++--- 4 files changed, 390 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 5511a70a8ff..e903c67b56a 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4283,6 +4283,7 @@ static void adapter_gl_destroy_device(struct wined3d_device *device) struct wined3d_device_gl *device_gl = wined3d_device_gl(device); wined3d_device_cleanup(&device_gl->d); + heap_free(device_gl->retired_blocks); heap_free(device_gl); } diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 3a83027522a..9b8a887bd92 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2618,6 +2618,37 @@ static void wined3d_context_gl_poll_fences(struct wined3d_context_gl *context_gl } } +static void wined3d_context_gl_cleanup_resources(struct wined3d_context_gl *context_gl) +{ + struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); + struct wined3d_retired_block_gl *r, *blocks; + SIZE_T count, i = 0; + uint64_t id; + + wined3d_context_gl_poll_fences(context_gl); + id = device_gl->completed_fence_id; + + blocks = device_gl->retired_blocks; + count = device_gl->retired_block_count; + while (i < count) + { + r = &blocks[i]; + + if (r->fence_id > id) + { + ++i; + continue; + } + + wined3d_allocator_block_free(r->block); + if (i != --count) + *r = blocks[count]; + else + ++i; + } + device_gl->retired_block_count = count; +} + void wined3d_context_gl_wait_command_fence(struct wined3d_context_gl *context_gl, uint64_t id) { struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); @@ -2635,7 +2666,7 @@ void wined3d_context_gl_wait_command_fence(struct wined3d_context_gl *context_gl if ((ret = wined3d_fence_wait(context_gl->submitted.fences[i].fence, &device_gl->d)) != WINED3D_FENCE_OK) ERR("Failed to wait for command fence with id 0x%s, ret %#x.\n", wine_dbgstr_longlong(id), ret); - wined3d_context_gl_poll_fences(context_gl); + wined3d_context_gl_cleanup_resources(context_gl); return; } @@ -2665,7 +2696,133 @@ void wined3d_context_gl_submit_command_fence(struct wined3d_context_gl *context_ device_gl->completed_fence_id = 0; device_gl->current_fence_id = 1; } - wined3d_context_gl_poll_fences(context_gl); + wined3d_context_gl_cleanup_resources(context_gl); +} + +static void wined3d_context_gl_destroy_allocator_block(struct wined3d_context_gl *context_gl, + struct wined3d_allocator_block *block, uint64_t fence_id) +{ + struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); + struct wined3d_retired_block_gl *r; + + if (device_gl->completed_fence_id > fence_id) + { + wined3d_allocator_block_free(block); + TRACE("Freed block %p.\n", block); + return; + } + + if (!wined3d_array_reserve((void **)&device_gl->retired_blocks, + &device_gl->retired_blocks_size, device_gl->retired_block_count + 1, + sizeof(*device_gl->retired_blocks))) + { + ERR("Leaking block %p.\n", block); + return; + } + + r = &device_gl->retired_blocks[device_gl->retired_block_count++]; + r->block = block; + r->fence_id = fence_id; +} + +/* We always have buffer storage here. */ +GLuint wined3d_context_gl_allocate_vram_chunk_buffer(struct wined3d_context_gl *context_gl, + unsigned int pool, size_t size) +{ + const struct wined3d_gl_info *gl_info = context_gl->gl_info; + GLbitfield flags; + GLuint id = 0; + + TRACE("context_gl %p, pool %u, size %zu.\n", context_gl, pool, size); + + GL_EXTCALL(glGenBuffers(1, &id)); + if (!id) + { + checkGLcall("buffer object creation"); + return 0; + } + wined3d_context_gl_bind_bo(context_gl, GL_PIXEL_UNPACK_BUFFER, id); + + flags = wined3d_device_gl_get_memory_type_flags(pool) | GL_DYNAMIC_STORAGE_BIT; + if (flags & (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT)) + flags |= GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; + GL_EXTCALL(glBufferStorage(GL_PIXEL_UNPACK_BUFFER, size, NULL, flags)); + + checkGLcall("buffer object creation"); + + TRACE("Created buffer object %u.\n", id); + + return id; +} + +static struct wined3d_allocator_block *wined3d_context_gl_allocate_memory(struct wined3d_context_gl *context_gl, + unsigned int memory_type, GLsizeiptr size, GLuint *id) +{ + struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); + struct wined3d_allocator *allocator = &device_gl->allocator; + struct wined3d_allocator_block *block; + + if (size > WINED3D_ALLOCATOR_CHUNK_SIZE / 2) + { + *id = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type, size); + return NULL; + } + + if (!(block = wined3d_allocator_allocate(allocator, &context_gl->c, memory_type, size))) + { + *id = 0; + return NULL; + } + + *id = wined3d_allocator_chunk_gl(block->chunk)->gl_buffer; + + return block; +} + +static void *wined3d_allocator_chunk_gl_map(struct wined3d_allocator_chunk_gl *chunk_gl, + struct wined3d_context_gl *context_gl) +{ + const struct wined3d_gl_info *gl_info = context_gl->gl_info; + + TRACE("chunk %p, gl_buffer %u, map_ptr %p.\n", chunk_gl, chunk_gl->gl_buffer, chunk_gl->c.map_ptr); + + if (!chunk_gl->c.map_ptr) + { + unsigned int flags = wined3d_device_gl_get_memory_type_flags(chunk_gl->memory_type) & ~GL_CLIENT_STORAGE_BIT; + + flags |= GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; + if (!(flags & GL_MAP_READ_BIT)) + flags |= GL_MAP_UNSYNCHRONIZED_BIT; + if (flags & GL_MAP_WRITE_BIT) + flags |= GL_MAP_FLUSH_EXPLICIT_BIT; + wined3d_context_gl_bind_bo(context_gl, GL_PIXEL_UNPACK_BUFFER, chunk_gl->gl_buffer); + chunk_gl->c.map_ptr = GL_EXTCALL(glMapBufferRange(GL_PIXEL_UNPACK_BUFFER, + 0, WINED3D_ALLOCATOR_CHUNK_SIZE, flags)); + if (!chunk_gl->c.map_ptr) + { + ERR("Failed to map chunk memory.\n"); + return NULL; + } + } + + ++chunk_gl->c.map_count; + + return chunk_gl->c.map_ptr; +} + +static void wined3d_allocator_chunk_gl_unmap(struct wined3d_allocator_chunk_gl *chunk_gl, + struct wined3d_context_gl *context_gl) +{ + const struct wined3d_gl_info *gl_info = context_gl->gl_info; + + TRACE("chunk_gl %p, context_gl %p.\n", chunk_gl, context_gl); + + if (!--chunk_gl->c.map_count && !wined3d_map_persistent()) + { + wined3d_context_gl_bind_bo(context_gl, GL_PIXEL_UNPACK_BUFFER, chunk_gl->gl_buffer); + GL_EXTCALL(glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER)); + chunk_gl->c.map_ptr = NULL; + } } static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, struct wined3d_context_gl *context_gl, uint32_t flags) @@ -2708,6 +2865,15 @@ map: if (bo->b.map_ptr) return bo->b.map_ptr; + if (bo->memory) + { + struct wined3d_allocator_chunk_gl *chunk_gl = wined3d_allocator_chunk_gl(bo->memory->chunk); + + if (!(map_ptr = wined3d_allocator_chunk_gl_map(chunk_gl, context_gl))) + ERR("Failed to map chunk.\n"); + return map_ptr; + } + gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); @@ -2766,7 +2932,12 @@ static void wined3d_bo_gl_unmap(struct wined3d_bo_gl *bo, struct wined3d_context return; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); - GL_EXTCALL(glUnmapBuffer(bo->binding)); + + if (bo->memory) + wined3d_allocator_chunk_gl_unmap(wined3d_allocator_chunk_gl(bo->memory->chunk), context_gl); + else + GL_EXTCALL(glUnmapBuffer(bo->binding)); + wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); checkGLcall("Unmap buffer object"); } @@ -2920,7 +3091,23 @@ void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct TRACE("context_gl %p, bo %p.\n", context_gl, bo); + if (bo->memory) + { + if (bo->b.map_ptr) + wined3d_allocator_chunk_gl_unmap(wined3d_allocator_chunk_gl(bo->memory->chunk), context_gl); + wined3d_context_gl_destroy_allocator_block(context_gl, bo->memory, bo->command_fence_id); + bo->id = 0; + return; + } + + if (bo->b.map_ptr) + { + wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); + GL_EXTCALL(glUnmapBuffer(bo->binding)); + } + TRACE("Destroying GL buffer %u.\n", bo->id); + GL_EXTCALL(glDeleteBuffers(1, &bo->id)); checkGLcall("buffer object destruction"); bo->id = 0; @@ -2929,42 +3116,61 @@ void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizeiptr size, GLenum binding, GLenum usage, bool coherent, GLbitfield flags, struct wined3d_bo_gl *bo) { + unsigned int memory_type_idx = wined3d_device_gl_find_memory_type(flags); const struct wined3d_gl_info *gl_info = context_gl->gl_info; + struct wined3d_allocator_block *memory = NULL; + GLsizeiptr buffer_offset = 0; GLuint id = 0; TRACE("context_gl %p, size %lu, binding %#x, usage %#x, coherent %#x, flags %#x, bo %p.\n", context_gl, size, binding, usage, coherent, flags, bo); - GL_EXTCALL(glGenBuffers(1, &id)); - if (!id) - { - checkGLcall("buffer object creation"); - return false; - } - wined3d_context_gl_bind_bo(context_gl, binding, id); - - if (!coherent && gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) - { - GL_EXTCALL(glBufferParameteriAPPLE(binding, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); - GL_EXTCALL(glBufferParameteriAPPLE(binding, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); - } - if (gl_info->supported[ARB_BUFFER_STORAGE]) { - if (flags & (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT)) - flags |= GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; - GL_EXTCALL(glBufferStorage(binding, size, NULL, flags | GL_DYNAMIC_STORAGE_BIT)); + switch (binding) + { + case GL_DRAW_INDIRECT_BUFFER: + if ((memory = wined3d_context_gl_allocate_memory(context_gl, memory_type_idx, size, &id))) + buffer_offset = memory->offset; + break; + + default: + WARN_(d3d_perf)("Not allocating chunk memory for binding type %#x.\n", binding); + id = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type_idx, size); + break; + } + + if (!id) + { + WARN("Failed to allocate buffer.\n"); + return false; + } } else { - GL_EXTCALL(glBufferData(binding, size, NULL, usage)); - } + GL_EXTCALL(glGenBuffers(1, &id)); + if (!id) + { + checkGLcall("buffer object creation"); + return false; + } + wined3d_context_gl_bind_bo(context_gl, binding, id); - wined3d_context_gl_bind_bo(context_gl, binding, 0); - checkGLcall("buffer object creation"); + if (!coherent && gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) + { + GL_EXTCALL(glBufferParameteriAPPLE(binding, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); + GL_EXTCALL(glBufferParameteriAPPLE(binding, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); + } + + GL_EXTCALL(glBufferData(binding, size, NULL, usage)); + + wined3d_context_gl_bind_bo(context_gl, binding, 0); + checkGLcall("buffer object creation"); + } TRACE("Created buffer object %u.\n", id); bo->id = id; + bo->memory = memory; bo->size = size; bo->binding = binding; bo->usage = usage; @@ -2972,8 +3178,8 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei bo->b.coherent = coherent; list_init(&bo->b.users); bo->command_fence_id = 0; - bo->b.memory_offset = 0; - bo->b.buffer_offset = 0; + bo->b.buffer_offset = buffer_offset; + bo->b.memory_offset = bo->b.buffer_offset; bo->b.map_ptr = NULL; return true; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index aa456d3e702..09be992dd2f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -955,6 +955,101 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi wined3d_device_context_set_depth_stencil_view(context, ds_enable ? device->auto_depth_stencil_view : NULL); } +static struct wined3d_allocator_chunk *wined3d_allocator_gl_create_chunk(struct wined3d_allocator *allocator, + struct wined3d_context *context, unsigned int memory_type, size_t chunk_size) +{ + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + struct wined3d_allocator_chunk_gl *chunk_gl; + + TRACE("allocator %p, context %p, memory_type %u, chunk_size %zu.\n", allocator, context, memory_type, chunk_size); + + if (!(chunk_gl = heap_alloc(sizeof(*chunk_gl)))) + return NULL; + + if (!wined3d_allocator_chunk_init(&chunk_gl->c, allocator)) + { + heap_free(chunk_gl); + return NULL; + } + + chunk_gl->memory_type = memory_type; + if (!(chunk_gl->gl_buffer = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type, chunk_size))) + { + wined3d_allocator_chunk_cleanup(&chunk_gl->c); + heap_free(chunk_gl); + return NULL; + } + list_add_head(&allocator->pools[memory_type].chunks, &chunk_gl->c.entry); + + return &chunk_gl->c; +} + +static void wined3d_allocator_gl_destroy_chunk(struct wined3d_allocator_chunk *chunk) +{ + struct wined3d_allocator_chunk_gl *chunk_gl = wined3d_allocator_chunk_gl(chunk); + const struct wined3d_gl_info *gl_info; + struct wined3d_context_gl *context_gl; + struct wined3d_device_gl *device_gl; + + TRACE("chunk %p.\n", chunk); + + device_gl = CONTAINING_RECORD(chunk_gl->c.allocator, struct wined3d_device_gl, allocator); + context_gl = wined3d_context_gl(context_acquire(&device_gl->d, NULL, 0)); + gl_info = context_gl->gl_info; + + wined3d_context_gl_bind_bo(context_gl, GL_PIXEL_UNPACK_BUFFER, chunk_gl->gl_buffer); + if (chunk_gl->c.map_ptr) + GL_EXTCALL(glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER)); + GL_EXTCALL(glDeleteBuffers(1, &chunk_gl->gl_buffer)); + TRACE("Freed buffer %u.\n", chunk_gl->gl_buffer); + wined3d_allocator_chunk_cleanup(&chunk_gl->c); + heap_free(chunk_gl); + + context_release(&context_gl->c); +} + +static const struct wined3d_allocator_ops wined3d_allocator_gl_ops = +{ + .allocator_create_chunk = wined3d_allocator_gl_create_chunk, + .allocator_destroy_chunk = wined3d_allocator_gl_destroy_chunk, +}; + +static const struct +{ + GLbitfield flags; +} +gl_memory_types[] = +{ + {0}, + {GL_MAP_READ_BIT}, + {GL_MAP_WRITE_BIT}, + {GL_MAP_READ_BIT | GL_MAP_WRITE_BIT}, + + {GL_CLIENT_STORAGE_BIT}, + {GL_CLIENT_STORAGE_BIT | GL_MAP_READ_BIT}, + {GL_CLIENT_STORAGE_BIT | GL_MAP_WRITE_BIT}, + {GL_CLIENT_STORAGE_BIT | GL_MAP_READ_BIT | GL_MAP_WRITE_BIT}, +}; + +unsigned int wined3d_device_gl_find_memory_type(GLbitfield flags) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(gl_memory_types); ++i) + { + if (gl_memory_types[i].flags == flags) + return i; + } + + assert(0); + return 0; +} + +GLbitfield wined3d_device_gl_get_memory_type_flags(unsigned int memory_type_idx) +{ + return gl_memory_types[memory_type_idx].flags; +} + void wined3d_device_gl_delete_opengl_contexts_cs(void *object) { struct wined3d_device_gl *device_gl = object; @@ -978,6 +1073,12 @@ void wined3d_device_gl_delete_opengl_contexts_cs(void *object) device->blitter->ops->blitter_destroy(device->blitter, context); device->shader_backend->shader_free_private(device, context); wined3d_device_gl_destroy_dummy_textures(device_gl, context_gl); + + wined3d_context_gl_submit_command_fence(context_gl); + wined3d_context_gl_wait_command_fence(context_gl, + wined3d_device_gl(context_gl->c.device)->current_fence_id - 1); + wined3d_allocator_cleanup(&device_gl->allocator); + context_release(context); while (device->context_count) @@ -1010,10 +1111,18 @@ void wined3d_device_gl_create_primary_opengl_context_cs(void *object) return; } + if (!wined3d_allocator_init(&device_gl->allocator, ARRAY_SIZE(gl_memory_types), &wined3d_allocator_gl_ops)) + { + WARN("Failed to initialise allocator.\n"); + context_release(context); + return; + } + if (FAILED(hr = device->shader_backend->shader_alloc_private(device, device->adapter->vertex_pipe, device->adapter->fragment_pipe))) { ERR("Failed to allocate shader private data, hr %#x.\n", hr); + wined3d_allocator_cleanup(&device_gl->allocator); context_release(context); return; } @@ -1022,6 +1131,7 @@ void wined3d_device_gl_create_primary_opengl_context_cs(void *object) { ERR("Failed to create CPU blitter.\n"); device->shader_backend->shader_free_private(device, NULL); + wined3d_allocator_cleanup(&device_gl->allocator); context_release(context); return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1b3a13024f9..ef1062ec9b4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1617,6 +1617,9 @@ struct wined3d_bo_gl struct wined3d_bo b; GLuint id; + + struct wined3d_allocator_block *memory; + GLsizeiptr size; GLenum binding; GLenum usage; @@ -2355,6 +2358,8 @@ void wined3d_context_gl_alloc_so_statistics_query(struct wined3d_context_gl *con struct wined3d_so_statistics_query *query) DECLSPEC_HIDDEN; void wined3d_context_gl_alloc_timestamp_query(struct wined3d_context_gl *context_gl, struct wined3d_timestamp_query *query) DECLSPEC_HIDDEN; +GLuint wined3d_context_gl_allocate_vram_chunk_buffer(struct wined3d_context_gl *context_gl, + unsigned int pool, size_t size) DECLSPEC_HIDDEN; void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, const struct wined3d_device *device) DECLSPEC_HIDDEN; BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, const struct wined3d_state *state, @@ -3956,25 +3961,6 @@ static inline struct wined3d_device_no3d *wined3d_device_no3d(struct wined3d_dev return CONTAINING_RECORD(device, struct wined3d_device_no3d, d); } -struct wined3d_device_gl -{ - struct wined3d_device d; - - /* Textures for when no other textures are bound. */ - struct wined3d_dummy_textures dummy_textures; - - uint64_t completed_fence_id; - uint64_t current_fence_id; -}; - -static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device *device) -{ - return CONTAINING_RECORD(device, struct wined3d_device_gl, d); -} - -void wined3d_device_gl_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; -void wined3d_device_gl_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN; - struct wined3d_null_resources_vk { struct wined3d_bo_vk bo; @@ -4021,6 +4007,18 @@ void wined3d_allocator_chunk_cleanup(struct wined3d_allocator_chunk *chunk) DECL bool wined3d_allocator_chunk_init(struct wined3d_allocator_chunk *chunk, struct wined3d_allocator *allocator) DECLSPEC_HIDDEN; +struct wined3d_allocator_chunk_gl +{ + struct wined3d_allocator_chunk c; + unsigned int memory_type; + GLuint gl_buffer; +}; + +static inline struct wined3d_allocator_chunk_gl *wined3d_allocator_chunk_gl(struct wined3d_allocator_chunk *chunk) +{ + return CONTAINING_RECORD(chunk, struct wined3d_allocator_chunk_gl, c); +} + struct wined3d_allocator_chunk_vk { struct wined3d_allocator_chunk c; @@ -4155,6 +4153,36 @@ void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, void wined3d_device_vk_uav_clear_state_init(struct wined3d_device_vk *device_vk) DECLSPEC_HIDDEN; void wined3d_device_vk_uav_clear_state_cleanup(struct wined3d_device_vk *device_vk) DECLSPEC_HIDDEN; +struct wined3d_device_gl +{ + struct wined3d_device d; + + /* Textures for when no other textures are bound. */ + struct wined3d_dummy_textures dummy_textures; + + struct wined3d_allocator allocator; + uint64_t completed_fence_id; + uint64_t current_fence_id; + + struct wined3d_retired_block_gl + { + struct wined3d_allocator_block *block; + uint64_t fence_id; + } *retired_blocks; + SIZE_T retired_blocks_size; + SIZE_T retired_block_count; +}; + +static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device *device) +{ + return CONTAINING_RECORD(device, struct wined3d_device_gl, d); +} + +void wined3d_device_gl_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; +void wined3d_device_gl_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN; +unsigned int wined3d_device_gl_find_memory_type(GLbitfield flags) DECLSPEC_HIDDEN; +GLbitfield wined3d_device_gl_get_memory_type_flags(unsigned int memory_type_idx) DECLSPEC_HIDDEN; + static inline float wined3d_alpha_ref(const struct wined3d_state *state) { return (state->render_states[WINED3D_RS_ALPHAREF] & 0xff) / 255.0f; -- 2.34.1

4 16

[PATCH 1/5] shlwapi/tests: Link directly to Url*() functions.
by Zebediah Figura Feb. 9, 2022

Feb. 9, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/shlwapi/tests/url.c | 485 ++++++++++++++------------------------- 1 file changed, 176 insertions(+), 309 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 0cc14dc65bf..ea58163ce2e 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -29,30 +29,6 @@ #include "wininet.h" #include "intshcut.h" -/* ################ */ -static HMODULE hShlwapi; -static HRESULT (WINAPI *pUrlUnescapeA)(LPSTR,LPSTR,LPDWORD,DWORD); -static HRESULT (WINAPI *pUrlUnescapeW)(LPWSTR,LPWSTR,LPDWORD,DWORD); -static BOOL (WINAPI *pUrlIsA)(LPCSTR,URLIS); -static BOOL (WINAPI *pUrlIsW)(LPCWSTR,URLIS); -static HRESULT (WINAPI *pUrlHashA)(LPCSTR,LPBYTE,DWORD); -static HRESULT (WINAPI *pUrlHashW)(LPCWSTR,LPBYTE,DWORD); -static HRESULT (WINAPI *pUrlGetPartA)(LPCSTR,LPSTR,LPDWORD,DWORD,DWORD); -static HRESULT (WINAPI *pUrlGetPartW)(LPCWSTR,LPWSTR,LPDWORD,DWORD,DWORD); -static HRESULT (WINAPI *pUrlEscapeA)(LPCSTR,LPSTR,LPDWORD,DWORD); -static HRESULT (WINAPI *pUrlEscapeW)(LPCWSTR,LPWSTR,LPDWORD,DWORD); -static HRESULT (WINAPI *pUrlCreateFromPathA)(LPCSTR,LPSTR,LPDWORD,DWORD); -static HRESULT (WINAPI *pUrlCreateFromPathW)(LPCWSTR,LPWSTR,LPDWORD,DWORD); -static HRESULT (WINAPI *pUrlCombineA)(LPCSTR,LPCSTR,LPSTR,LPDWORD,DWORD); -static HRESULT (WINAPI *pUrlCombineW)(LPCWSTR,LPCWSTR,LPWSTR,LPDWORD,DWORD); -static HRESULT (WINAPI *pUrlCanonicalizeA)(LPCSTR, LPSTR, LPDWORD, DWORD); -static HRESULT (WINAPI *pUrlCanonicalizeW)(LPCWSTR, LPWSTR, LPDWORD, DWORD); -static HRESULT (WINAPI *pUrlApplySchemeA)(LPCSTR,LPSTR,LPDWORD,DWORD); -static HRESULT (WINAPI *pUrlApplySchemeW)(LPCWSTR,LPWSTR,LPDWORD,DWORD); -static HRESULT (WINAPI *pParseURLA)(LPCSTR,PARSEDURLA*); -static HRESULT (WINAPI *pParseURLW)(LPCWSTR,PARSEDURLW*); -static HRESULT (WINAPI *pHashData)(LPBYTE, DWORD, LPBYTE, DWORD); - static const char* TEST_URL_1 = "http://www.winehq.org/tests?date=10/10/1923"; static const char* TEST_URL_2 = "http://localhost:8080/tests%2e.html?date=Mon%2010/10/1923"; static const char* TEST_URL_3 = "http://foo:bar(a)localhost:21/internal.php?query=x&return=y"; @@ -539,15 +515,10 @@ static void test_UrlApplyScheme(void) DWORD len; DWORD i; - if (!pUrlApplySchemeA) { - win_skip("UrlApplySchemeA not found\n"); - return; - } - for (i = 0; i < ARRAY_SIZE(TEST_APPLY); i++) { len = TEST_APPLY_MAX_LENGTH; lstrcpyA(newurl, untouchedA); - res = pUrlApplySchemeA(TEST_APPLY[i].url, newurl, &len, TEST_APPLY[i].flags); + res = UrlApplySchemeA(TEST_APPLY[i].url, newurl, &len, TEST_APPLY[i].flags); ok( res == TEST_APPLY[i].res, "#%dA: got HRESULT 0x%x (expected 0x%x)\n", i, res, TEST_APPLY[i].res); @@ -563,7 +534,7 @@ static void test_UrlApplyScheme(void) MultiByteToWideChar(CP_ACP, 0, newurl, -1, newurlW, len); MultiByteToWideChar(CP_ACP, 0, TEST_APPLY[i].url, -1, urlW, len); - res = pUrlApplySchemeW(urlW, newurlW, &len, TEST_APPLY[i].flags); + res = UrlApplySchemeW(urlW, newurlW, &len, TEST_APPLY[i].flags); WideCharToMultiByte(CP_ACP, 0, newurlW, -1, newurl, TEST_APPLY_MAX_LENGTH, NULL, NULL); ok( res == TEST_APPLY[i].res, "#%dW: got HRESULT 0x%x (expected 0x%x)\n", i, res, TEST_APPLY[i].res); @@ -579,7 +550,7 @@ static void test_UrlApplyScheme(void) /* buffer too small */ lstrcpyA(newurl, untouchedA); len = lstrlenA(TEST_APPLY[0].newurl); - res = pUrlApplySchemeA(TEST_APPLY[0].url, newurl, &len, TEST_APPLY[0].flags); + res = UrlApplySchemeA(TEST_APPLY[0].url, newurl, &len, TEST_APPLY[0].flags); ok(res == E_POINTER, "got HRESULT 0x%x (expected E_POINTER)\n", res); /* The returned length include the space for the terminating 0 */ i = lstrlenA(TEST_APPLY[0].newurl)+1; @@ -589,18 +560,18 @@ static void test_UrlApplyScheme(void) /* NULL as parameter. The length and the buffer are not modified */ lstrcpyA(newurl, untouchedA); len = TEST_APPLY_MAX_LENGTH; - res = pUrlApplySchemeA(NULL, newurl, &len, TEST_APPLY[0].flags); + res = UrlApplySchemeA(NULL, newurl, &len, TEST_APPLY[0].flags); ok(res == E_INVALIDARG, "got HRESULT 0x%x (expected E_INVALIDARG)\n", res); ok(len == TEST_APPLY_MAX_LENGTH, "got len %d\n", len); ok(!lstrcmpA(newurl, untouchedA), "got '%s' (expected '%s')\n", newurl, untouchedA); len = TEST_APPLY_MAX_LENGTH; - res = pUrlApplySchemeA(TEST_APPLY[0].url, NULL, &len, TEST_APPLY[0].flags); + res = UrlApplySchemeA(TEST_APPLY[0].url, NULL, &len, TEST_APPLY[0].flags); ok(res == E_INVALIDARG, "got HRESULT 0x%x (expected E_INVALIDARG)\n", res); ok(len == TEST_APPLY_MAX_LENGTH, "got len %d\n", len); lstrcpyA(newurl, untouchedA); - res = pUrlApplySchemeA(TEST_APPLY[0].url, newurl, NULL, TEST_APPLY[0].flags); + res = UrlApplySchemeA(TEST_APPLY[0].url, newurl, NULL, TEST_APPLY[0].flags); ok(res == E_INVALIDARG, "got HRESULT 0x%x (expected E_INVALIDARG)\n", res); ok(!lstrcmpA(newurl, untouchedA), "got '%s' (expected '%s')\n", newurl, untouchedA); @@ -616,25 +587,18 @@ static void hash_url(const char* szUrl) DWORD cbSize = sizeof(DWORD); DWORD dwHash1, dwHash2; - res = pUrlHashA(szTestUrl, (LPBYTE)&dwHash1, cbSize); + res = UrlHashA(szTestUrl, (LPBYTE)&dwHash1, cbSize); ok(res == S_OK, "UrlHashA returned 0x%x (expected S_OK) for %s\n", res, szUrl); - if (pUrlHashW) { - res = pUrlHashW(wszTestUrl, (LPBYTE)&dwHash2, cbSize); - ok(res == S_OK, "UrlHashW returned 0x%x (expected S_OK) for %s\n", res, szUrl); - ok(dwHash1 == dwHash2, - "Hashes didn't match (A: 0x%x, W: 0x%x) for %s\n", dwHash1, dwHash2, szUrl); - } - FreeWideString(wszTestUrl); + res = UrlHashW(wszTestUrl, (LPBYTE)&dwHash2, cbSize); + ok(res == S_OK, "UrlHashW returned 0x%x (expected S_OK) for %s\n", res, szUrl); + ok(dwHash1 == dwHash2, + "Hashes didn't match (A: 0x%x, W: 0x%x) for %s\n", dwHash1, dwHash2, szUrl); + FreeWideString(wszTestUrl); } static void test_UrlHash(void) { - if (!pUrlHashA) { - win_skip("UrlHashA not found\n"); - return; - } - hash_url(TEST_URL_1); hash_url(TEST_URL_2); hash_url(TEST_URL_3); @@ -652,31 +616,30 @@ static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, const DWORD dwSize; dwSize = 1; - res = pUrlGetPartA(szUrl, szPart, &dwSize, dwPart, dwFlags); + res = UrlGetPartA(szUrl, szPart, &dwSize, dwPart, dwFlags); ok(res == E_POINTER, "UrlGetPart for \"%s\" gave: 0x%08x\n", szUrl, res); ok(dwSize == strlen(szExpected)+1 || (*szExpected == '?' && dwSize == strlen(szExpected)), "UrlGetPart for \"%s\" gave size: %u\n", szUrl, dwSize); dwSize = INTERNET_MAX_URL_LENGTH; - res = pUrlGetPartA(szUrl, szPart, &dwSize, dwPart, dwFlags); + res = UrlGetPartA(szUrl, szPart, &dwSize, dwPart, dwFlags); ok(res == S_OK, "UrlGetPartA for \"%s\" part 0x%08x returned 0x%x and \"%s\"\n", szUrl, dwPart, res, szPart); - if (pUrlGetPartW) { - dwSize = INTERNET_MAX_URL_LENGTH; - res = pUrlGetPartW(wszUrl, wszPart, &dwSize, dwPart, dwFlags); - ok(res == S_OK, - "UrlGetPartW for \"%s\" part 0x%08x returned 0x%x\n", - szUrl, dwPart, res); - wszConvertedPart = GetWideString(szPart); + dwSize = INTERNET_MAX_URL_LENGTH; + res = UrlGetPartW(wszUrl, wszPart, &dwSize, dwPart, dwFlags); + ok(res == S_OK, + "UrlGetPartW for \"%s\" part 0x%08x returned 0x%x\n", + szUrl, dwPart, res); - ok(lstrcmpW(wszPart,wszConvertedPart)==0, - "Strings didn't match between ansi and unicode UrlGetPart!\n"); + wszConvertedPart = GetWideString(szPart); - FreeWideString(wszConvertedPart); - } + ok(lstrcmpW(wszPart,wszConvertedPart)==0, + "Strings didn't match between ansi and unicode UrlGetPart!\n"); + + FreeWideString(wszConvertedPart); FreeWideString(wszUrl); /* Note that v6.0 and later don't return '?' with the query */ @@ -698,57 +661,47 @@ static void test_UrlGetPart(void) const char* short_url = "ascheme:"; CHAR szPart[INTERNET_MAX_URL_LENGTH]; + WCHAR bufW[5]; DWORD dwSize; HRESULT res; - if (!pUrlGetPartA) { - win_skip("UrlGetPartA not found\n"); - return; - } - - res = pUrlGetPartA(NULL, NULL, NULL, URL_PART_SCHEME, 0); + res = UrlGetPartA(NULL, NULL, NULL, URL_PART_SCHEME, 0); ok(res == E_INVALIDARG, "null params gave: 0x%08x\n", res); - res = pUrlGetPartA(NULL, szPart, &dwSize, URL_PART_SCHEME, 0); + res = UrlGetPartA(NULL, szPart, &dwSize, URL_PART_SCHEME, 0); ok(res == E_INVALIDARG, "null URL gave: 0x%08x\n", res); - res = pUrlGetPartA(res_url, NULL, &dwSize, URL_PART_SCHEME, 0); + res = UrlGetPartA(res_url, NULL, &dwSize, URL_PART_SCHEME, 0); ok(res == E_INVALIDARG, "null szPart gave: 0x%08x\n", res); - res = pUrlGetPartA(res_url, szPart, NULL, URL_PART_SCHEME, 0); + res = UrlGetPartA(res_url, szPart, NULL, URL_PART_SCHEME, 0); ok(res == E_INVALIDARG, "null URL gave: 0x%08x\n", res); dwSize = 0; szPart[0]='x'; szPart[1]=0; - res = pUrlGetPartA("hi", szPart, &dwSize, URL_PART_SCHEME, 0); + res = UrlGetPartA("hi", szPart, &dwSize, URL_PART_SCHEME, 0); ok(res == E_INVALIDARG, "UrlGetPartA(*pcchOut = 0) returned %08X\n", res); ok(szPart[0] == 'x' && szPart[1] == 0, "UrlGetPartA(*pcchOut = 0) modified szPart: \"%s\"\n", szPart); ok(dwSize == 0, "dwSize = %d\n", dwSize); dwSize = sizeof szPart; szPart[0]='x'; szPart[1]=0; - res = pUrlGetPartA("hi", szPart, &dwSize, URL_PART_SCHEME, 0); + res = UrlGetPartA("hi", szPart, &dwSize, URL_PART_SCHEME, 0); ok (res==S_FALSE, "UrlGetPartA(\"hi\") returned %08X\n", res); ok(szPart[0]==0, "UrlGetPartA(\"hi\") return \"%s\" instead of \"\"\n", szPart); ok(dwSize == 0, "dwSize = %d\n", dwSize); - if(pUrlGetPartW) - { - const WCHAR hiW[] = {'h','i',0}; - WCHAR bufW[5]; - - /* UrlGetPartW returns S_OK instead of S_FALSE */ - dwSize = sizeof szPart; - bufW[0]='x'; bufW[1]=0; - res = pUrlGetPartW(hiW, bufW, &dwSize, URL_PART_SCHEME, 0); - todo_wine ok(res==S_OK, "UrlGetPartW(\"hi\") returned %08X\n", res); - ok(bufW[0] == 0, "UrlGetPartW(\"hi\") return \"%c\"\n", bufW[0]); - ok(dwSize == 0, "dwSize = %d\n", dwSize); - } + /* UrlGetPartW returns S_OK instead of S_FALSE */ + dwSize = sizeof szPart; + bufW[0]='x'; bufW[1]=0; + res = UrlGetPartW(L"hi", bufW, &dwSize, URL_PART_SCHEME, 0); + todo_wine ok(res==S_OK, "UrlGetPartW(\"hi\") returned %08X\n", res); + ok(bufW[0] == 0, "UrlGetPartW(\"hi\") return \"%c\"\n", bufW[0]); + ok(dwSize == 0, "dwSize = %d\n", dwSize); dwSize = sizeof szPart; szPart[0]='x'; szPart[1]=0; - res = pUrlGetPartA("hi", szPart, &dwSize, URL_PART_QUERY, 0); + res = UrlGetPartA("hi", szPart, &dwSize, URL_PART_QUERY, 0); ok (res==S_FALSE, "UrlGetPartA(\"hi\") returned %08X\n", res); ok(szPart[0]==0, "UrlGetPartA(\"hi\") return \"%s\" instead of \"\"\n", szPart); ok(dwSize == 0, "dwSize = %d\n", dwSize); @@ -774,7 +727,7 @@ static void test_UrlGetPart(void) test_url_part(short_url, URL_PART_SCHEME, 0, "ascheme"); dwSize = sizeof(szPart); - res = pUrlGetPartA(about_url, szPart, &dwSize, URL_PART_HOSTNAME, 0); + res = UrlGetPartA(about_url, szPart, &dwSize, URL_PART_HOSTNAME, 0); ok(res==E_FAIL, "returned %08x\n", res); test_url_part(res_url, URL_PART_SCHEME, 0, "res"); @@ -782,52 +735,52 @@ static void test_UrlGetPart(void) dwSize = sizeof szPart; szPart[0]='x'; szPart[1]=0; - res = pUrlGetPartA(res_url, szPart, &dwSize, URL_PART_QUERY, 0); + res = UrlGetPartA(res_url, szPart, &dwSize, URL_PART_QUERY, 0); ok(res==S_FALSE, "UrlGetPartA returned %08X\n", res); ok(szPart[0]==0, "UrlGetPartA gave \"%s\" instead of \"\"\n", szPart); ok(dwSize == 0, "dwSize = %d\n", dwSize); dwSize = sizeof(szPart); - res = pUrlGetPartA("file://c:\\index.htm", szPart, &dwSize, URL_PART_HOSTNAME, 0); + res = UrlGetPartA("file://c:\\index.htm", szPart, &dwSize, URL_PART_HOSTNAME, 0); ok(res==S_FALSE, "returned %08x\n", res); ok(dwSize == 0, "dwSize = %d\n", dwSize); dwSize = sizeof(szPart); szPart[0] = 'x'; szPart[1] = '\0'; - res = pUrlGetPartA("file:some text", szPart, &dwSize, URL_PART_HOSTNAME, 0); + res = UrlGetPartA("file:some text", szPart, &dwSize, URL_PART_HOSTNAME, 0); ok(res==S_FALSE, "returned %08x\n", res); ok(szPart[0] == '\0', "szPart[0] = %c\n", szPart[0]); ok(dwSize == 0, "dwSize = %d\n", dwSize); dwSize = sizeof(szPart); szPart[0] = 'x'; szPart[1] = '\0'; - res = pUrlGetPartA("index.htm", szPart, &dwSize, URL_PART_HOSTNAME, 0); + res = UrlGetPartA("index.htm", szPart, &dwSize, URL_PART_HOSTNAME, 0); ok(res==E_FAIL, "returned %08x\n", res); dwSize = sizeof(szPart); szPart[0] = 'x'; szPart[1] = '\0'; - res = pUrlGetPartA(excid_url, szPart, &dwSize, URL_PART_HOSTNAME, 0); + res = UrlGetPartA(excid_url, szPart, &dwSize, URL_PART_HOSTNAME, 0); ok(res==E_FAIL, "returned %08x\n", res); ok(szPart[0] == 'x', "szPart[0] = %c\n", szPart[0]); ok(dwSize == sizeof(szPart), "dwSize = %d\n", dwSize); dwSize = sizeof(szPart); szPart[0] = 'x'; szPart[1] = '\0'; - res = pUrlGetPartA(excid_url, szPart, &dwSize, URL_PART_QUERY, 0); + res = UrlGetPartA(excid_url, szPart, &dwSize, URL_PART_QUERY, 0); ok(res==S_FALSE, "returned %08x\n", res); ok(szPart[0] == 0, "szPart[0] = %c\n", szPart[0]); ok(dwSize == 0, "dwSize = %d\n", dwSize); dwSize = sizeof(szPart); szPart[0] = 'x'; szPart[1] = '\0'; - res = pUrlGetPartA(foo_url, szPart, &dwSize, URL_PART_HOSTNAME, 0); + res = UrlGetPartA(foo_url, szPart, &dwSize, URL_PART_HOSTNAME, 0); ok(res==E_FAIL, "returned %08x\n", res); ok(szPart[0] == 'x', "szPart[0] = %c\n", szPart[0]); ok(dwSize == sizeof(szPart), "dwSize = %d\n", dwSize); dwSize = sizeof(szPart); szPart[0] = 'x'; szPart[1] = '\0'; - res = pUrlGetPartA(foo_url, szPart, &dwSize, URL_PART_QUERY, 0); + res = UrlGetPartA(foo_url, szPart, &dwSize, URL_PART_QUERY, 0); ok(res==S_FALSE, "returned %08x\n", res); ok(szPart[0] == 0, "szPart[0] = %c\n", szPart[0]); ok(dwSize == 0, "dwSize = %d\n", dwSize); @@ -846,28 +799,26 @@ static void test_url_canonicalize(int index, const char *szUrl, DWORD dwFlags, H DWORD dwSize; dwSize = INTERNET_MAX_URL_LENGTH; - ret = pUrlCanonicalizeA(szUrl, NULL, &dwSize, dwFlags); + ret = UrlCanonicalizeA(szUrl, NULL, &dwSize, dwFlags); ok(ret != dwExpectReturn, "got 0s%x: Unexpected return for NULL buffer, index %d\n", ret, index); - ret = pUrlCanonicalizeA(szUrl, szReturnUrl, &dwSize, dwFlags); + ret = UrlCanonicalizeA(szUrl, szReturnUrl, &dwSize, dwFlags); ok(ret == dwExpectReturn || ret == dwExpectReturnAlt, "UrlCanonicalizeA failed: expected=0x%08x or 0x%08x, got=0x%08x, index %d\n", dwExpectReturn, dwExpectReturnAlt, ret, index); todo_wine_if (todo) ok(strcmp(szReturnUrl,szExpectUrl)==0, "UrlCanonicalizeA dwFlags 0x%08x url '%s' Expected \"%s\", but got \"%s\", index %d\n", dwFlags, szUrl, szExpectUrl, szReturnUrl, index); - if (pUrlCanonicalizeW) { - dwSize = INTERNET_MAX_URL_LENGTH; - ret = pUrlCanonicalizeW(wszUrl, NULL, &dwSize, dwFlags); - ok(ret != dwExpectReturn, "got 0x%x: Unexpected return for NULL buffer, index %d\n", ret, index); - ret = pUrlCanonicalizeW(wszUrl, wszReturnUrl, &dwSize, dwFlags); - ok(ret == dwExpectReturn, "UrlCanonicalizeW failed: expected 0x%08x, got 0x%x, index %d\n", - dwExpectReturn, ret, index); + dwSize = INTERNET_MAX_URL_LENGTH; + ret = UrlCanonicalizeW(wszUrl, NULL, &dwSize, dwFlags); + ok(ret != dwExpectReturn, "got 0x%x: Unexpected return for NULL buffer, index %d\n", ret, index); + ret = UrlCanonicalizeW(wszUrl, wszReturnUrl, &dwSize, dwFlags); + ok(ret == dwExpectReturn, "UrlCanonicalizeW failed: expected 0x%08x, got 0x%x, index %d\n", + dwExpectReturn, ret, index); - wszConvertedUrl = GetWideString(szReturnUrl); - ok(lstrcmpW(wszReturnUrl, wszConvertedUrl)==0, - "Strings didn't match between ansi and unicode UrlCanonicalize, index %d!\n", index); - FreeWideString(wszConvertedUrl); - } + wszConvertedUrl = GetWideString(szReturnUrl); + ok(lstrcmpW(wszReturnUrl, wszConvertedUrl)==0, + "Strings didn't match between ansi and unicode UrlCanonicalize, index %d!\n", index); + FreeWideString(wszConvertedUrl); FreeWideString(wszUrl); FreeWideString(wszExpectUrl); @@ -881,40 +832,35 @@ static void test_UrlEscapeA(void) unsigned int i; char empty_string[] = ""; - if (!pUrlEscapeA) { - win_skip("UrlEscapeA not found\n"); - return; - } - - ret = pUrlEscapeA("/woningplan/woonkamer basis.swf", NULL, &size, URL_ESCAPE_SPACES_ONLY); + ret = UrlEscapeA("/woningplan/woonkamer basis.swf", NULL, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); ok(size == 0, "got %d, expected %d\n", size, 0); size = 0; - ret = pUrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_SPACES_ONLY); + ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); ok(size == 0, "got %d, expected %d\n", size, 0); size = 1; - ret = pUrlEscapeA("/woningplan/woonkamer basis.swf", NULL, &size, URL_ESCAPE_SPACES_ONLY); + ret = UrlEscapeA("/woningplan/woonkamer basis.swf", NULL, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); ok(size == 1, "got %d, expected %d\n", size, 1); size = 1; - ret = pUrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, NULL, URL_ESCAPE_SPACES_ONLY); + ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, NULL, URL_ESCAPE_SPACES_ONLY); ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); ok(size == 1, "got %d, expected %d\n", size, 1); size = 1; empty_string[0] = 127; - ret = pUrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_SPACES_ONLY); + ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); ok(size == 34, "got %d, expected %d\n", size, 34); ok(empty_string[0] == 127, "String has changed, empty_string[0] = %d\n", empty_string[0]); size = 1; empty_string[0] = 127; - ret = pUrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_AS_UTF8); + ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_AS_UTF8); ok(ret == E_NOTIMPL || broken(ret == E_POINTER), /* < Win7/Win2k8 */ "got %x, expected %x\n", ret, E_NOTIMPL); ok(size == 1 || broken(size == 34), /* < Win7/Win2k8 */ @@ -925,7 +871,7 @@ static void test_UrlEscapeA(void) CHAR ret_url[INTERNET_MAX_URL_LENGTH]; size = INTERNET_MAX_URL_LENGTH; - ret = pUrlEscapeA(TEST_ESCAPE[i].url, ret_url, &size, TEST_ESCAPE[i].flags); + ret = UrlEscapeA(TEST_ESCAPE[i].url, ret_url, &size, TEST_ESCAPE[i].flags); ok(ret == TEST_ESCAPE[i].expectret, "UrlEscapeA returned 0x%08x instead of 0x%08x for \"%s\"\n", ret, TEST_ESCAPE[i].expectret, TEST_ESCAPE[i].url); ok(!strcmp(ret_url, TEST_ESCAPE[i].expecturl), "Expected \"%s\", but got \"%s\" for \"%s\"\n", @@ -947,11 +893,6 @@ static void test_UrlEscapeW(void) WCHAR wc; int i; - if (!pUrlEscapeW) { - win_skip("UrlEscapeW not found\n"); - return; - } - /* Check error paths */ ret = UrlEscapeW(path_test, NULL, NULL, URL_ESCAPE_SPACES_ONLY); @@ -989,21 +930,21 @@ static void test_UrlEscapeW(void) /* Check actual escaping */ size = ARRAY_SIZE(overwrite); - ret = pUrlEscapeW(overwrite, overwrite, &size, URL_ESCAPE_SPACES_ONLY); + ret = UrlEscapeW(overwrite, overwrite, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == S_OK, "got %x, expected S_OK\n", ret); ok(size == 9, "got %d, expected 9\n", size); ok(!lstrcmpW(overwrite, out), "got %s, expected %s\n", wine_dbgstr_w(overwrite), wine_dbgstr_w(out)); size = 1; wc = 127; - ret = pUrlEscapeW(overwrite, &wc, &size, URL_ESCAPE_SPACES_ONLY); + ret = UrlEscapeW(overwrite, &wc, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); ok(size == 10, "got %d, expected 10\n", size); ok(wc == 127, "String has changed, wc = %d\n", wc); /* non-ASCII range */ size = ARRAY_SIZE(ret_urlW); - ret = pUrlEscapeW(naW, ret_urlW, &size, 0); + ret = UrlEscapeW(naW, ret_urlW, &size, 0); ok(ret == S_OK, "got %x, expected S_OK\n", ret); ok(!lstrcmpW(naescapedW, ret_urlW), "got %s, expected %s\n", wine_dbgstr_w(ret_urlW), wine_dbgstr_w(naescapedW)); @@ -1014,7 +955,7 @@ static void test_UrlEscapeW(void) size = INTERNET_MAX_URL_LENGTH; urlW = GetWideString(TEST_ESCAPE[i].url); expected_urlW = GetWideString(TEST_ESCAPE[i].expecturl); - ret = pUrlEscapeW(urlW, ret_urlW, &size, TEST_ESCAPE[i].flags); + ret = UrlEscapeW(urlW, ret_urlW, &size, TEST_ESCAPE[i].flags); ok(ret == TEST_ESCAPE[i].expectret, "UrlEscapeW returned 0x%08x instead of 0x%08x for %s\n", ret, TEST_ESCAPE[i].expectret, wine_dbgstr_w(urlW)); ok(!lstrcmpW(ret_urlW, expected_urlW), "Expected %s, but got %s for %s flags %08x\n", @@ -1027,7 +968,7 @@ static void test_UrlEscapeW(void) WCHAR ret_url[INTERNET_MAX_URL_LENGTH]; size = INTERNET_MAX_URL_LENGTH; - ret = pUrlEscapeW(TEST_ESCAPEW[i].url, ret_url, &size, TEST_ESCAPEW[i].flags); + ret = UrlEscapeW(TEST_ESCAPEW[i].url, ret_url, &size, TEST_ESCAPEW[i].flags); ok(ret == TEST_ESCAPEW[i].expectret, "UrlEscapeW returned 0x%08x instead of 0x%08x for \"%s\"\n", ret, TEST_ESCAPEW[i].expectret, wine_dbgstr_w(TEST_ESCAPEW[i].url)); ok(!lstrcmpW(ret_url, TEST_ESCAPEW[i].expecturl) || @@ -1050,27 +991,22 @@ static void test_UrlCanonicalizeA(void) DWORD urllen; HRESULT hr; - if (!pUrlCanonicalizeA) { - win_skip("UrlCanonicalizeA not found\n"); - return; - } - urllen = lstrlenA(winehqA); /* Parameter checks */ dwSize = ARRAY_SIZE(szReturnUrl); - hr = pUrlCanonicalizeA(NULL, szReturnUrl, &dwSize, URL_UNESCAPE); + hr = UrlCanonicalizeA(NULL, szReturnUrl, &dwSize, URL_UNESCAPE); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); dwSize = ARRAY_SIZE(szReturnUrl); - hr = pUrlCanonicalizeA(winehqA, NULL, &dwSize, URL_UNESCAPE); + hr = UrlCanonicalizeA(winehqA, NULL, &dwSize, URL_UNESCAPE); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - hr = pUrlCanonicalizeA(winehqA, szReturnUrl, NULL, URL_UNESCAPE); + hr = UrlCanonicalizeA(winehqA, szReturnUrl, NULL, URL_UNESCAPE); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); dwSize = 0; - hr = pUrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_UNESCAPE); + hr = UrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_UNESCAPE); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); /* buffer has no space for the result */ @@ -1078,7 +1014,7 @@ static void test_UrlCanonicalizeA(void) memset(szReturnUrl, '#', urllen+4); szReturnUrl[urllen+4] = '\0'; SetLastError(0xdeadbeef); - hr = pUrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = UrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok( (hr == E_POINTER) && (dwSize == (urllen + 1)), "got 0x%x with %u and size %u for '%s' and %u (expected 'E_POINTER' and size %u)\n", hr, GetLastError(), dwSize, szReturnUrl, lstrlenA(szReturnUrl), urllen+1); @@ -1088,7 +1024,7 @@ static void test_UrlCanonicalizeA(void) memset(szReturnUrl, '#', urllen+4); szReturnUrl[urllen+4] = '\0'; SetLastError(0xdeadbeef); - hr = pUrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = UrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok( (hr == E_POINTER) && (dwSize == (urllen + 1)), "got 0x%x with %u and size %u for '%s' and %u (expected 'E_POINTER' and size %u)\n", hr, GetLastError(), dwSize, szReturnUrl, lstrlenA(szReturnUrl), urllen+1); @@ -1098,7 +1034,7 @@ static void test_UrlCanonicalizeA(void) memset(szReturnUrl, '#', urllen+4); szReturnUrl[urllen+4] = '\0'; SetLastError(0xdeadbeef); - hr = pUrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = UrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok( (hr == S_OK) && (dwSize == urllen), "got 0x%x with %u and size %u for '%s' and %u (expected 'S_OK' and size %u)\n", hr, GetLastError(), dwSize, szReturnUrl, lstrlenA(szReturnUrl), urllen); @@ -1108,7 +1044,7 @@ static void test_UrlCanonicalizeA(void) memset(szReturnUrl, '#', urllen+4); szReturnUrl[urllen+4] = '\0'; SetLastError(0xdeadbeef); - hr = pUrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = UrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok( (hr == S_OK) && (dwSize == urllen), "got 0x%x with %u and size %u for '%s' and %u (expected 'S_OK' and size %u)\n", hr, GetLastError(), dwSize, szReturnUrl, lstrlenA(szReturnUrl), urllen); @@ -1118,7 +1054,7 @@ static void test_UrlCanonicalizeA(void) memset(szReturnUrl, '#', urllen+4); szReturnUrl[urllen+4] = '\0'; SetLastError(0xdeadbeef); - hr = pUrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = UrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok( (hr == E_INVALIDARG) && (dwSize == 0), "got 0x%x with %u and size %u for '%s' and %u (expected 'E_INVALIDARG' and size %u)\n", hr, GetLastError(), dwSize, szReturnUrl, lstrlenA(szReturnUrl), 0); @@ -1128,7 +1064,7 @@ static void test_UrlCanonicalizeA(void) memset(longurl, 'a', sizeof(longurl)); memcpy(longurl, winehqA, sizeof(winehqA)-1); longurl[sizeof(longurl)-1] = '\0'; - hr = pUrlCanonicalizeA(longurl, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = UrlCanonicalizeA(longurl, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok(hr == S_OK, "hr = %x\n", hr); test_url_canonicalize(-1, "", 0, S_OK, S_FALSE /* Vista/win2k8 */, "", FALSE); @@ -1151,27 +1087,22 @@ static void test_UrlCanonicalizeW(void) HRESULT hr; int i; - - if (!pUrlCanonicalizeW) { - win_skip("UrlCanonicalizeW not found\n"); - return; - } urllen = lstrlenW(winehqW); /* Parameter checks */ dwSize = ARRAY_SIZE(szReturnUrl); - hr = pUrlCanonicalizeW(NULL, szReturnUrl, &dwSize, URL_UNESCAPE); + hr = UrlCanonicalizeW(NULL, szReturnUrl, &dwSize, URL_UNESCAPE); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); dwSize = ARRAY_SIZE(szReturnUrl); - hr = pUrlCanonicalizeW(winehqW, NULL, &dwSize, URL_UNESCAPE); + hr = UrlCanonicalizeW(winehqW, NULL, &dwSize, URL_UNESCAPE); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - hr = pUrlCanonicalizeW(winehqW, szReturnUrl, NULL, URL_UNESCAPE); + hr = UrlCanonicalizeW(winehqW, szReturnUrl, NULL, URL_UNESCAPE); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); dwSize = 0; - hr = pUrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_UNESCAPE); + hr = UrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_UNESCAPE); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); /* buffer has no space for the result */ @@ -1179,7 +1110,7 @@ static void test_UrlCanonicalizeW(void) memset(szReturnUrl, '#', (urllen+4) * sizeof(WCHAR)); szReturnUrl[urllen+4] = '\0'; SetLastError(0xdeadbeef); - hr = pUrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = UrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok( (hr == E_POINTER) && (dwSize == (urllen + 1)), "got 0x%x with %u and size %u for %u (expected 'E_POINTER' and size %u)\n", hr, GetLastError(), dwSize, lstrlenW(szReturnUrl), urllen+1); @@ -1190,7 +1121,7 @@ static void test_UrlCanonicalizeW(void) memset(szReturnUrl, '#', (urllen+4) * sizeof(WCHAR)); szReturnUrl[urllen+4] = '\0'; SetLastError(0xdeadbeef); - hr = pUrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = UrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok( (hr == E_POINTER) && (dwSize == (urllen + 1)), "got 0x%x with %u and size %u for %u (expected 'E_POINTER' and size %u)\n", hr, GetLastError(), dwSize, lstrlenW(szReturnUrl), urllen+1); @@ -1200,7 +1131,7 @@ static void test_UrlCanonicalizeW(void) memset(szReturnUrl, '#', (urllen+4) * sizeof(WCHAR)); szReturnUrl[urllen+4] = '\0'; SetLastError(0xdeadbeef); - hr = pUrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = UrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok( (hr == S_OK) && (dwSize == urllen), "got 0x%x with %u and size %u for %u (expected 'S_OK' and size %u)\n", hr, GetLastError(), dwSize, lstrlenW(szReturnUrl), urllen); @@ -1210,7 +1141,7 @@ static void test_UrlCanonicalizeW(void) memset(szReturnUrl, '#', (urllen+4) * sizeof(WCHAR)); szReturnUrl[urllen+4] = '\0'; SetLastError(0xdeadbeef); - hr = pUrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); + hr = UrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE); ok( (hr == S_OK) && (dwSize == urllen), "got 0x%x with %u and size %u for %u (expected 'S_OK' and size %u)\n", hr, GetLastError(), dwSize, lstrlenW(szReturnUrl), urllen); @@ -1226,7 +1157,7 @@ static void test_UrlCanonicalizeW(void) pos = lstrlenW(szUrl) - 1; szUrl[pos] = i; urllen = INTERNET_MAX_URL_LENGTH; - pUrlCanonicalizeW(szUrl, szReturnUrl, &urllen, 0); + UrlCanonicalizeW(szUrl, szReturnUrl, &urllen, 0); choped = lstrlenW(szReturnUrl) < lstrlenW(szUrl); ok(choped == (i <= 32), "Incorrect char chopping for char %d\n", i); } @@ -1244,54 +1175,47 @@ static void test_url_combine(const char *szUrl1, const char *szUrl2, DWORD dwFla DWORD dwSize; DWORD dwExpectLen = lstrlenA(szExpectUrl); - if (!pUrlCombineA) { - win_skip("UrlCombineA not found\n"); - return; - } - wszUrl1 = GetWideString(szUrl1); wszUrl2 = GetWideString(szUrl2); wszExpectUrl = GetWideString(szExpectUrl); - hr = pUrlCombineA(szUrl1, szUrl2, NULL, NULL, dwFlags); + hr = UrlCombineA(szUrl1, szUrl2, NULL, NULL, dwFlags); ok(hr == E_INVALIDARG, "UrlCombineA returned 0x%08x, expected 0x%08x\n", hr, E_INVALIDARG); dwSize = 0; - hr = pUrlCombineA(szUrl1, szUrl2, NULL, &dwSize, dwFlags); + hr = UrlCombineA(szUrl1, szUrl2, NULL, &dwSize, dwFlags); ok(hr == E_POINTER, "Checking length of string, return was 0x%08x, expected 0x%08x\n", hr, E_POINTER); ok(dwSize == dwExpectLen+1, "Got length %d, expected %d\n", dwSize, dwExpectLen+1); dwSize--; - hr = pUrlCombineA(szUrl1, szUrl2, szReturnUrl, &dwSize, dwFlags); + hr = UrlCombineA(szUrl1, szUrl2, szReturnUrl, &dwSize, dwFlags); ok(hr == E_POINTER, "UrlCombineA returned 0x%08x, expected 0x%08x\n", hr, E_POINTER); ok(dwSize == dwExpectLen+1, "Got length %d, expected %d\n", dwSize, dwExpectLen+1); - hr = pUrlCombineA(szUrl1, szUrl2, szReturnUrl, &dwSize, dwFlags); + hr = UrlCombineA(szUrl1, szUrl2, szReturnUrl, &dwSize, dwFlags); ok(hr == dwExpectReturn, "UrlCombineA returned 0x%08x, expected 0x%08x\n", hr, dwExpectReturn); ok(dwSize == dwExpectLen, "Got length %d, expected %d\n", dwSize, dwExpectLen); if(SUCCEEDED(hr)) { ok(strcmp(szReturnUrl,szExpectUrl)==0, "Expected %s, but got %s\n", szExpectUrl, szReturnUrl); } - if (pUrlCombineW) { - dwSize = 0; - hr = pUrlCombineW(wszUrl1, wszUrl2, NULL, &dwSize, dwFlags); - ok(hr == E_POINTER, "Checking length of string, return was 0x%08x, expected 0x%08x\n", hr, E_POINTER); - ok(dwSize == dwExpectLen+1, "Got length %d, expected %d\n", dwSize, dwExpectLen+1); + dwSize = 0; + hr = UrlCombineW(wszUrl1, wszUrl2, NULL, &dwSize, dwFlags); + ok(hr == E_POINTER, "Checking length of string, return was 0x%08x, expected 0x%08x\n", hr, E_POINTER); + ok(dwSize == dwExpectLen+1, "Got length %d, expected %d\n", dwSize, dwExpectLen+1); - dwSize--; - hr = pUrlCombineW(wszUrl1, wszUrl2, wszReturnUrl, &dwSize, dwFlags); - ok(hr == E_POINTER, "UrlCombineW returned 0x%08x, expected 0x%08x\n", hr, E_POINTER); - ok(dwSize == dwExpectLen+1, "Got length %d, expected %d\n", dwSize, dwExpectLen+1); + dwSize--; + hr = UrlCombineW(wszUrl1, wszUrl2, wszReturnUrl, &dwSize, dwFlags); + ok(hr == E_POINTER, "UrlCombineW returned 0x%08x, expected 0x%08x\n", hr, E_POINTER); + ok(dwSize == dwExpectLen+1, "Got length %d, expected %d\n", dwSize, dwExpectLen+1); - hr = pUrlCombineW(wszUrl1, wszUrl2, wszReturnUrl, &dwSize, dwFlags); - ok(hr == dwExpectReturn, "UrlCombineW returned 0x%08x, expected 0x%08x\n", hr, dwExpectReturn); - ok(dwSize == dwExpectLen, "Got length %d, expected %d\n", dwSize, dwExpectLen); - if(SUCCEEDED(hr)) { - wszConvertedUrl = GetWideString(szReturnUrl); - ok(lstrcmpW(wszReturnUrl, wszConvertedUrl)==0, "Strings didn't match between ansi and unicode UrlCombine!\n"); - FreeWideString(wszConvertedUrl); - } + hr = UrlCombineW(wszUrl1, wszUrl2, wszReturnUrl, &dwSize, dwFlags); + ok(hr == dwExpectReturn, "UrlCombineW returned 0x%08x, expected 0x%08x\n", hr, dwExpectReturn); + ok(dwSize == dwExpectLen, "Got length %d, expected %d\n", dwSize, dwExpectLen); + if(SUCCEEDED(hr)) { + wszConvertedUrl = GetWideString(szReturnUrl); + ok(lstrcmpW(wszReturnUrl, wszConvertedUrl)==0, "Strings didn't match between ansi and unicode UrlCombine!\n"); + FreeWideString(wszConvertedUrl); } FreeWideString(wszUrl1); @@ -1320,32 +1244,25 @@ static void test_UrlCreateFromPath(void) WCHAR ret_urlW[INTERNET_MAX_URL_LENGTH]; WCHAR *pathW, *urlW; - if (!pUrlCreateFromPathA) { - win_skip("UrlCreateFromPathA not found\n"); - return; - } - for (i = 0; i < ARRAY_SIZE(TEST_URLFROMPATH); i++) { len = INTERNET_MAX_URL_LENGTH; - ret = pUrlCreateFromPathA(TEST_URLFROMPATH[i].path, ret_url, &len, 0); + ret = UrlCreateFromPathA(TEST_URLFROMPATH[i].path, ret_url, &len, 0); ok(ret == TEST_URLFROMPATH[i].ret, "ret %08x from path %s\n", ret, TEST_URLFROMPATH[i].path); ok(!lstrcmpiA(ret_url, TEST_URLFROMPATH[i].url), "url %s from path %s\n", ret_url, TEST_URLFROMPATH[i].path); ok(len == strlen(ret_url), "ret len %d from path %s\n", len, TEST_URLFROMPATH[i].path); - if (pUrlCreateFromPathW) { - len = INTERNET_MAX_URL_LENGTH; - pathW = GetWideString(TEST_URLFROMPATH[i].path); - urlW = GetWideString(TEST_URLFROMPATH[i].url); - ret = pUrlCreateFromPathW(pathW, ret_urlW, &len, 0); - WideCharToMultiByte(CP_ACP, 0, ret_urlW, -1, ret_url, sizeof(ret_url),0,0); - ok(ret == TEST_URLFROMPATH[i].ret, "ret %08x from path L\"%s\", expected %08x\n", - ret, TEST_URLFROMPATH[i].path, TEST_URLFROMPATH[i].ret); - ok(!lstrcmpiW(ret_urlW, urlW), "got %s expected %s from path L\"%s\"\n", - ret_url, TEST_URLFROMPATH[i].url, TEST_URLFROMPATH[i].path); - ok(len == lstrlenW(ret_urlW), "ret len %d from path L\"%s\"\n", len, TEST_URLFROMPATH[i].path); - FreeWideString(urlW); - FreeWideString(pathW); - } + len = INTERNET_MAX_URL_LENGTH; + pathW = GetWideString(TEST_URLFROMPATH[i].path); + urlW = GetWideString(TEST_URLFROMPATH[i].url); + ret = UrlCreateFromPathW(pathW, ret_urlW, &len, 0); + WideCharToMultiByte(CP_ACP, 0, ret_urlW, -1, ret_url, sizeof(ret_url),0,0); + ok(ret == TEST_URLFROMPATH[i].ret, "ret %08x from path L\"%s\", expected %08x\n", + ret, TEST_URLFROMPATH[i].path, TEST_URLFROMPATH[i].ret); + ok(!lstrcmpiW(ret_urlW, urlW), "got %s expected %s from path L\"%s\"\n", + ret_url, TEST_URLFROMPATH[i].url, TEST_URLFROMPATH[i].path); + ok(len == lstrlenW(ret_urlW), "ret len %d from path L\"%s\"\n", len, TEST_URLFROMPATH[i].path); + FreeWideString(urlW); + FreeWideString(pathW); } } @@ -1354,9 +1271,9 @@ static void test_UrlCreateFromPath(void) static void test_UrlIs_null(DWORD flag) { BOOL ret; - ret = pUrlIsA(NULL, flag); + ret = UrlIsA(NULL, flag); ok(ret == FALSE, "pUrlIsA(NULL, %d) failed\n", flag); - ret = pUrlIsW(NULL, flag); + ret = UrlIsW(NULL, flag); ok(ret == FALSE, "pUrlIsW(NULL, %d) failed\n", flag); } @@ -1366,11 +1283,6 @@ static void test_UrlIs(void) size_t i; WCHAR wurl[80]; - if (!pUrlIsA) { - win_skip("UrlIsA not found\n"); - return; - } - test_UrlIs_null(URLIS_APPLIABLE); test_UrlIs_null(URLIS_DIRECTORY); test_UrlIs_null(URLIS_FILEURL); @@ -1382,40 +1294,36 @@ static void test_UrlIs(void) for (i = 0; i < ARRAY_SIZE(TEST_PATH_IS_URL); i++) { MultiByteToWideChar(CP_ACP, 0, TEST_PATH_IS_URL[i].path, -1, wurl, ARRAY_SIZE(wurl)); - ret = pUrlIsA( TEST_PATH_IS_URL[i].path, URLIS_URL ); + ret = UrlIsA( TEST_PATH_IS_URL[i].path, URLIS_URL ); ok( ret == TEST_PATH_IS_URL[i].expect, "returned %d from path %s, expected %d\n", ret, TEST_PATH_IS_URL[i].path, TEST_PATH_IS_URL[i].expect ); - if (pUrlIsW) { - ret = pUrlIsW( wurl, URLIS_URL ); - ok( ret == TEST_PATH_IS_URL[i].expect, - "returned %d from path (UrlIsW) %s, expected %d\n", ret, - TEST_PATH_IS_URL[i].path, TEST_PATH_IS_URL[i].expect ); - } + ret = UrlIsW( wurl, URLIS_URL ); + ok( ret == TEST_PATH_IS_URL[i].expect, + "returned %d from path (UrlIsW) %s, expected %d\n", ret, + TEST_PATH_IS_URL[i].path, TEST_PATH_IS_URL[i].expect ); } for (i = 0; i < ARRAY_SIZE(TEST_URLIS_ATTRIBS); i++) { MultiByteToWideChar(CP_ACP, 0, TEST_URLIS_ATTRIBS[i].url, -1, wurl, ARRAY_SIZE(wurl)); - ret = pUrlIsA( TEST_URLIS_ATTRIBS[i].url, URLIS_OPAQUE); + ret = UrlIsA( TEST_URLIS_ATTRIBS[i].url, URLIS_OPAQUE); ok( ret == TEST_URLIS_ATTRIBS[i].expectOpaque, "returned %d for URLIS_OPAQUE, url \"%s\", expected %d\n", ret, TEST_URLIS_ATTRIBS[i].url, TEST_URLIS_ATTRIBS[i].expectOpaque ); - ret = pUrlIsA( TEST_URLIS_ATTRIBS[i].url, URLIS_FILEURL); + ret = UrlIsA( TEST_URLIS_ATTRIBS[i].url, URLIS_FILEURL); ok( ret == TEST_URLIS_ATTRIBS[i].expectFile, "returned %d for URLIS_FILEURL, url \"%s\", expected %d\n", ret, TEST_URLIS_ATTRIBS[i].url, TEST_URLIS_ATTRIBS[i].expectFile ); - if (pUrlIsW) { - ret = pUrlIsW( wurl, URLIS_OPAQUE); - ok( ret == TEST_URLIS_ATTRIBS[i].expectOpaque, - "returned %d for URLIS_OPAQUE (UrlIsW), url \"%s\", expected %d\n", - ret, TEST_URLIS_ATTRIBS[i].url, TEST_URLIS_ATTRIBS[i].expectOpaque ); - ret = pUrlIsW( wurl, URLIS_FILEURL); - ok( ret == TEST_URLIS_ATTRIBS[i].expectFile, - "returned %d for URLIS_FILEURL (UrlIsW), url \"%s\", expected %d\n", - ret, TEST_URLIS_ATTRIBS[i].url, TEST_URLIS_ATTRIBS[i].expectFile ); - } + ret = UrlIsW( wurl, URLIS_OPAQUE); + ok( ret == TEST_URLIS_ATTRIBS[i].expectOpaque, + "returned %d for URLIS_OPAQUE (UrlIsW), url \"%s\", expected %d\n", + ret, TEST_URLIS_ATTRIBS[i].url, TEST_URLIS_ATTRIBS[i].expectOpaque ); + ret = UrlIsW( wurl, URLIS_FILEURL); + ok( ret == TEST_URLIS_ATTRIBS[i].expectFile, + "returned %d for URLIS_FILEURL (UrlIsW), url \"%s\", expected %d\n", + ret, TEST_URLIS_ATTRIBS[i].url, TEST_URLIS_ATTRIBS[i].expectFile ); } } @@ -1436,13 +1344,9 @@ static void test_UrlUnescape(void) 'C',':','/','P','r','o','g','r','a','m','%','2','0','F','i','l','e','s',0}; HRESULT res; - if (!pUrlUnescapeA) { - win_skip("UrlUnescapeA not found\n"); - return; - } for (i = 0; i < ARRAY_SIZE(TEST_URL_UNESCAPE); i++) { dwEscaped=INTERNET_MAX_URL_LENGTH; - res = pUrlUnescapeA(TEST_URL_UNESCAPE[i].url, szReturnUrl, &dwEscaped, 0); + res = UrlUnescapeA(TEST_URL_UNESCAPE[i].url, szReturnUrl, &dwEscaped, 0); ok(res == S_OK, "UrlUnescapeA returned 0x%x (expected S_OK) for \"%s\"\n", res, TEST_URL_UNESCAPE[i].url); @@ -1450,53 +1354,49 @@ static void test_UrlUnescape(void) ZeroMemory(szReturnUrl, sizeof(szReturnUrl)); /* if we set the buffer pointer to NULL here, UrlUnescape fails and the string is not converted */ - res = pUrlUnescapeA(TEST_URL_UNESCAPE[i].url, szReturnUrl, NULL, 0); + res = UrlUnescapeA(TEST_URL_UNESCAPE[i].url, szReturnUrl, NULL, 0); ok(res == E_INVALIDARG, "UrlUnescapeA returned 0x%x (expected E_INVALIDARG) for \"%s\"\n", res, TEST_URL_UNESCAPE[i].url); ok(strcmp(szReturnUrl,"")==0, "Expected empty string\n"); - if (pUrlUnescapeW) { - dwEscaped = INTERNET_MAX_URL_LENGTH; - urlW = GetWideString(TEST_URL_UNESCAPE[i].url); - expected_urlW = GetWideString(TEST_URL_UNESCAPE[i].expect); - res = pUrlUnescapeW(urlW, ret_urlW, &dwEscaped, 0); - ok(res == S_OK, - "UrlUnescapeW returned 0x%x (expected S_OK) for \"%s\"\n", - res, TEST_URL_UNESCAPE[i].url); + dwEscaped = INTERNET_MAX_URL_LENGTH; + urlW = GetWideString(TEST_URL_UNESCAPE[i].url); + expected_urlW = GetWideString(TEST_URL_UNESCAPE[i].expect); + res = UrlUnescapeW(urlW, ret_urlW, &dwEscaped, 0); + ok(res == S_OK, + "UrlUnescapeW returned 0x%x (expected S_OK) for \"%s\"\n", + res, TEST_URL_UNESCAPE[i].url); - WideCharToMultiByte(CP_ACP,0,ret_urlW,-1,szReturnUrl,INTERNET_MAX_URL_LENGTH,0,0); - ok(lstrcmpW(ret_urlW, expected_urlW)==0, - "Expected \"%s\", but got \"%s\" from \"%s\" flags %08lx\n", - TEST_URL_UNESCAPE[i].expect, szReturnUrl, TEST_URL_UNESCAPE[i].url, 0L); - FreeWideString(urlW); - FreeWideString(expected_urlW); - } + WideCharToMultiByte(CP_ACP,0,ret_urlW,-1,szReturnUrl,INTERNET_MAX_URL_LENGTH,0,0); + ok(lstrcmpW(ret_urlW, expected_urlW)==0, + "Expected \"%s\", but got \"%s\" from \"%s\" flags %08lx\n", + TEST_URL_UNESCAPE[i].expect, szReturnUrl, TEST_URL_UNESCAPE[i].url, 0L); + FreeWideString(urlW); + FreeWideString(expected_urlW); } dwEscaped = sizeof(inplace); - res = pUrlUnescapeA(inplace, NULL, &dwEscaped, URL_UNESCAPE_INPLACE); + res = UrlUnescapeA(inplace, NULL, &dwEscaped, URL_UNESCAPE_INPLACE); ok(res == S_OK, "UrlUnescapeA returned 0x%x (expected S_OK)\n", res); ok(!strcmp(inplace, expected), "got %s expected %s\n", inplace, expected); ok(dwEscaped == 27, "got %d expected 27\n", dwEscaped); /* if we set the buffer pointer to NULL, the string apparently still gets converted (Google Lively does this) */ - res = pUrlUnescapeA(another_inplace, NULL, NULL, URL_UNESCAPE_INPLACE); + res = UrlUnescapeA(another_inplace, NULL, NULL, URL_UNESCAPE_INPLACE); ok(res == S_OK, "UrlUnescapeA returned 0x%x (expected S_OK)\n", res); ok(!strcmp(another_inplace, expected), "got %s expected %s\n", another_inplace, expected); - if (pUrlUnescapeW) { - dwEscaped = sizeof(inplaceW); - res = pUrlUnescapeW(inplaceW, NULL, &dwEscaped, URL_UNESCAPE_INPLACE); - ok(res == S_OK, "UrlUnescapeW returned 0x%x (expected S_OK)\n", res); - ok(dwEscaped == 50, "got %d expected 50\n", dwEscaped); + dwEscaped = sizeof(inplaceW); + res = UrlUnescapeW(inplaceW, NULL, &dwEscaped, URL_UNESCAPE_INPLACE); + ok(res == S_OK, "UrlUnescapeW returned 0x%x (expected S_OK)\n", res); + ok(dwEscaped == 50, "got %d expected 50\n", dwEscaped); - /* if we set the buffer pointer to NULL, the string apparently still gets converted (Google Lively does this) */ - res = pUrlUnescapeW(another_inplaceW, NULL, NULL, URL_UNESCAPE_INPLACE); - ok(res == S_OK, "UrlUnescapeW returned 0x%x (expected S_OK)\n", res); + /* if we set the buffer pointer to NULL, the string apparently still gets converted (Google Lively does this) */ + res = UrlUnescapeW(another_inplaceW, NULL, NULL, URL_UNESCAPE_INPLACE); + ok(res == S_OK, "UrlUnescapeW returned 0x%x (expected S_OK)\n", res); - ok(lstrlenW(another_inplaceW) == 24, "got %d expected 24\n", lstrlenW(another_inplaceW)); - } + ok(lstrlenW(another_inplaceW) == 24, "got %d expected 24\n", lstrlenW(another_inplaceW)); } static const struct parse_url_test_t { @@ -1534,7 +1434,7 @@ static void test_ParseURL(void) for (test = parse_url_tests; test < parse_url_tests + ARRAY_SIZE(parse_url_tests); test++) { memset(&parseda, 0xd0, sizeof(parseda)); parseda.cbSize = sizeof(parseda); - hres = pParseURLA(test->url, &parseda); + hres = ParseURLA(test->url, &parseda); ok(hres == test->hres, "ParseURL failed: %08x, expected %08x\n", hres, test->hres); if(hres == S_OK) { ok(parseda.pszProtocol == test->url, "parseda.pszProtocol = %s, expected %s\n", @@ -1557,7 +1457,7 @@ static void test_ParseURL(void) memset(&parsedw, 0xd0, sizeof(parsedw)); parsedw.cbSize = sizeof(parsedw); - hres = pParseURLW(url, &parsedw); + hres = ParseURLW(url, &parsedw); ok(hres == test->hres, "ParseURL failed: %08x, expected %08x\n", hres, test->hres); if(hres == S_OK) { ok(parsedw.pszProtocol == url, "parsedw.pszProtocol = %s, expected %s\n", @@ -1598,36 +1498,36 @@ static void test_HashData(void) int i; /* Test hashing with identically sized input/output buffers. */ - res = pHashData(input, 16, output, 16); + res = HashData(input, 16, output, 16); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); if(res == S_OK) ok(!memcmp(output, expected, sizeof(expected)), "Output buffer did not match expected contents\n"); /* Test hashing with larger output buffer. */ - res = pHashData(input, 16, output, 32); + res = HashData(input, 16, output, 32); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); if(res == S_OK) ok(!memcmp(output, expected2, sizeof(expected2)), "Output buffer did not match expected contents\n"); /* Test hashing with smaller input buffer. */ - res = pHashData(input, 8, output, 16); + res = HashData(input, 8, output, 16); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); if(res == S_OK) ok(!memcmp(output, expected3, sizeof(expected3)), "Output buffer did not match expected contents\n"); /* Test passing NULL pointers for input/output parameters. */ - res = pHashData(NULL, 0, NULL, 0); + res = HashData(NULL, 0, NULL, 0); ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); - res = pHashData(input, 0, NULL, 0); + res = HashData(input, 0, NULL, 0); ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); - res = pHashData(NULL, 0, output, 0); + res = HashData(NULL, 0, output, 0); ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); @@ -1638,7 +1538,7 @@ static void test_HashData(void) for (i = 0; i < ARRAY_SIZE(output); i++) output[i] = 0xFF; - res = pHashData(input, 0, output, 0); + res = HashData(input, 0, output, 0); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); /* The buffers should be unchanged. */ @@ -1655,12 +1555,12 @@ static void test_HashData(void) } /* Input/output parameters are not validated. */ - res = pHashData((BYTE *)0xdeadbeef, 0, (BYTE *)0xdeadbeef, 0); + res = HashData((BYTE *)0xdeadbeef, 0, (BYTE *)0xdeadbeef, 0); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); if (0) { - res = pHashData((BYTE *)0xdeadbeef, 1, (BYTE *)0xdeadbeef, 1); + res = HashData((BYTE *)0xdeadbeef, 1, (BYTE *)0xdeadbeef, 1); trace("HashData returned 0x%08x\n", res); } } @@ -1669,39 +1569,6 @@ static void test_HashData(void) START_TEST(url) { - char *pFunc; - - hShlwapi = GetModuleHandleA("shlwapi.dll"); - - /* SHCreateStreamOnFileEx was introduced in shlwapi v6.0 */ - pFunc = (void*)GetProcAddress(hShlwapi, "SHCreateStreamOnFileEx"); - if(!pFunc){ - win_skip("Too old shlwapi version\n"); - return; - } - - pUrlUnescapeA = (void *) GetProcAddress(hShlwapi, "UrlUnescapeA"); - pUrlUnescapeW = (void *) GetProcAddress(hShlwapi, "UrlUnescapeW"); - pUrlIsA = (void *) GetProcAddress(hShlwapi, "UrlIsA"); - pUrlIsW = (void *) GetProcAddress(hShlwapi, "UrlIsW"); - pUrlHashA = (void *) GetProcAddress(hShlwapi, "UrlHashA"); - pUrlHashW = (void *) GetProcAddress(hShlwapi, "UrlHashW"); - pUrlGetPartA = (void *) GetProcAddress(hShlwapi, "UrlGetPartA"); - pUrlGetPartW = (void *) GetProcAddress(hShlwapi, "UrlGetPartW"); - pUrlEscapeA = (void *) GetProcAddress(hShlwapi, "UrlEscapeA"); - pUrlEscapeW = (void *) GetProcAddress(hShlwapi, "UrlEscapeW"); - pUrlCreateFromPathA = (void *) GetProcAddress(hShlwapi, "UrlCreateFromPathA"); - pUrlCreateFromPathW = (void *) GetProcAddress(hShlwapi, "UrlCreateFromPathW"); - pUrlCombineA = (void *) GetProcAddress(hShlwapi, "UrlCombineA"); - pUrlCombineW = (void *) GetProcAddress(hShlwapi, "UrlCombineW"); - pUrlCanonicalizeA = (void *) GetProcAddress(hShlwapi, "UrlCanonicalizeA"); - pUrlCanonicalizeW = (void *) GetProcAddress(hShlwapi, "UrlCanonicalizeW"); - pUrlApplySchemeA = (void *) GetProcAddress(hShlwapi, "UrlApplySchemeA"); - pUrlApplySchemeW = (void *) GetProcAddress(hShlwapi, "UrlApplySchemeW"); - pParseURLA = (void*)GetProcAddress(hShlwapi, (LPCSTR)1); - pParseURLW = (void*)GetProcAddress(hShlwapi, (LPCSTR)2); - pHashData = (void*)GetProcAddress(hShlwapi, "HashData"); - test_UrlApplyScheme(); test_UrlHash(); test_UrlGetPart(); -- 2.34.1

1 4

[PATCH] setupapi: Avoid race conditions with devnode_table.
by Brendan Shanks Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- Fixes a crash where two threads calling SetupDiGetClassDevs() would end up in alloc_devnode() at the same time. One thread would start iterating through the table after devnode_table_size was set but before devnode_table was allocated, and crash. dlls/setupapi/devinst.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ecc0b58ca5c..f3ae4fdb1da 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -233,11 +233,21 @@ static inline void copy_device_iface_data(SP_DEVICE_INTERFACE_DATA *data, static struct device **devnode_table; static unsigned int devnode_table_size; +static CRITICAL_SECTION devnode_table_cs; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &devnode_table_cs, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": devnode_table_cs") } +}; +static CRITICAL_SECTION devnode_table_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static DEVINST alloc_devnode(struct device *device) { unsigned int i; + EnterCriticalSection(&devnode_table_cs); + for (i = 0; i < devnode_table_size; ++i) { if (!devnode_table[i]) @@ -260,21 +270,33 @@ static DEVINST alloc_devnode(struct device *device) } devnode_table[i] = device; + + LeaveCriticalSection(&devnode_table_cs); + return i; } static void free_devnode(DEVINST devnode) { + EnterCriticalSection(&devnode_table_cs); devnode_table[devnode] = NULL; + LeaveCriticalSection(&devnode_table_cs); } static struct device *get_devnode_device(DEVINST devnode) { + struct device *device = NULL; + + EnterCriticalSection(&devnode_table_cs); + if (devnode < devnode_table_size) - return devnode_table[devnode]; + device = devnode_table[devnode]; + else + WARN("device node %u not found\n", devnode); - WARN("device node %u not found\n", devnode); - return NULL; + LeaveCriticalSection(&devnode_table_cs); + + return device; } static void SETUPDI_GuidToString(const GUID *guid, LPWSTR guidStr) -- 2.32.0 (Apple Git-132)

2 2

[tools 1/3] testbot/SetWinLocale: Better detect when Windows has rebooted.
by Francois Gouget Feb. 8, 2022

Feb. 8, 2022

This no longer relies on a long pause to give time for Windows to start rebooting and should detect when TestAgentd is ready again faster. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 2324a5cb16..dc551853af 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -902,18 +902,19 @@ if ($OptReboot) { my $Cmd = ["shutdown.exe", "/r", "/t", "0"]; Debug(Elapsed($Start), " Rebooting: ", join(" ", @$Cmd), "\n"); + my $OldCount = $TA->GetProperties("start.count"); $TA->Run($Cmd, 0); # Note that we cannot wait for this command since it reboots Windows - # Wait a bit to make sure we don't reconnect before Windows has rebooted. - sleep(30); - - Debug(Elapsed($Start), " Waiting for Windows to boot\n"); - $TA->SetConnectTimeout(undef, undef, $WaitForBoot); - if (!$TA->Ping()) + my ($OneTimeout, $MinAttempts, $MinTimeout) = $TA->SetConnectTimeout(3, 1, 3); + while (1) { - FatalError("could not reconnect to $OptHostName after the reboot: ", $TA->GetLastError(), "\n"); + my $NewCount = $TA->GetProperties("start.count"); + next if (!defined $NewCount); # Rebooting (TestAgentd is not running) + last if ($NewCount != $OldCount); # start.count got incremented + sleep(10); # Not rebooting yet } + $TA->SetConnectTimeout($OneTimeout, $MinAttempts, $MinTimeout); # Skip this check on pre-Windows 10 versions, i.e. those that don't have # 'CountryName' and if the settings were not changed in the first place. -- 2.30.2

1 2

[tools] testbot/LibvirtTool: Revert() does not need its own VM object.
by Francois Gouget Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 7a865499c2..b6b1fad581 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -447,9 +447,9 @@ sub CheckOff() return ChangeStatus("dirty", "off", "done"); } -sub SetupTestAgentd($$$$) +sub SetupTestAgentd($$$) { - my ($VM, $Booting, $UpgradeTestAgentd, $ResetStartCount) = @_; + my ($Booting, $UpgradeTestAgentd, $ResetStartCount) = @_; Debug(Elapsed($Start), " Setting up the $VMKey TestAgent server\n"); LogMsg "Setting up the $VMKey TestAgent server\n"; @@ -572,7 +572,6 @@ sub CreateSnapshot($$) sub Revert() { - my $VM = CreateVMs()->GetItem($VMKey); if (!$Debug and $VM->Status ne "reverting") { Error("The VM is not ready to be reverted (". $VM->Status .")\n"); @@ -648,7 +647,7 @@ sub Revert() # Set up the TestAgent server. Note that setting the locale will require a # reboot so reset start.count in that case. - SetupTestAgentd($VM, $Booting, ($CreateSnapshot or $SetLocale), $SetLocale); + SetupTestAgentd($Booting, ($CreateSnapshot or $SetLocale), $SetLocale); if ($CreateSnapshot) { -- 2.30.2

1 0

[tools] testbot/LibvirtTool: Include the VM name in error messages.
by Francois Gouget Feb. 8, 2022

Feb. 8, 2022

Multiple VMs may be reverted at the same time (either on the same VM host or on separate hosts) so this is needed to know which VM the error is about. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index b6b1fad581..681223f11c 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -132,7 +132,7 @@ if (!defined $Usage) $VM = CreateVMs()->GetItem($VMKey); if (!defined $VM) { - Error "VM $VMKey does not exist\n"; + Error "The $VMKey VM does not exist\n"; $Usage = 2; } } @@ -301,7 +301,7 @@ sub ShutDown() my $PTA = GetPrivilegedTA($VM->GetAgent()); if (!$PTA->Run($Cmd, 0)) { - Error "Could not run @$Cmd: ". $PTA->GetLastError() ."\n"; + Error "Could not run @$Cmd on $VMKey: ". $PTA->GetLastError() ."\n"; $Success = 0; } else @@ -469,14 +469,14 @@ sub SetupTestAgentd($$$) LogMsg "Upgrading the $VMKey TestAgent server from $Version\n"; if ($Version !~ / ([0-9]+)\.([0-9]+)$/) { - FatalError("Unsupported TestAgent server version: $Version\n"); + FatalError("Unsupported TestAgent server version on $VMKey: $Version\n"); } # We want 'TestAgentd --detach --show-restarts' on Windows but this was # not supported before this version and changing how the server is started # is too complex. if (!$TA->HasMinVersion(1, 7)) { - FatalError("The TestAgent server is too old to be upgraded: $Version\n"); + FatalError("The $VMKey TestAgent server is too old to be upgraded: $Version\n"); } if (!$TA->Upgrade("$DataDir/latest/TestAgentd.exe")) @@ -506,10 +506,10 @@ sub SetupTestAgentd($$$) # HTTPS certificates), but also for the build (if the time moves forward # during the build some ccache versions will return a compilation error). my $PTA = GetPrivilegedTA($TA); - FatalError("Cannot set the VM system time\n") if (!$PTA); + FatalError("Cannot set the $VMKey VM system time\n") if (!$PTA); if (!$PTA->SetTime()) { - FatalError("Setting the VM system time failed: ". $PTA->GetLastError() ."\n"); + FatalError("Setting the $VMKey VM system time failed: ". $PTA->GetLastError() ."\n"); } if ($Booting and $VM->Type eq "wine") @@ -518,16 +518,16 @@ sub SetupTestAgentd($$$) Debug(Elapsed($Start), " Waiting for the X session\n"); LogMsg "Waiting for the $VMKey X session\n"; my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); - FatalError("Could not check for the X session on $VMKey\n") if (!$Pid); + FatalError("Could not check for the $VMKey X session\n") if (!$Pid); if (!defined $TA->Wait($Pid, $SleepAfterBoot)) { my $ErrMessage = $TA->GetLastError(); if ($ErrMessage =~ /timed out waiting for the child process/) { - FatalError("Timed out waiting for the X session\n"); + FatalError("Timed out waiting for the $VMKey X session\n"); } - FatalError("An error occurred while waiting for the X session: $ErrMessage\n"); + FatalError("An error occurred while waiting for the $VMKey X session: $ErrMessage\n"); } } @@ -544,7 +544,7 @@ sub SetupTestAgentd($$$) my $Count = $TA->GetProperties("start.count"); if (defined $Count and $Count > 1) { - FatalError("The VM has been rebooted too many times: start.count=$Count > 1"); + FatalError("$VMKey has been rebooted too many times: start.count=$Count > 1"); } } $PTA->Disconnect(); @@ -574,7 +574,7 @@ sub Revert() { if (!$Debug and $VM->Status ne "reverting") { - Error("The VM is not ready to be reverted (". $VM->Status .")\n"); + Error("$VMKey is not ready to be reverted (". $VM->Status .")\n"); return 1; } $CurrentStatus = "reverting"; -- 2.30.2

1 0

[tools] testbot/TestAgent: The maximum alarm() value is signed.
by Francois Gouget Feb. 8, 2022

Feb. 8, 2022

And still 32-bit. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/TestAgent.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index fea7e650e1..b395cf2d26 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -267,8 +267,8 @@ sub _SetAlarm($) { my $Timeout = $self->{deadline} - time(); die "timeout" if ($Timeout <= 0); - # alarm() has a 32-bit limit, even on 64-bit systems - alarm($Timeout <= 0xffffffff ? $Timeout : 0xffffffff); + # alarm() has a signed 32-bit limit, even on 64-bit systems + alarm($Timeout <= 0x7fffffff ? $Timeout : 0x7fffffff); } } -- 2.30.2

1 0

[PATCH] dmime/tests: Build without -DWINE_NO_LONG_TYPES
by Michael Stefaniuc Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tests/Makefile.in | 1 - dlls/dmime/tests/dmime.c | 316 ++++++++++++++++----------------- dlls/dmime/tests/performance.c | 241 +++++++++++++------------ 3 files changed, 274 insertions(+), 284 deletions(-) diff --git a/dlls/dmime/tests/Makefile.in b/dlls/dmime/tests/Makefile.in index f2c93bb1a68..f4c47038e54 100644 --- a/dlls/dmime/tests/Makefile.in +++ b/dlls/dmime/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dmime.dll IMPORTS = user32 ole32 dsound diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 99295f391bd..8f2bf6f2812 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -57,8 +57,7 @@ static void test_COM_audiopath(void) hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void**)&performance); - ok(hr == S_OK || broken(hr == E_NOINTERFACE), - "DirectMusicPerformance create failed: %08x\n", hr); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "DirectMusicPerformance create failed: %#lx\n", hr); if (!performance) { win_skip("IDirectMusicPerformance8 not available\n"); return; @@ -67,67 +66,67 @@ static void test_COM_audiopath(void) DMUS_APATH_SHARED_STEREOPLUSREVERB, 64, DMUS_AUDIOF_ALL, NULL); ok(hr == S_OK || hr == DSERR_NODRIVER || broken(hr == AUDCLNT_E_ENDPOINT_CREATE_FAILED), /* Win 10 testbot */ - "DirectMusicPerformance_InitAudio failed: %08x\n", hr); + "DirectMusicPerformance_InitAudio failed: %#lx\n", hr); if (FAILED(hr)) { skip("Audio failed to initialize\n"); return; } hr = IDirectMusicPerformance8_GetDefaultAudioPath(performance, &dmap); - ok(hr == S_OK, "DirectMusicPerformance_GetDefaultAudioPath failed: %08x\n", hr); + ok(hr == S_OK, "DirectMusicPerformance_GetDefaultAudioPath failed: %#lx\n", hr); /* IDirectMusicObject and IPersistStream are not supported */ hr = IDirectMusicAudioPath_QueryInterface(dmap, &IID_IDirectMusicObject, (void**)&unk); - todo_wine ok(FAILED(hr) && !unk, "Unexpected IDirectMusicObject interface: hr=%08x, iface=%p\n", + todo_wine ok(FAILED(hr) && !unk, "Unexpected IDirectMusicObject interface: hr=%#lx, iface=%p\n", hr, unk); if (unk) IUnknown_Release(unk); hr = IDirectMusicAudioPath_QueryInterface(dmap, &IID_IPersistStream, (void**)&unk); - todo_wine ok(FAILED(hr) && !unk, "Unexpected IPersistStream interface: hr=%08x, iface=%p\n", + todo_wine ok(FAILED(hr) && !unk, "Unexpected IPersistStream interface: hr=%#lx, iface=%p\n", hr, unk); if (unk) IUnknown_Release(unk); /* Same refcount for all DirectMusicAudioPath interfaces */ refcount = IDirectMusicAudioPath_AddRef(dmap); - ok(refcount == 3, "refcount == %u, expected 3\n", refcount); + ok(refcount == 3, "refcount == %lu, expected 3\n", refcount); hr = IDirectMusicAudioPath_QueryInterface(dmap, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); ok(unk == (IUnknown*)dmap, "got %p, %p\n", unk, dmap); refcount = IUnknown_AddRef(unk); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IUnknown_Release(unk); hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, 0, &IID_IDirectSoundBuffer, (void**)&dsound); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); IDirectSoundBuffer_Release(dsound); hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, 0, &IID_IDirectSoundBuffer8, (void**)&dsound8); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); IDirectSoundBuffer8_Release(dsound8); hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, 0, &IID_IDirectSoundNotify, (void**)&notify); - ok(hr == E_NOINTERFACE, "Failed: %08x\n", hr); + ok(hr == E_NOINTERFACE, "Failed: %#lx\n", hr); hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, 0, &IID_IDirectSound3DBuffer, (void**)&dsound3d); - ok(hr == E_NOINTERFACE, "Failed: %08x\n", hr); + ok(hr == E_NOINTERFACE, "Failed: %#lx\n", hr); hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, 0, &IID_IKsPropertySet, (void**)&propset); - todo_wine ok(hr == S_OK, "Failed: %08x\n", hr); + todo_wine ok(hr == S_OK, "Failed: %#lx\n", hr); if (propset) IKsPropertySet_Release(propset); hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, 0, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); IUnknown_Release(unk); hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, 0, &GUID_NULL, (void**)&unk); - ok(hr == E_NOINTERFACE, "Failed: %08x\n", hr); + ok(hr == E_NOINTERFACE, "Failed: %#lx\n", hr); while (IDirectMusicAudioPath_Release(dmap) > 1); /* performance has a reference too */ IDirectMusicPerformance8_CloseDown(performance); @@ -151,44 +150,44 @@ static void test_COM_audiopathconfig(void) return; } ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicAudioPathConfig create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicAudioPathConfig create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dmap, "dmap = %p\n", dmap); /* IDirectMusicAudioPath not supported */ hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicAudioPath, (void**)&dmap); todo_wine ok(FAILED(hr) && !dmap, - "Unexpected IDirectMusicAudioPath interface: hr=%08x, iface=%p\n", hr, dmap); + "Unexpected IDirectMusicAudioPath interface: hr=%#lx, iface=%p\n", hr, dmap); /* IDirectMusicObject and IPersistStream supported */ hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, NULL, CLSCTX_INPROC_SERVER, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "DirectMusicObject create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicObject create failed: %#lx, expected S_OK\n", hr); IPersistStream_Release(ps); hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmo); - ok(hr == S_OK, "DirectMusicObject create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicObject create failed: %#lx, expected S_OK\n", hr); /* Same refcount for all DirectMusicObject interfaces */ refcount = IDirectMusicObject_AddRef(dmo); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicObject_QueryInterface(dmo, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); refcount = IPersistStream_AddRef(ps); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); IPersistStream_Release(ps); hr = IDirectMusicObject_QueryInterface(dmo, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IUnknown_Release(unk); /* IDirectMusicAudioPath still not supported */ hr = IDirectMusicObject_QueryInterface(dmo, &IID_IDirectMusicAudioPath, (void**)&dmap); todo_wine ok(FAILED(hr) && !dmap, - "Unexpected IDirectMusicAudioPath interface: hr=%08x, iface=%p\n", hr, dmap); + "Unexpected IDirectMusicAudioPath interface: hr=%#lx, iface=%p\n", hr, dmap); while (IDirectMusicObject_Release(dmo)); } @@ -207,41 +206,41 @@ static void test_COM_graph(void) hr = CoCreateInstance(&CLSID_DirectMusicGraph, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dmg); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicGraph create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicGraph create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dmg, "dmg = %p\n", dmg); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, (void**)&dmg); - ok(hr == E_NOINTERFACE, "DirectMusicGraph create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicGraph create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicGraph interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicGraph, (void**)&dmg); - ok(hr == S_OK, "DirectMusicGraph create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicGraph create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicGraph_AddRef(dmg); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IDirectMusicObject, (void**)&dmo); if (hr == E_NOINTERFACE) { win_skip("DirectMusicGraph without IDirectMusicObject\n"); return; } - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %#lx\n", hr); refcount = IDirectMusicObject_AddRef(dmo); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IDirectMusicObject_Release(dmo); hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); refcount = IPersistStream_AddRef(ps); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IPersistStream_Release(ps); hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount); refcount = IUnknown_Release(unk); while (IDirectMusicGraph_Release(dmg)); @@ -260,14 +259,13 @@ static void test_COM_segment(void) hr = CoCreateInstance(&CLSID_DirectMusicSegment, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dms); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicSegment create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicSegment create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dms, "dms = %p\n", dms); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound, (void**)&dms); - ok(hr == E_NOINTERFACE, - "DirectMusicSegment create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicSegment create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount */ hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, @@ -276,28 +274,28 @@ static void test_COM_segment(void) win_skip("DirectMusicSegment without IDirectMusicSegment8\n"); return; } - ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicSegment create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicSegment8_AddRef(dms); - ok (refcount == 2, "refcount == %u, expected 2\n", refcount); + ok (refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IDirectMusicObject, (void**)&dmo); - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %#lx\n", hr); IDirectMusicSegment8_AddRef(dms); refcount = IDirectMusicSegment8_Release(dms); - ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + ok (refcount == 3, "refcount == %lu, expected 3\n", refcount); hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IPersistStream, (void**)&stream); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); refcount = IDirectMusicSegment8_Release(dms); - ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + ok (refcount == 3, "refcount == %lu, expected 3\n", refcount); hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); refcount = IUnknown_Release(unk); - ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + ok (refcount == 3, "refcount == %lu, expected 3\n", refcount); refcount = IDirectMusicObject_Release(dmo); - ok (refcount == 2, "refcount == %u, expected 2\n", refcount); + ok (refcount == 2, "refcount == %lu, expected 2\n", refcount); refcount = IPersistStream_Release(stream); - ok (refcount == 1, "refcount == %u, expected 1\n", refcount); + ok (refcount == 1, "refcount == %lu, expected 1\n", refcount); refcount = IDirectMusicSegment8_Release(dms); - ok (refcount == 0, "refcount == %u, expected 0\n", refcount); + ok (refcount == 0, "refcount == %lu, expected 0\n", refcount); } static void test_COM_segmentstate(void) @@ -311,14 +309,13 @@ static void test_COM_segmentstate(void) hr = CoCreateInstance(&CLSID_DirectMusicSegmentState, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dmss8); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicSegmentState8 create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicSegmentState8 create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dmss8, "dmss8 = %p\n", dmss8); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicSegmentState, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmss8); - ok(hr == E_NOINTERFACE, - "DirectMusicSegmentState8 create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicSegmentState8 create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicSegmentState interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicSegmentState, NULL, CLSCTX_INPROC_SERVER, @@ -327,18 +324,18 @@ static void test_COM_segmentstate(void) win_skip("DirectMusicSegmentState without IDirectMusicSegmentState8\n"); return; } - ok(hr == S_OK, "DirectMusicSegmentState8 create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicSegmentState8 create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicSegmentState8_AddRef(dmss8); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicSegmentState8_QueryInterface(dmss8, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IUnknown_Release(unk); hr = IDirectMusicSegmentState8_QueryInterface(dmss8, &IID_IUnknown, NULL); - ok(hr == E_POINTER, "got %08x\n", hr); + ok(hr == E_POINTER, "got %#lx\n", hr); while (IDirectMusicSegmentState8_Release(dmss8)); } @@ -381,44 +378,43 @@ static void test_COM_track(void) continue; } ok(hr == CLASS_E_NOAGGREGATION, - "%s create failed: %08x, expected CLASS_E_NOAGGREGATION\n", class[i].name, hr); + "%s create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", class[i].name, hr); ok(!dmt8, "dmt8 = %p\n", dmt8); /* Invalid RIID */ hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmt8); - ok(hr == E_NOINTERFACE, "%s create failed: %08x, expected E_NOINTERFACE\n", - class[i].name, hr); + ok(hr == E_NOINTERFACE, "%s create failed: %#lx, expected E_NOINTERFACE\n", class[i].name, hr); /* Same refcount for all DirectMusicTrack interfaces */ hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, (void**)&dmt); - ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); + ok(hr == S_OK, "%s create failed: %#lx, expected S_OK\n", class[i].name, hr); refcount = IDirectMusicTrack_AddRef(dmt); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); refcount = IPersistStream_AddRef(ps); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); IPersistStream_Release(ps); hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IUnknown_Release(unk); hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IDirectMusicTrack8, (void**)&dmt8); if (class[i].has_dmt8) { - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicTrack8 failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicTrack8 failed: %#lx\n", hr); refcount = IDirectMusicTrack8_AddRef(dmt8); - ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount); refcount = IDirectMusicTrack8_Release(dmt8); } else { - ok(hr == E_NOINTERFACE, "QueryInterface for IID_IDirectMusicTrack8 failed: %08x\n", hr); + ok(hr == E_NOINTERFACE, "QueryInterface for IID_IDirectMusicTrack8 failed: %#lx\n", hr); refcount = IDirectMusicTrack_AddRef(dmt); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); } while (IDirectMusicTrack_Release(dmt)); @@ -439,23 +435,23 @@ static void test_audiopathconfig(void) win_skip("DirectMusicAudioPathConfig not registered\n"); return; } - ok(hr == S_OK, "DirectMusicAudioPathConfig create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicAudioPathConfig create failed: %#lx, expected S_OK\n", hr); /* IPersistStream */ hr = IDirectMusicObject_QueryInterface(dmo, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %#lx\n", hr); ok(IsEqualGUID(&class, &CLSID_DirectMusicAudioPathConfig), "Expected class CLSID_DirectMusicAudioPathConfig got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %#lx\n", hr); hr = IPersistStream_GetSizeMax(ps, &size); - ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %#lx\n", hr); hr = IPersistStream_Save(ps, NULL, TRUE); - ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %#lx\n", hr); while (IDirectMusicObject_Release(dmo)); } @@ -470,24 +466,24 @@ static void test_graph(void) hr = CoCreateInstance(&CLSID_DirectMusicGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicGraph, (void**)&dmg); - ok(hr == S_OK, "DirectMusicGraph create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicGraph create failed: %#lx, expected S_OK\n", hr); /* IPersistStream */ hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == S_OK || broken(hr == E_NOTIMPL) /* win2k */, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(hr == S_OK || broken(hr == E_NOTIMPL) /* win2k */, "IPersistStream_GetClassID failed: %#lx\n", hr); if (hr == S_OK) ok(IsEqualGUID(&class, &CLSID_DirectMusicGraph), "Expected class CLSID_DirectMusicGraph got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %#lx\n", hr); hr = IPersistStream_GetSizeMax(ps, &size); - ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %#lx\n", hr); hr = IPersistStream_Save(ps, NULL, TRUE); - ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %#lx\n", hr); while (IDirectMusicGraph_Release(dmg)); } @@ -502,24 +498,24 @@ static void test_segment(void) hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSegment, (void**)&dms); - ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicSegment create failed: %#lx, expected S_OK\n", hr); /* IPersistStream */ hr = IDirectMusicSegment_QueryInterface(dms, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == S_OK || broken(hr == E_NOTIMPL) /* win2k */, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(hr == S_OK || broken(hr == E_NOTIMPL) /* win2k */, "IPersistStream_GetClassID failed: %#lx\n", hr); if (hr == S_OK) ok(IsEqualGUID(&class, &CLSID_DirectMusicSegment), "Expected class CLSID_DirectMusicSegment got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %#lx\n", hr); hr = IPersistStream_GetSizeMax(ps, &size); - ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %#lx\n", hr); hr = IPersistStream_Save(ps, NULL, TRUE); - ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %#lx\n", hr); while (IDirectMusicSegment_Release(dms)); } @@ -531,12 +527,12 @@ static void _add_track(IDirectMusicSegment8 *seg, REFCLSID class, const char *na hr = CoCreateInstance(class, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, (void**)&track); - ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", name, hr); + ok(hr == S_OK, "%s create failed: %#lx, expected S_OK\n", name, hr); hr = IDirectMusicSegment8_InsertTrack(seg, track, group); if (group) - ok(hr == S_OK, "Inserting %s failed: %08x, expected S_OK\n", name, hr); + ok(hr == S_OK, "Inserting %s failed: %#lx, expected S_OK\n", name, hr); else - ok(hr == E_INVALIDARG, "Inserting %s failed: %08x, expected E_INVALIDARG\n", name, hr); + ok(hr == E_INVALIDARG, "Inserting %s failed: %#lx, expected E_INVALIDARG\n", name, hr); IDirectMusicTrack_Release(track); } @@ -555,16 +551,16 @@ static void _expect_track(IDirectMusicSegment8 *seg, REFCLSID expect, const char else hr = IDirectMusicSegment8_GetTrack(seg, expect, group, index, &track); if (!expect) { - ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %#lx, expected DMUS_E_NOT_FOUND\n", hr); return; } - ok(hr == S_OK, "GetTrack failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "GetTrack failed: %#lx, expected S_OK\n", hr); hr = IDirectMusicTrack_QueryInterface(track, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - ok(IsEqualGUID(&class, expect), "For group %#x index %u: Expected class %s got %s\n", + ok(hr == S_OK, "IPersistStream_GetClassID failed: %#lx\n", hr); + ok(IsEqualGUID(&class, expect), "For group %#lx index %lu: Expected class %s got %s\n", group, index, name, wine_dbgstr_guid(&class)); IPersistStream_Release(ps); @@ -584,7 +580,7 @@ static void test_gettrack(void) hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSegment8, (void**)&seg); - ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicSegment create failed: %#lx, expected S_OK\n", hr); add_track(seg, LyricsTrack, 0x0); /* failure */ add_track(seg, LyricsTrack, 0x1); /* idx 0 group 1 */ @@ -596,7 +592,7 @@ static void test_gettrack(void) /* Ignore GUID in GetTrack */ hr = IDirectMusicSegment8_GetTrack(seg, &GUID_NULL, 0, 0, &track); - ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %#lx, expected DMUS_E_NOT_FOUND\n", hr); expect_track(seg, LyricsTrack, 0x1, 0); expect_track(seg, ParamControlTrack, 0x1, 1); @@ -615,7 +611,7 @@ static void test_gettrack(void) /* Use the GUID in GetTrack */ hr = IDirectMusicSegment8_GetTrack(seg, &CLSID_DirectMusicLyricsTrack, 0, 0, &track); - ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %#lx, expected DMUS_E_NOT_FOUND\n", hr); expect_guid_track(seg, LyricsTrack, 0x1, 0); expect_guid_track(seg, ParamControlTrack, 0x1, 0); @@ -638,35 +634,32 @@ static void test_segment_param(void) hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSegment8, (void **)&seg); - ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicSegment create failed: %#lx, expected S_OK\n", hr); add_track(seg, LyricsTrack, 0x1); /* no params */ add_track(seg, SegmentTriggerTrack, 0x1); /* all params "supported" */ hr = IDirectMusicSegment8_GetParam(seg, NULL, 0x1, 0, 0, NULL, buf); - ok(hr == E_POINTER, "GetParam failed: %08x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "GetParam failed: %#lx, expected E_POINTER\n", hr); hr = IDirectMusicSegment8_SetParam(seg, NULL, 0x1, 0, 0, buf); - todo_wine ok(hr == E_POINTER, "SetParam failed: %08x, expected E_POINTER\n", hr); + todo_wine ok(hr == E_POINTER, "SetParam failed: %#lx, expected E_POINTER\n", hr); hr = IDirectMusicSegment8_GetParam(seg, &GUID_Valid_Start_Time, 0x1, 0, 0, NULL, buf); - ok(hr == DMUS_E_GET_UNSUPPORTED, - "GetParam failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", hr); + ok(hr == DMUS_E_GET_UNSUPPORTED, "GetParam failed: %#lx, expected DMUS_E_GET_UNSUPPORTED\n", hr); hr = IDirectMusicSegment8_GetParam(seg, &GUID_Valid_Start_Time, 0x1, 1, 0, NULL, buf); - ok(hr == DMUS_E_TRACK_NOT_FOUND, - "GetParam failed: %08x, expected DMUS_E_TRACK_NOT_FOUND\n", hr); + ok(hr == DMUS_E_TRACK_NOT_FOUND, "GetParam failed: %#lx, expected DMUS_E_TRACK_NOT_FOUND\n", hr); hr = IDirectMusicSegment8_GetParam(seg, &GUID_Valid_Start_Time, 0x1, DMUS_SEG_ANYTRACK, 0, NULL, buf); - ok(hr == DMUS_E_GET_UNSUPPORTED, - "GetParam failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", hr); + ok(hr == DMUS_E_GET_UNSUPPORTED, "GetParam failed: %#lx, expected DMUS_E_GET_UNSUPPORTED\n", hr); hr = IDirectMusicSegment8_SetParam(seg, &GUID_Valid_Start_Time, 0x1, 0, 0, buf); - ok(hr == S_OK, "SetParam failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "SetParam failed: %#lx, expected S_OK\n", hr); hr = IDirectMusicSegment8_SetParam(seg, &GUID_Valid_Start_Time, 0x1, 1, 0, buf); todo_wine ok(hr == DMUS_E_TRACK_NOT_FOUND, - "SetParam failed: %08x, expected DMUS_E_TRACK_NOT_FOUND\n", hr); + "SetParam failed: %#lx, expected DMUS_E_TRACK_NOT_FOUND\n", hr); hr = IDirectMusicSegment8_SetParam(seg, &GUID_Valid_Start_Time, 0x1, DMUS_SEG_ALLTRACKS, 0, buf); - ok(hr == S_OK, "SetParam failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "SetParam failed: %#lx, expected S_OK\n", hr); IDirectMusicSegment8_Release(seg); } @@ -678,7 +671,7 @@ static void expect_getparam(IDirectMusicTrack *track, REFGUID type, const char * char buf[64] = { 0 }; hr = IDirectMusicTrack8_GetParam(track, type, 0, NULL, buf); - ok(hr == expect, "GetParam(%s) failed: %08x, expected %08x\n", name, hr, expect); + ok(hr == expect, "GetParam(%s) failed: %#lx, expected %#lx\n", name, hr, expect); } static void expect_setparam(IDirectMusicTrack *track, REFGUID type, const char *name, @@ -688,7 +681,7 @@ static void expect_setparam(IDirectMusicTrack *track, REFGUID type, const char * char buf[64] = { 0 }; hr = IDirectMusicTrack8_SetParam(track, type, 0, buf); - ok(hr == expect, "SetParam(%s) failed: %08x, expected %08x\n", name, hr, expect); + ok(hr == expect, "SetParam(%s) failed: %#lx, expected %#lx\n", name, hr, expect); } static void test_track(void) @@ -760,14 +753,14 @@ static void test_track(void) trace("Testing %s\n", class[i].name); hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, (void**)&dmt); - ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); + ok(hr == S_OK, "%s create failed: %#lx, expected S_OK\n", class[i].name, hr); /* IDirectMusicTrack */ if (class[i].has_params != ~0) { for (j = 0; j < ARRAY_SIZE(param_types); j++) { hr = IDirectMusicTrack8_IsParamSupported(dmt, param_types[j].type); if (class[i].has_params & (1 << j)) { - ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + ok(hr == S_OK, "IsParamSupported(%s) failed: %#lx, expected S_OK\n", param_types[j].name, hr); if (class[i].clsid == &CLSID_DirectMusicSegmentTriggerTrack) { expect_getparam(dmt, param_types[j].type, param_types[j].name, @@ -781,7 +774,7 @@ static void test_track(void) DMUS_E_GET_UNSUPPORTED); } else { ok(hr == DMUS_E_TYPE_UNSUPPORTED, - "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + "IsParamSupported(%s) failed: %#lx, expected DMUS_E_TYPE_UNSUPPORTED\n", param_types[j].name, hr); expect_getparam(dmt, param_types[j].type, param_types[j].name, DMUS_E_GET_UNSUPPORTED); @@ -810,61 +803,61 @@ static void test_track(void) } } else { hr = IDirectMusicTrack_GetParam(dmt, NULL, 0, NULL, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack_GetParam failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack_GetParam failed: %#lx\n", hr); hr = IDirectMusicTrack_SetParam(dmt, NULL, 0, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack_SetParam failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack_SetParam failed: %#lx\n", hr); hr = IDirectMusicTrack_IsParamSupported(dmt, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack_IsParamSupported failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack_IsParamSupported failed: %#lx\n", hr); hr = IDirectMusicTrack_IsParamSupported(dmt, &GUID_IDirectMusicStyle); - ok(hr == E_NOTIMPL, "got: %08x\n", hr); + ok(hr == E_NOTIMPL, "got: %#lx\n", hr); } if (class[i].clsid != &CLSID_DirectMusicMarkerTrack && class[i].clsid != &CLSID_DirectMusicTimeSigTrack) { hr = IDirectMusicTrack_AddNotificationType(dmt, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack_AddNotificationType failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack_AddNotificationType failed: %#lx\n", hr); hr = IDirectMusicTrack_RemoveNotificationType(dmt, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack_RemoveNotificationType failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack_RemoveNotificationType failed: %#lx\n", hr); } hr = IDirectMusicTrack_Clone(dmt, 0, 0, NULL); - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack_Clone failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack_Clone failed: %#lx\n", hr); /* IDirectMusicTrack8 */ hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IDirectMusicTrack8, (void**)&dmt8); if (hr == S_OK) { hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %#lx\n", hr); if (class[i].has_params == ~0) { hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_GetParamEx failed: %#lx\n", hr); hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_SetParamEx failed: %#lx\n", hr); } hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %#lx\n", hr); hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); if (class[i].clsid == &CLSID_DirectMusicTempoTrack) - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %#lx\n", hr); else - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %#lx\n", hr); IDirectMusicTrack8_Release(dmt8); } /* IPersistStream */ hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); hr = IPersistStream_GetClassID(ps, &classid); - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %#lx\n", hr); ok(IsEqualGUID(&classid, class[i].clsid), "Expected class %s got %s\n", class[i].name, wine_dbgstr_guid(&classid)); hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %#lx\n", hr); /* Unimplemented IPersistStream methods */ hr = IPersistStream_GetSizeMax(ps, &size); - ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %#lx\n", hr); hr = IPersistStream_Save(ps, NULL, TRUE); - ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %#lx\n", hr); while (IDirectMusicTrack_Release(dmt)); } @@ -995,7 +988,7 @@ static void test_parsedescriptor(void) hr = CoCreateInstance(forms[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void **)&dmo); if (hr != S_OK) { - win_skip("Could not create %s object: %08x\n", forms[i].class, hr); + win_skip("Could not create %s object: %#lx\n", forms[i].class, hr); return; } @@ -1003,13 +996,12 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_GetDescriptor(dmo, &desc); if (forms[i].needs_size) { - todo_wine ok(hr == E_INVALIDARG, - "GetDescriptor failed: %08x, expected E_INVALIDARG\n", hr); + todo_wine ok(hr == E_INVALIDARG, "GetDescriptor failed: %#lx, expected E_INVALIDARG\n", hr); desc.dwSize = sizeof(desc); hr = IDirectMusicObject_GetDescriptor(dmo, &desc); } - ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "GetDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, forms[i].clsid), "Got class guid %s, expected CLSID_%s\n", wine_dbgstr_guid(&desc.guidClass), forms[i].class); @@ -1020,12 +1012,12 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); if (forms[i].needs_size) { - ok(hr == E_INVALIDARG, "ParseDescriptor failed: %08x, expected E_INVALIDARG\n", hr); + ok(hr == E_INVALIDARG, "ParseDescriptor failed: %#lx, expected E_INVALIDARG\n", hr); desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); } - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, forms[i].clsid), "Got class guid %s, expected CLSID_%s\n", wine_dbgstr_guid(&desc.guidClass), forms[i].class); @@ -1034,14 +1026,14 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, NULL, &desc); - ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "ParseDescriptor failed: %#lx, expected E_POINTER\n", hr); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, NULL); if (forms[i].needs_size) - ok(hr == E_INVALIDARG, "ParseDescriptor failed: %08x, expected E_INVALIDARG\n", hr); + ok(hr == E_INVALIDARG, "ParseDescriptor failed: %#lx, expected E_INVALIDARG\n", hr); else - ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "ParseDescriptor failed: %#lx, expected E_POINTER\n", hr); hr = IDirectMusicObject_ParseDescriptor(dmo, NULL, NULL); - ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "ParseDescriptor failed: %#lx, expected E_POINTER\n", hr); IStream_Release(stream); /* Wrong form */ @@ -1052,10 +1044,10 @@ static void test_parsedescriptor(void) hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); if (forms[i].needs_size) ok(hr == DMUS_E_CHUNKNOTFOUND, - "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr); + "ParseDescriptor failed: %#lx, expected DMUS_E_CHUNKNOTFOUND\n", hr); else - ok(hr == E_FAIL, "ParseDescriptor failed: %08x, expected E_FAIL\n", hr); - ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); + ok(hr == E_FAIL, "ParseDescriptor failed: %#lx, expected E_FAIL\n", hr); + ok(!desc.dwValidData, "Got valid data %#lx, expected 0\n", desc.dwValidData); IStream_Release(stream); /* Not a RIFF stream */ @@ -1065,10 +1057,10 @@ static void test_parsedescriptor(void) hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); if (forms[i].needs_size) ok(hr == DMUS_E_CHUNKNOTFOUND, - "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr); + "ParseDescriptor failed: %#lx, expected DMUS_E_CHUNKNOTFOUND\n", hr); else - ok(hr == E_FAIL, "ParseDescriptor failed: %08x, expected E_FAIL\n", hr); - ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); + ok(hr == E_FAIL, "ParseDescriptor failed: %#lx, expected E_FAIL\n", hr); + ok(!desc.dwValidData, "Got valid data %#lx, expected 0\n", desc.dwValidData); IStream_Release(stream); /* All desc chunks */ @@ -1077,17 +1069,17 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS | DMUS_OBJ_VERSION; if (forms[i].form != mmioFOURCC('W','A','V','E')) valid |= DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); ok(IsEqualGUID(&desc.guidClass, forms[i].clsid), "Got class guid %s, expected CLSID_%s\n", wine_dbgstr_guid(&desc.guidClass), forms[i].class); ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", wine_dbgstr_guid(&desc.guidClass)); ok(desc.vVersion.dwVersionMS == 5 && desc.vVersion.dwVersionLS == 8, - "Got version %u.%u, expected 5.8\n", desc.vVersion.dwVersionMS, + "Got version %lu.%lu, expected 5.8\n", desc.vVersion.dwVersionMS, desc.vVersion.dwVersionLS); if (forms[i].form != mmioFOURCC('W','A','V','E')) ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", @@ -1100,8 +1092,8 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); IStream_Release(stream); /* UNFO list with INAM */ @@ -1111,8 +1103,8 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); IStream_Release(stream); @@ -1122,11 +1114,11 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); valid = DMUS_OBJ_CLASS; if (forms[i].form == mmioFOURCC('W','A','V','E')) valid |= DMUS_OBJ_NAME; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); if (forms[i].form == mmioFOURCC('W','A','V','E')) ok(!lstrcmpW(desc.wszName, L"I"), "Got name '%s', expected 'I'\n", wine_dbgstr_w(desc.wszName)); diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index d09d0120023..100d8e40be0 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -38,18 +38,18 @@ static void create_performance(IDirectMusicPerformance8 **performance, IDirectMu hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void **)performance); - ok(hr == S_OK, "DirectMusicPerformance create failed: %08x\n", hr); + ok(hr == S_OK, "DirectMusicPerformance create failed: %#lx\n", hr); if (dmusic) { hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, (void **)dmusic); - ok(hr == S_OK, "DirectMusic create failed: %08x\n", hr); + ok(hr == S_OK, "DirectMusic create failed: %#lx\n", hr); } if (dsound) { hr = DirectSoundCreate8(NULL, (IDirectSound8 **)dsound, NULL); - ok(hr == S_OK, "DirectSoundCreate failed: %08x\n", hr); + ok(hr == S_OK, "DirectSoundCreate failed: %#lx\n", hr); if (set_cooplevel) { hr = IDirectSound_SetCooperativeLevel(*dsound, GetForegroundWindow(), DSSCL_PRIORITY); - ok(hr == S_OK, "SetCooperativeLevel failed: %08x\n", hr); + ok(hr == S_OK, "SetCooperativeLevel failed: %#lx\n", hr); } } } @@ -60,7 +60,7 @@ static void destroy_performance(IDirectMusicPerformance8 *performance, IDirectMu HRESULT hr; hr = IDirectMusicPerformance8_CloseDown(performance); - ok(hr == S_OK, "CloseDown failed: %08x\n", hr); + ok(hr == S_OK, "CloseDown failed: %#lx\n", hr); IDirectMusicPerformance8_Release(performance); if (dmusic) IDirectMusic_Release(dmusic); @@ -89,7 +89,7 @@ static HRESULT test_InitAudio(void) hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void **)&performance); if (hr != S_OK) { - skip("Cannot create DirectMusicPerformance object (%x)\n", hr); + skip("Cannot create DirectMusicPerformance object (%lx)\n", hr); CoUninitialize(); return hr; } @@ -103,36 +103,36 @@ static HRESULT test_InitAudio(void) } hr = IDirectMusicPerformance8_PChannelInfo(performance, 128, &port, NULL, NULL); - ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 127, &port, NULL, NULL); - ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); + ok(hr == S_OK, "PChannelInfo failed, got %#lx\n", hr); IDirectMusicPort_Release(port); port = NULL; hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); - ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); + ok(hr == S_OK, "PChannelInfo failed, got %#lx\n", hr); ok(port != NULL, "IDirectMusicPort not set\n"); hr = IDirectMusicPerformance8_AssignPChannel(performance, 0, port, 0, 0); - todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannel failed (%08x)\n", hr); + todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannel failed (%#lx)\n", hr); hr = IDirectMusicPerformance8_AssignPChannelBlock(performance, 0, port, 0); - todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannelBlock failed (%08x)\n", hr); + todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannelBlock failed (%#lx)\n", hr); IDirectMusicPort_Release(port); hr = IDirectMusicPerformance8_GetDefaultAudioPath(performance, &path); - ok(hr == S_OK, "Failed to call GetDefaultAudioPath (%x)\n", hr); + ok(hr == S_OK, "Failed to call GetDefaultAudioPath (%lx)\n", hr); if (hr == S_OK) IDirectMusicAudioPath_Release(path); hr = IDirectMusicPerformance8_CloseDown(performance); - ok(hr == S_OK, "Failed to call CloseDown (%x)\n", hr); + ok(hr == S_OK, "Failed to call CloseDown (%lx)\n", hr); IDirectMusicPerformance8_Release(performance); /* Auto generated dmusic and dsound */ create_performance(&performance, NULL, NULL, FALSE); hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, 0, 64, 0, NULL); - ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ok(hr == S_OK, "InitAudio failed: %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); - ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %#lx\n", hr); destroy_performance(performance, NULL, NULL); /* Refcounts for auto generated dmusic and dsound */ @@ -140,93 +140,93 @@ static HRESULT test_InitAudio(void) dmusic = NULL; dsound = NULL; hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, &dsound, NULL, 0, 64, 0, NULL); - ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ok(hr == S_OK, "InitAudio failed: %#lx\n", hr); ref = get_refcount(dsound); - ok(ref == 3, "dsound ref count got %d expected 3\n", ref); + ok(ref == 3, "dsound ref count got %ld expected 3\n", ref); ref = get_refcount(dmusic); - ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); + ok(ref == 2, "dmusic ref count got %ld expected 2\n", ref); destroy_performance(performance, NULL, NULL); /* dsound without SetCooperativeLevel() */ create_performance(&performance, NULL, &dsound, FALSE); hr = IDirectMusicPerformance8_InitAudio(performance, NULL, &dsound, NULL, 0, 0, 0, NULL); - todo_wine ok(hr == DSERR_PRIOLEVELNEEDED, "InitAudio failed: %08x\n", hr); + todo_wine ok(hr == DSERR_PRIOLEVELNEEDED, "InitAudio failed: %#lx\n", hr); destroy_performance(performance, NULL, dsound); /* Using the wrong CLSID_DirectSound */ create_performance(&performance, NULL, NULL, FALSE); hr = DirectSoundCreate(NULL, &dsound, NULL); - ok(hr == S_OK, "DirectSoundCreate failed: %08x\n", hr); + ok(hr == S_OK, "DirectSoundCreate failed: %#lx\n", hr); hr = IDirectMusicPerformance8_InitAudio(performance, NULL, &dsound, NULL, 0, 0, 0, NULL); - todo_wine ok(hr == E_NOINTERFACE, "InitAudio failed: %08x\n", hr); + todo_wine ok(hr == E_NOINTERFACE, "InitAudio failed: %#lx\n", hr); destroy_performance(performance, NULL, dsound); /* Init() works with just a CLSID_DirectSound */ create_performance(&performance, NULL, NULL, FALSE); hr = DirectSoundCreate(NULL, &dsound, NULL); - ok(hr == S_OK, "DirectSoundCreate failed: %08x\n", hr); + ok(hr == S_OK, "DirectSoundCreate failed: %#lx\n", hr); hr = IDirectSound_SetCooperativeLevel(dsound, GetForegroundWindow(), DSSCL_PRIORITY); - ok(hr == S_OK, "SetCooperativeLevel failed: %08x\n", hr); + ok(hr == S_OK, "SetCooperativeLevel failed: %#lx\n", hr); hr = IDirectMusicPerformance8_Init(performance, NULL, dsound, NULL); - ok(hr == S_OK, "Init failed: %08x\n", hr); + ok(hr == S_OK, "Init failed: %#lx\n", hr); destroy_performance(performance, NULL, dsound); /* Init() followed by InitAudio() */ create_performance(&performance, NULL, &dsound, TRUE); hr = IDirectMusicPerformance8_Init(performance, NULL, dsound, NULL); - ok(hr == S_OK, "Init failed: %08x\n", hr); + ok(hr == S_OK, "Init failed: %#lx\n", hr); hr = IDirectMusicPerformance8_InitAudio(performance, NULL, &dsound, NULL, 0, 0, 0, NULL); - ok(hr == DMUS_E_ALREADY_INITED, "InitAudio failed: %08x\n", hr); + ok(hr == DMUS_E_ALREADY_INITED, "InitAudio failed: %#lx\n", hr); destroy_performance(performance, NULL, dsound); /* Provided dmusic and dsound */ create_performance(&performance, &dmusic, &dsound, TRUE); hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, &dsound, NULL, 0, 64, 0, NULL); - ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ok(hr == S_OK, "InitAudio failed: %#lx\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + todo_wine ok(ref == 2, "dsound ref count got %ld expected 2\n", ref); ref = get_refcount(dmusic); - ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); + ok(ref == 2, "dmusic ref count got %ld expected 2\n", ref); destroy_performance(performance, dmusic, dsound); /* Provided dmusic initialized with SetDirectSound */ create_performance(&performance, &dmusic, &dsound, TRUE); hr = IDirectMusic_SetDirectSound(dmusic, dsound, NULL); - ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); + ok(hr == S_OK, "SetDirectSound failed: %#lx\n", hr); ref = get_refcount(dsound); - ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + ok(ref == 2, "dsound ref count got %ld expected 2\n", ref); hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, NULL, NULL, 0, 64, 0, NULL); - ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ok(hr == S_OK, "InitAudio failed: %#lx\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + todo_wine ok(ref == 2, "dsound ref count got %ld expected 2\n", ref); ref = get_refcount(dmusic); - ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); + ok(ref == 2, "dmusic ref count got %ld expected 2\n", ref); destroy_performance(performance, dmusic, dsound); /* Provided dmusic and dsound, dmusic initialized with SetDirectSound */ create_performance(&performance, &dmusic, &dsound, TRUE); hr = IDirectMusic_SetDirectSound(dmusic, dsound, NULL); - ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); + ok(hr == S_OK, "SetDirectSound failed: %#lx\n", hr); ref = get_refcount(dsound); - ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + ok(ref == 2, "dsound ref count got %ld expected 2\n", ref); hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, &dsound, NULL, 0, 64, 0, NULL); - ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ok(hr == S_OK, "InitAudio failed: %#lx\n", hr); ref = get_refcount(dsound); - ok(ref == 3, "dsound ref count got %d expected 3\n", ref); + ok(ref == 3, "dsound ref count got %ld expected 3\n", ref); ref = get_refcount(dmusic); - ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); + ok(ref == 2, "dmusic ref count got %ld expected 2\n", ref); destroy_performance(performance, dmusic, dsound); /* InitAudio with perf channel count not a multiple of 16 rounds up */ create_performance(&performance, NULL, NULL, TRUE); hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, DMUS_APATH_SHARED_STEREOPLUSREVERB, 29, DMUS_AUDIOF_ALL, NULL); - ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ok(hr == S_OK, "InitAudio failed: %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 31, &port, &group, &channel); ok(hr == S_OK && group == 2 && channel == 15, - "PChannelInfo failed, got %08x, %u, %u\n", hr, group, channel); + "PChannelInfo failed, got %#lx, %lu, %lu\n", hr, group, channel); hr = IDirectMusicPerformance8_PChannelInfo(performance, 32, &port, NULL, NULL); - ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %#lx\n", hr); destroy_performance(performance, NULL, NULL); return S_OK; @@ -244,10 +244,10 @@ static void test_createport(void) hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void**)&perf); - ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + ok(hr == S_OK, "CoCreateInstance failed: %#lx\n", hr); hr = IDirectMusicPerformance8_Init(perf, &music, NULL, NULL); - ok(hr == S_OK, "Init failed: %08x\n", hr); + ok(hr == S_OK, "Init failed: %#lx\n", hr); ok(music != NULL, "Didn't get IDirectMusic pointer\n"); i = 0; @@ -255,21 +255,21 @@ static void test_createport(void) portcaps.dwSize = sizeof(portcaps); hr = IDirectMusic_EnumPort(music, i, &portcaps); - ok(hr == S_OK || hr == S_FALSE || (i == 0 && hr == E_INVALIDARG), "EnumPort failed: %08x\n", hr); + ok(hr == S_OK || hr == S_FALSE || (i == 0 && hr == E_INVALIDARG), "EnumPort failed: %#lx\n", hr); if(hr != S_OK) break; - ok(portcaps.dwSize == sizeof(portcaps), "Got unexpected portcaps struct size: %08x\n", portcaps.dwSize); - trace("portcaps(%u).dwFlags: %08x\n", i, portcaps.dwFlags); - trace("portcaps(%u).guidPort: %s\n", i, wine_dbgstr_guid(&portcaps.guidPort)); - trace("portcaps(%u).dwClass: %08x\n", i, portcaps.dwClass); - trace("portcaps(%u).dwType: %08x\n", i, portcaps.dwType); - trace("portcaps(%u).dwMemorySize: %08x\n", i, portcaps.dwMemorySize); - trace("portcaps(%u).dwMaxChannelGroups: %08x\n", i, portcaps.dwMaxChannelGroups); - trace("portcaps(%u).dwMaxVoices: %08x\n", i, portcaps.dwMaxVoices); - trace("portcaps(%u).dwMaxAudioChannels: %08x\n", i, portcaps.dwMaxAudioChannels); - trace("portcaps(%u).dwEffectFlags: %08x\n", i, portcaps.dwEffectFlags); - trace("portcaps(%u).wszDescription: %s\n", i, wine_dbgstr_w(portcaps.wszDescription)); + ok(portcaps.dwSize == sizeof(portcaps), "Got unexpected portcaps struct size: %lu\n", portcaps.dwSize); + trace("portcaps(%lu).dwFlags: %#lx\n", i, portcaps.dwFlags); + trace("portcaps(%lu).guidPort: %s\n", i, wine_dbgstr_guid(&portcaps.guidPort)); + trace("portcaps(%lu).dwClass: %#lx\n", i, portcaps.dwClass); + trace("portcaps(%lu).dwType: %#lx\n", i, portcaps.dwType); + trace("portcaps(%lu).dwMemorySize: %#lx\n", i, portcaps.dwMemorySize); + trace("portcaps(%lu).dwMaxChannelGroups: %lu\n", i, portcaps.dwMaxChannelGroups); + trace("portcaps(%lu).dwMaxVoices: %lu\n", i, portcaps.dwMaxVoices); + trace("portcaps(%lu).dwMaxAudioChannels: %lu\n", i, portcaps.dwMaxAudioChannels); + trace("portcaps(%lu).dwEffectFlags: %#lx\n", i, portcaps.dwEffectFlags); + trace("portcaps(%lu).wszDescription: %s\n", i, wine_dbgstr_w(portcaps.wszDescription)); ++i; } @@ -284,7 +284,7 @@ static void test_createport(void) /* dwValidParams == 0 -> S_OK, filled struct */ portparams.dwValidParams = 0; hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL); - ok(hr == S_OK, "CreatePort failed: %08x\n", hr); + ok(hr == S_OK, "CreatePort failed: %#lx\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); @@ -294,7 +294,7 @@ static void test_createport(void) portparams.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS; portparams.dwChannelGroups = 0; hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL); - todo_wine ok(hr == S_FALSE, "CreatePort failed: %08x\n", hr); + todo_wine ok(hr == S_FALSE, "CreatePort failed: %#lx\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); @@ -302,7 +302,7 @@ static void test_createport(void) /* dwValidParams != 0, valid params -> S_OK */ hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL); - ok(hr == S_OK, "CreatePort failed: %08x\n", hr); + ok(hr == S_OK, "CreatePort failed: %#lx\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); IDirectMusicPort_Release(port); port = NULL; @@ -310,7 +310,7 @@ static void test_createport(void) /* GUID_NULL succeeds */ portparams.dwValidParams = 0; hr = IDirectMusic_CreatePort(music, &GUID_NULL, &portparams, &port, NULL); - ok(hr == S_OK, "CreatePort failed: %08x\n", hr); + ok(hr == S_OK, "CreatePort failed: %#lx\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); @@ -319,19 +319,19 @@ static void test_createport(void) /* null GUID fails */ portparams.dwValidParams = 0; hr = IDirectMusic_CreatePort(music, NULL, &portparams, &port, NULL); - ok(hr == E_POINTER, "CreatePort failed: %08x\n", hr); + ok(hr == E_POINTER, "CreatePort failed: %#lx\n", hr); ok(port == NULL, "Get IDirectMusicPort pointer? %p\n", port); ok(portparams.dwValidParams == 0, "portparams struct was filled in?\n"); /* garbage GUID fails */ portparams.dwValidParams = 0; hr = IDirectMusic_CreatePort(music, &GUID_Bunk, &portparams, &port, NULL); - ok(hr == E_NOINTERFACE, "CreatePort failed: %08x\n", hr); + ok(hr == E_NOINTERFACE, "CreatePort failed: %#lx\n", hr); ok(port == NULL, "Get IDirectMusicPort pointer? %p\n", port); ok(portparams.dwValidParams == 0, "portparams struct was filled in?\n"); hr = IDirectMusicPerformance8_CloseDown(perf); - ok(hr == S_OK, "CloseDown failed: %08x\n", hr); + ok(hr == S_OK, "CloseDown failed: %#lx\n", hr); IDirectMusic_Release(music); IDirectMusicPerformance_Release(perf); @@ -347,99 +347,99 @@ static void test_pchannel(void) create_performance(&perf, NULL, NULL, TRUE); hr = IDirectMusicPerformance8_Init(perf, NULL, NULL, NULL); - ok(hr == S_OK, "Init failed: %08x\n", hr); + ok(hr == S_OK, "Init failed: %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, &port, NULL, NULL); - ok(hr == E_INVALIDARG && !port, "PChannelInfo failed, got %08x, %p\n", hr, port); + ok(hr == E_INVALIDARG && !port, "PChannelInfo failed, got %#lx, %p\n", hr, port); /* Add default port. Sets PChannels 0-15 to the corresponding channels in group 1 */ hr = IDirectMusicPerformance8_AddPort(perf, NULL); - ok(hr == S_OK, "AddPort of default port failed: %08x\n", hr); + ok(hr == S_OK, "AddPort of default port failed: %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, NULL, NULL, NULL); - ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); + ok(hr == S_OK, "PChannelInfo failed, got %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, &port, NULL, NULL); - ok(hr == S_OK && port, "PChannelInfo failed, got %08x, %p\n", hr, port); + ok(hr == S_OK && port, "PChannelInfo failed, got %#lx, %p\n", hr, port); for (i = 1; i < 16; i++) { hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); ok(hr == S_OK && port == port2 && group == 1 && channel == i, - "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + "PChannelInfo failed, got %#lx, %p, %lu, %lu\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } /* Unset PChannels fail to retrieve */ hr = IDirectMusicPerformance8_PChannelInfo(perf, 16, &port2, NULL, NULL); - ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x, %p\n", hr, port); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %#lx, %p\n", hr, port); hr = IDirectMusicPerformance8_PChannelInfo(perf, MAXDWORD - 16, &port2, NULL, NULL); - ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x, %p\n", hr, port); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %#lx, %p\n", hr, port); /* Channel group 0 can be set just fine */ hr = IDirectMusicPerformance8_AssignPChannel(perf, 0, port, 0, 0); - ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + ok(hr == S_OK, "AssignPChannel failed, got %#lx\n", hr); hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, 0, port, 0); - ok(hr == S_OK, "AssignPChannelBlock failed, got %08x\n", hr); + ok(hr == S_OK, "AssignPChannelBlock failed, got %#lx\n", hr); for (i = 1; i < 16; i++) { hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); ok(hr == S_OK && port == port2 && group == 0 && channel == i, - "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + "PChannelInfo failed, got %#lx, %p, %lu, %lu\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } /* Last PChannel Block can be set only individually but not read */ hr = IDirectMusicPerformance8_AssignPChannel(perf, MAXDWORD, port, 0, 3); - ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + ok(hr == S_OK, "AssignPChannel failed, got %#lx\n", hr); port2 = (IDirectMusicPort *)0xdeadbeef; hr = IDirectMusicPerformance8_PChannelInfo(perf, MAXDWORD, &port2, NULL, NULL); todo_wine ok(hr == E_INVALIDARG && port2 == (IDirectMusicPort *)0xdeadbeef, - "PChannelInfo failed, got %08x, %p\n", hr, port2); + "PChannelInfo failed, got %#lx, %p\n", hr, port2); hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD, port, 0); - ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %08x\n", hr); + ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %#lx\n", hr); hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD / 16, port, 1); - todo_wine ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %08x\n", hr); + todo_wine ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %#lx\n", hr); for (i = MAXDWORD - 15; i < MAXDWORD; i++) { hr = IDirectMusicPerformance8_AssignPChannel(perf, i, port, 0, 0); - ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + ok(hr == S_OK, "AssignPChannel failed, got %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, NULL, NULL); todo_wine ok(hr == E_INVALIDARG && port2 == (IDirectMusicPort *)0xdeadbeef, - "PChannelInfo failed, got %08x, %p\n", hr, port2); + "PChannelInfo failed, got %#lx, %p\n", hr, port2); } /* Second to last PChannel Block can be set only individually and read */ hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD / 16 - 1, port, 1); - todo_wine ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %08x\n", hr); + todo_wine ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %#lx\n", hr); for (i = MAXDWORD - 31; i < MAXDWORD - 15; i++) { hr = IDirectMusicPerformance8_AssignPChannel(perf, i, port, 1, 7); - ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + ok(hr == S_OK, "AssignPChannel failed, got %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); ok(hr == S_OK && port2 == port && group == 1 && channel == 7, - "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + "PChannelInfo failed, got %#lx, %p, %lu, %lu\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } /* Third to last PChannel Block behaves normal */ hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD / 16 - 2, port, 0); - ok(hr == S_OK, "AssignPChannelBlock failed, got %08x\n", hr); + ok(hr == S_OK, "AssignPChannelBlock failed, got %#lx\n", hr); for (i = MAXDWORD - 47; i < MAXDWORD - 31; i++) { hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); ok(hr == S_OK && port2 == port && group == 0 && channel == i % 16, - "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + "PChannelInfo failed, got %#lx, %p, %lu, %lu\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } /* One PChannel set in a Block, rest is initialized too */ hr = IDirectMusicPerformance8_AssignPChannel(perf, 4711, port, 1, 13); - ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + ok(hr == S_OK, "AssignPChannel failed, got %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, 4711, &port2, &group, &channel); ok(hr == S_OK && port2 == port && group == 1 && channel == 13, - "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + "PChannelInfo failed, got %#lx, %p, %lu, %lu\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); group = channel = 0xdeadbeef; hr = IDirectMusicPerformance8_PChannelInfo(perf, 4712, &port2, &group, &channel); ok(hr == S_OK && port2 == port && group == 0 && channel == 8, - "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + "PChannelInfo failed, got %#lx, %p, %lu, %lu\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); group = channel = 0xdeadbeef; hr = IDirectMusicPerformance8_PChannelInfo(perf, 4719, &port2, &group, &channel); ok(hr == S_OK && port2 == port && group == 0 && channel == 15, - "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + "PChannelInfo failed, got %#lx, %p, %lu, %lu\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); IDirectMusicPort_Release(port); @@ -458,36 +458,35 @@ static void test_COM(void) hr = CoCreateInstance(&CLSID_DirectMusicPerformance, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dmp); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicPerformance create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicPerformance create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dmp, "dmp = %p\n", dmp); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmp); - ok(hr == E_NOINTERFACE, - "DirectMusicPerformance create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicPerformance create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount */ hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance, (void**)&dmp); - ok(hr == S_OK, "DirectMusicPerformance create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicPerformance create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicPerformance_AddRef(dmp); - ok (refcount == 2, "refcount == %u, expected 2\n", refcount); + ok (refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicPerformance_QueryInterface(dmp, &IID_IDirectMusicPerformance2, (void**)&dmp2); - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicPerformance2 failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicPerformance2 failed: %#lx\n", hr); IDirectMusicPerformance_AddRef(dmp); refcount = IDirectMusicPerformance_Release(dmp); - ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + ok (refcount == 3, "refcount == %lu, expected 3\n", refcount); hr = IDirectMusicPerformance_QueryInterface(dmp, &IID_IDirectMusicPerformance8, (void**)&dmp8); - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicPerformance8 failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicPerformance8 failed: %#lx\n", hr); refcount = IDirectMusicPerformance_Release(dmp); - ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + ok (refcount == 3, "refcount == %lu, expected 3\n", refcount); refcount = IDirectMusicPerformance8_Release(dmp8); - ok (refcount == 2, "refcount == %u, expected 2\n", refcount); + ok (refcount == 2, "refcount == %lu, expected 2\n", refcount); refcount = IDirectMusicPerformance_Release(dmp2); - ok (refcount == 1, "refcount == %u, expected 1\n", refcount); + ok (refcount == 1, "refcount == %lu, expected 1\n", refcount); refcount = IDirectMusicPerformance_Release(dmp); - ok (refcount == 0, "refcount == %u, expected 0\n", refcount); + ok (refcount == 0, "refcount == %lu, expected 0\n", refcount); } static void test_notification_type(void) @@ -513,25 +512,25 @@ static void test_notification_type(void) hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void**)&perf); - ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + ok(hr == S_OK, "CoCreateInstance failed: %#lx\n", hr); hr = IDirectMusicPerformance8_InitAudio(perf, &music, &dsound, NULL, DMUS_APATH_DYNAMIC_STEREO, 64, DMUS_AUDIOF_ALL, NULL); ok(music != NULL, "Didn't get IDirectMusic pointer\n"); ok(dsound != NULL, "Didn't get IDirectSound pointer\n"); hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicLoader8, (void**)&loader); - ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + ok(hr == S_OK, "CoCreateInstance failed: %#lx\n", hr); messages = CreateEventA( NULL, FALSE, FALSE, NULL ); hr = IDirectMusicPerformance8_AddNotificationType(perf, &GUID_NOTIFICATION_SEGMENT); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); hr = IDirectMusicPerformance8_SetNotificationHandle(perf, messages, 0); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); hr = IDirectMusicPerformance8_GetDefaultAudioPath(perf, &path); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); ok(path != NULL, "Didn't get IDirectMusicAudioPath pointer\n"); desc.dwSize = sizeof(DMUS_OBJECTDESC); @@ -540,31 +539,31 @@ static void test_notification_type(void) desc.pbMemData = rifffile; desc.llMemLength = sizeof(rifffile); hr = IDirectMusicLoader8_GetObject(loader, &desc, &IID_IDirectMusicSegment8, (void**)&prime_segment8); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); ok(prime_segment8 != NULL, "Didn't get IDirectMusicSegment pointer\n"); hr = IDirectMusicSegment8_Download(prime_segment8, (IUnknown*)path); - ok(hr == S_OK, "Download failed: %08x\n", hr); + ok(hr == S_OK, "Download failed: %#lx\n", hr); hr = IDirectMusicPerformance8_PlaySegmentEx(perf, (IUnknown*)prime_segment8, NULL, NULL, DMUS_SEGF_SECONDARY, 0, &state, NULL, (IUnknown*)path); - ok(hr == S_OK, "PlaySegmentEx failed: %08x\n", hr); + ok(hr == S_OK, "PlaySegmentEx failed: %#lx\n", hr); ok(state != NULL, "Didn't get IDirectMusicSegmentState pointer\n"); while (!found_end) { result = WaitForSingleObject(messages, 500); - todo_wine ok(result == WAIT_OBJECT_0, "Failed: %d\n", result); + todo_wine ok(result == WAIT_OBJECT_0, "Failed: %ld\n", result); if (result != WAIT_OBJECT_0) break; msg = NULL; hr = IDirectMusicPerformance8_GetNotificationPMsg(perf, &msg); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); ok(msg != NULL, "Unexpected NULL pointer\n"); if (FAILED(hr) || !msg) break; - trace("Notification: %d\n", msg->dwNotificationOption); + trace("Notification: %ld\n", msg->dwNotificationOption); if (msg->dwNotificationOption == DMUS_NOTIFICATION_SEGEND || msg->dwNotificationOption == DMUS_NOTIFICATION_SEGALMOSTEND) { @@ -574,17 +573,17 @@ static void test_notification_type(void) IDirectMusicSegment *segment; hr = IUnknown_QueryInterface(msg->punkUser, &IID_IDirectMusicSegmentState8, (void**)&segmentstate); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); hr = IDirectMusicSegmentState8_GetSegment(segmentstate, &segment); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); if (FAILED(hr)) { IDirectMusicSegmentState8_Release(segmentstate); break; } hr = IDirectMusicSegment_QueryInterface(segment, &IID_IDirectMusicSegment8, (void**)&segment8); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); found_end = TRUE; @@ -618,17 +617,17 @@ static void test_performance_graph(void) create_performance(&perf, NULL, NULL, FALSE); hr = IDirectMusicPerformance8_Init(perf, NULL, NULL, NULL); - ok(hr == S_OK, "Init failed: %08x\n", hr); + ok(hr == S_OK, "Init failed: %#lx\n", hr); hr = IDirectMusicPerformance8_GetGraph(perf, NULL); - ok(hr == E_POINTER, "Failed: %08x\n", hr); + ok(hr == E_POINTER, "Failed: %#lx\n", hr); hr = IDirectMusicPerformance8_GetGraph(perf, &graph2); - ok(hr == DMUS_E_NOT_FOUND, "Failed: %08x\n", hr); + ok(hr == DMUS_E_NOT_FOUND, "Failed: %#lx\n", hr); ok(graph2 == NULL, "unexpected pointer.\n"); hr = IDirectMusicPerformance8_QueryInterface(perf, &IID_IDirectMusicGraph, (void**)&graph); - todo_wine ok(hr == S_OK, "Failed: %08x\n", hr); + todo_wine ok(hr == S_OK, "Failed: %#lx\n", hr); if (graph) IDirectMusicGraph_Release(graph); @@ -641,13 +640,13 @@ START_TEST( performance ) hr = CoInitialize(NULL); if (FAILED(hr)) { - skip("Cannot initialize COM (%x)\n", hr); + skip("Cannot initialize COM (%lx)\n", hr); return; } hr = test_InitAudio(); if (hr != S_OK) { - skip("InitAudio failed (%x)\n", hr); + skip("InitAudio failed (%lx)\n", hr); return; } -- 2.34.1

2 1

[PATCH] dmband: Build without -DWINE_NO_LONG_TYPES
by Michael Stefaniuc Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmband/Makefile.in | 1 - dlls/dmband/band.c | 44 ++++++++++++++++++------------------ dlls/dmband/bandtrack.c | 50 ++++++++++++++++++++--------------------- dlls/dmband/dmobject.c | 20 ++++++++--------- dlls/dmband/dmutils.c | 6 ++--- 5 files changed, 60 insertions(+), 61 deletions(-) diff --git a/dlls/dmband/Makefile.in b/dlls/dmband/Makefile.in index 36488c03b99..6fa1502f6b0 100644 --- a/dlls/dmband/Makefile.in +++ b/dlls/dmband/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dmband.dll IMPORTS = dxguid uuid ole32 advapi32 diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 6f990afaf7f..1910e53d187 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -69,7 +69,7 @@ static ULONG WINAPI IDirectMusicBandImpl_AddRef(IDirectMusicBand *iface) IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -79,7 +79,7 @@ static ULONG WINAPI IDirectMusicBandImpl_Release(IDirectMusicBand *iface) IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -213,30 +213,30 @@ static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK * do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_INSTRUMENT_CHUNK: { TRACE_(dmfile)(": Instrument chunk\n"); if (Chunk.dwSize != sizeof(DMUS_IO_INSTRUMENT) && Chunk.dwSize != DMUS_IO_INSTRUMENT_DX7_SIZE) { - ERR_(dmfile)("unexpected size %d\n", Chunk.dwSize); + ERR_(dmfile)("unexpected size %ld\n", Chunk.dwSize); return E_FAIL; } IStream_Read (pStm, &inst, Chunk.dwSize, NULL); if (Chunk.dwSize != sizeof(DMUS_IO_INSTRUMENT)) inst.nPitchBendRange = 0; - TRACE_(dmfile)(" - dwPatch: %u\n", inst.dwPatch); - TRACE_(dmfile)(" - dwAssignPatch: %u\n", inst.dwAssignPatch); - TRACE_(dmfile)(" - dwNoteRanges[0]: %u\n", inst.dwNoteRanges[0]); - TRACE_(dmfile)(" - dwNoteRanges[1]: %u\n", inst.dwNoteRanges[1]); - TRACE_(dmfile)(" - dwNoteRanges[2]: %u\n", inst.dwNoteRanges[2]); - TRACE_(dmfile)(" - dwNoteRanges[3]: %u\n", inst.dwNoteRanges[3]); - TRACE_(dmfile)(" - dwPChannel: %u\n", inst.dwPChannel); - TRACE_(dmfile)(" - dwFlags: %x\n", inst.dwFlags); + TRACE_(dmfile)(" - dwPatch: %lu\n", inst.dwPatch); + TRACE_(dmfile)(" - dwAssignPatch: %lu\n", inst.dwAssignPatch); + TRACE_(dmfile)(" - dwNoteRanges[0]: %lu\n", inst.dwNoteRanges[0]); + TRACE_(dmfile)(" - dwNoteRanges[1]: %lu\n", inst.dwNoteRanges[1]); + TRACE_(dmfile)(" - dwNoteRanges[2]: %lu\n", inst.dwNoteRanges[2]); + TRACE_(dmfile)(" - dwNoteRanges[3]: %lu\n", inst.dwNoteRanges[3]); + TRACE_(dmfile)(" - dwPChannel: %lu\n", inst.dwPChannel); + TRACE_(dmfile)(" - dwFlags: %lx\n", inst.dwFlags); TRACE_(dmfile)(" - bPan: %u\n", inst.bPan); TRACE_(dmfile)(" - bVolume: %u\n", inst.bVolume); TRACE_(dmfile)(" - nTranspose: %d\n", inst.nTranspose); - TRACE_(dmfile)(" - dwChannelPriority: %u\n", inst.dwChannelPriority); + TRACE_(dmfile)(" - dwChannelPriority: %lu\n", inst.dwChannelPriority); TRACE_(dmfile)(" - nPitchBendRange: %d\n", inst.nPitchBendRange); break; } @@ -272,7 +272,7 @@ static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK * break; } } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); + TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]); } while (ListCount[0] < ListSize[0]); /* @@ -321,7 +321,7 @@ static HRESULT parse_instruments_list(IDirectMusicBandImpl *This, DMUS_PRIVATE_C do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case FOURCC_LIST: { IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); @@ -351,7 +351,7 @@ static HRESULT parse_instruments_list(IDirectMusicBandImpl *This, DMUS_PRIVATE_C break; } } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); + TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]); } while (ListCount[0] < ListSize[0]); return S_OK; @@ -378,7 +378,7 @@ static HRESULT parse_band_form(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *p do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &This->dmobj.desc); if (FAILED(hr)) return hr; @@ -402,7 +402,7 @@ static HRESULT parse_band_form(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *p do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseUNFOGeneric(&Chunk, pStm, &This->dmobj.desc); if (FAILED(hr)) return hr; @@ -417,7 +417,7 @@ static HRESULT parse_band_form(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *p } } } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); + TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]); } while (ListCount[0] < ListSize[0]); break; } @@ -444,7 +444,7 @@ static HRESULT parse_band_form(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *p } } } - TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); + TRACE_(dmfile)(": StreamCount[0] = %ld < StreamSize[0] = %ld\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); return S_OK; @@ -465,11 +465,11 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS TRACE("(%p,%p): loading\n", This, pStm); IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case FOURCC_RIFF: { IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_BAND_FORM: { TRACE_(dmfile)(": Band form\n"); diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 612be063e19..0864e91bd4b 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -68,7 +68,7 @@ static ULONG WINAPI band_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -78,7 +78,7 @@ static ULONG WINAPI band_track_Release(IDirectMusicTrack8 *iface) IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -101,7 +101,7 @@ static HRESULT WINAPI band_track_InitPlay(IDirectMusicTrack8 *iface, { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %x): stub\n", This, segment_state, performance, state_data, virtual_track8id, flags); + FIXME("(%p, %p, %p, %p, %ld, %lx): stub\n", This, segment_state, performance, state_data, virtual_track8id, flags); return S_OK; } @@ -120,7 +120,7 @@ static HRESULT WINAPI band_track_Play(IDirectMusicTrack8 *iface, void *state_dat { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %x, %p, %p, %d): semi-stub\n", This, state_data, mtStart, mtEnd, mtOffset, flags, performance, segment_state, virtual_id); + FIXME("(%p, %p, %ld, %ld, %ld, %lx, %p, %p, %ld): semi-stub\n", This, state_data, mtStart, mtEnd, mtOffset, flags, performance, segment_state, virtual_id); /* Sends following pMSG: - DMUS_PATCH_PMSG @@ -137,7 +137,7 @@ static HRESULT WINAPI band_track_GetParam(IDirectMusicTrack8 *iface, REFGUID typ { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); if (!type) return E_POINTER; @@ -154,7 +154,7 @@ static HRESULT WINAPI band_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param); if (!type) return E_POINTER; @@ -234,7 +234,7 @@ static HRESULT WINAPI band_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtS MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -245,7 +245,7 @@ static HRESULT WINAPI band_track_PlayEx(IDirectMusicTrack8 *iface, void *state_d { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %x, %p, %p, %d): stub\n", This, state_data, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %lx, %p, %p, %ld): stub\n", This, state_data, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), flags, performance, segment_state, virtual_id); return S_OK; @@ -257,7 +257,7 @@ static HRESULT WINAPI band_track_GetParamEx(IDirectMusicTrack8 *iface, { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %x): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %lx): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), rtNext, param, state_data, flags); return S_OK; @@ -268,7 +268,7 @@ static HRESULT WINAPI band_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID r { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %x): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %lx): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), param, state_data, flags); return S_OK; @@ -279,7 +279,7 @@ static HRESULT WINAPI band_track_Compose(IDirectMusicTrack8 *iface, IUnknown *co { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -288,7 +288,7 @@ static HRESULT WINAPI band_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTra IDirectMusicTrack **ppResultTrack) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); + FIXME("(%p, %p, %ld, %p, %ld, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); return S_OK; } @@ -383,7 +383,7 @@ static HRESULT parse_bands_list(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case FOURCC_LIST: { IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); @@ -393,14 +393,14 @@ static HRESULT parse_bands_list(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[1] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_BANDITEM_CHUNK: { DMUS_IO_BAND_ITEM_HEADER tmp_header; TRACE_(dmfile)(": Band Item chunk v1\n"); IStream_Read (pStm, &tmp_header, sizeof(DMUS_IO_BAND_ITEM_HEADER), NULL); - TRACE_(dmfile)(" - lBandTime: %u\n", tmp_header.lBandTime); + TRACE_(dmfile)(" - lBandTime: %lu\n", tmp_header.lBandTime); header.dwVersion = 1; header.lBandTime = tmp_header.lBandTime; @@ -411,8 +411,8 @@ static HRESULT parse_bands_list(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK TRACE_(dmfile)(": Band Item chunk v2\n"); IStream_Read (pStm, &tmp_header2, sizeof(DMUS_IO_BAND_ITEM_HEADER2), NULL); - TRACE_(dmfile)(" - lBandTimeLogical: %u\n", tmp_header2.lBandTimeLogical); - TRACE_(dmfile)(" - lBandTimePhysical: %u\n", tmp_header2.lBandTimePhysical); + TRACE_(dmfile)(" - lBandTimeLogical: %lu\n", tmp_header2.lBandTimeLogical); + TRACE_(dmfile)(" - lBandTimePhysical: %lu\n", tmp_header2.lBandTimePhysical); header.dwVersion = 2; header.lBandTimeLogical = tmp_header2.lBandTimeLogical; @@ -465,7 +465,7 @@ static HRESULT parse_bands_list(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK break; } } - TRACE_(dmfile)(": ListCount[1] = %d < ListSize[1] = %d\n", ListCount[1], ListSize[1]); + TRACE_(dmfile)(": ListCount[1] = %ld < ListSize[1] = %ld\n", ListCount[1], ListSize[1]); } while (ListCount[1] < ListSize[1]); break; } @@ -476,7 +476,7 @@ static HRESULT parse_bands_list(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK break; } } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); + TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]); } while (ListCount[0] < ListSize[0]); return S_OK; @@ -501,7 +501,7 @@ static HRESULT parse_bandtrack_form(IDirectMusicBandTrack *This, DMUS_PRIVATE_CH do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &This->dmobj.desc); if (FAILED(hr)) return hr; @@ -525,7 +525,7 @@ static HRESULT parse_bandtrack_form(IDirectMusicBandTrack *This, DMUS_PRIVATE_CH do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseUNFOGeneric(&Chunk, pStm, &This->dmobj.desc); if (FAILED(hr)) return hr; @@ -540,7 +540,7 @@ static HRESULT parse_bandtrack_form(IDirectMusicBandTrack *This, DMUS_PRIVATE_CH } } } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); + TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]); } while (ListCount[0] < ListSize[0]); break; } @@ -567,7 +567,7 @@ static HRESULT parse_bandtrack_form(IDirectMusicBandTrack *This, DMUS_PRIVATE_CH } } } - TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); + TRACE_(dmfile)(": StreamCount[0] = %ld < StreamSize[0] = %ld\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); return S_OK; @@ -588,11 +588,11 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS TRACE("(%p, %p): Loading\n", This, pStm); IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case FOURCC_RIFF: { IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_BANDTRACK_FORM: { TRACE_(dmfile)(": Band track form\n"); diff --git a/dlls/dmband/dmobject.c b/dlls/dmband/dmobject.c index e6a1ce906a7..b526b23d031 100644 --- a/dlls/dmband/dmobject.c +++ b/dlls/dmband/dmobject.c @@ -226,10 +226,10 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) return; TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc); - TRACE_(dmfile)(" - dwSize = %u\n", desc->dwSize); + TRACE_(dmfile)(" - dwSize = %lu\n", desc->dwSize); #define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ") - TRACE_(dmfile)(" - dwValidData = %#08x ( ", desc->dwValidData); + TRACE_(dmfile)(" - dwValidData = %#08lx ( ", desc->dwValidData); X(DMUS_OBJ_OBJECT); X(DMUS_OBJ_CLASS); X(DMUS_OBJ_NAME); @@ -285,7 +285,7 @@ const char *debugstr_chunk(const struct chunk_entry *chunk) return "(null)"; if (chunk->id == FOURCC_RIFF || chunk->id == FOURCC_LIST) type = wine_dbg_sprintf("type %s, ", debugstr_fourcc(chunk->type)); - return wine_dbg_sprintf("%s chunk, %ssize %u", debugstr_fourcc(chunk->id), type, chunk->size); + return wine_dbg_sprintf("%s chunk, %ssize %lu", debugstr_fourcc(chunk->id), type, chunk->size); } static HRESULT stream_read(IStream *stream, void *data, ULONG size) @@ -295,10 +295,10 @@ static HRESULT stream_read(IStream *stream, void *data, ULONG size) hr = IStream_Read(stream, data, size, &read); if (FAILED(hr)) - TRACE_(dmfile)("IStream_Read failed: %08x\n", hr); + TRACE_(dmfile)("IStream_Read failed: %#lx\n", hr); else if (!read && read < size) { /* All or nothing: Handle a partial read due to end of stream as an error */ - TRACE_(dmfile)("Short read: %u < %u\n", read, size); + TRACE_(dmfile)("Short read: %lu < %lu\n", read, size); return E_FAIL; } @@ -393,7 +393,7 @@ HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, if (FAILED(hr = stream_read(stream, &size, sizeof(DWORD)))) return hr; if (size != elem_size) { - WARN_(dmfile)("%s: Array element size mismatch: got %u, expected %u\n", + WARN_(dmfile)("%s: Array element size mismatch: got %lu, expected %lu\n", debugstr_chunk(chunk), size, elem_size); return DMUS_E_UNSUPPORTED_STREAM; } @@ -420,7 +420,7 @@ HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, ULONG size) { if (chunk->size != size) { - WARN_(dmfile)("Chunk %s (size %u, offset %s) doesn't contains the expected data size %u\n", + WARN_(dmfile)("Chunk %s (size %lu, offset %s) doesn't contains the expected data size %lu\n", debugstr_fourcc(chunk->id), chunk->size, wine_dbgstr_longlong(chunk->offset.QuadPart), size); return E_FAIL; @@ -567,7 +567,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff, struct chunk_entry chunk = {.parent = riff}; HRESULT hr; - TRACE("Looking for %#x in %p: %s\n", supported, stream, debugstr_chunk(riff)); + TRACE("Looking for %#lx in %p: %s\n", supported, stream, debugstr_chunk(riff)); desc->dwValidData = 0; desc->dwSize = sizeof(*desc); @@ -612,7 +612,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff, break; } } - TRACE("Found %#x\n", desc->dwValidData); + TRACE("Found %#lx\n", desc->dwValidData); return hr; } @@ -636,7 +636,7 @@ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list, WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); return hr; } - TRACE("REFERENCE guidClassID %s, dwValidData %#x\n", debugstr_dmguid(&reference.guidClassID), + TRACE("REFERENCE guidClassID %s, dwValidData %#lx\n", debugstr_dmguid(&reference.guidClassID), reference.dwValidData); if (FAILED(hr = dmobj_parsedescriptor(stream, list, &desc, reference.dwValidData))) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index c676775d354..01cec0f4c64 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -169,7 +169,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &ref_desc); if (FAILED(hr)) return hr; @@ -181,7 +181,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, if (Chunk.dwSize != sizeof(DMUS_IO_REFERENCE)) return E_FAIL; IStream_Read (pStm, &ref, sizeof(DMUS_IO_REFERENCE), NULL); TRACE(" - guidClassID: %s\n", debugstr_dmguid(&ref.guidClassID)); - TRACE(" - dwValidData: %u\n", ref.dwValidData); + TRACE(" - dwValidData: %lu\n", ref.dwValidData); break; } default: { @@ -192,7 +192,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, } } } - TRACE(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); + TRACE(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]); } while (ListCount[0] < ListSize[0]); ref_desc.dwValidData |= DMUS_OBJ_CLASS; -- 2.34.1

1 0

[PATCH] dmband/tests: Build without -DWINE_NO_LONG_TYPES
by Michael Stefaniuc Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmband/tests/Makefile.in | 1 - dlls/dmband/tests/dmband.c | 142 +++++++++++++++++----------------- 2 files changed, 71 insertions(+), 72 deletions(-) diff --git a/dlls/dmband/tests/Makefile.in b/dlls/dmband/tests/Makefile.in index 201ecc98c97..ddce98f1085 100644 --- a/dlls/dmband/tests/Makefile.in +++ b/dlls/dmband/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dmband.dll IMPORTS = oleaut32 ole32 uuid diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index 4b8aaf61208..07ffcf4e7fe 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -59,37 +59,37 @@ static void test_COM(void) hr = CoCreateInstance(&CLSID_DirectMusicBand, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dmb); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicBand create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicBand create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dmb, "dmb = %p\n", dmb); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, (void**)&dmb); - ok(hr == E_NOINTERFACE, "DirectMusicBand create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicBand create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicBand interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicBand, (void**)&dmb); - ok(hr == S_OK, "DirectMusicBand create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicBand create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicBand_AddRef(dmb); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicBand_QueryInterface(dmb, &IID_IDirectMusicObject, (void**)&dmo); - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %#lx\n", hr); refcount = IDirectMusicObject_AddRef(dmo); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IDirectMusicObject_Release(dmo); hr = IDirectMusicBand_QueryInterface(dmb, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); refcount = IPersistStream_AddRef(ps); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IPersistStream_Release(ps); hr = IDirectMusicBand_QueryInterface(dmb, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount); refcount = IUnknown_Release(unk); while (IDirectMusicBand_Release(dmb)); @@ -108,39 +108,39 @@ static void test_COM_bandtrack(void) hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dmbt); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicBandTrack create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicBandTrack create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dmbt, "dmbt = %p\n", dmbt); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmbt); - ok(hr == E_NOINTERFACE, "DirectMusicBandTrack create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicBandTrack create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicBandTrack interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, (void**)&dmbt); - ok(hr == S_OK, "DirectMusicBandTrack create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicBandTrack create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicTrack_AddRef(dmbt); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicTrack_QueryInterface(dmbt, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); refcount = IPersistStream_AddRef(ps); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); IPersistStream_Release(ps); hr = IDirectMusicTrack_QueryInterface(dmbt, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IUnknown_Release(unk); hr = IDirectMusicTrack_QueryInterface(dmbt, &IID_IDirectMusicBandTrackPrivate, (void**)&private); - todo_wine ok(hr == S_OK, "QueryInterface for IID_IDirectMusicBandTrackPrivate failed: %08x\n", hr); + todo_wine ok(hr == S_OK, "QueryInterface for IID_IDirectMusicBandTrackPrivate failed: %#lx\n", hr); if (hr == S_OK) { refcount = IUnknown_AddRef(private); - ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount); refcount = IUnknown_Release(private); } @@ -157,19 +157,19 @@ static void test_dmband(void) hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicBand, (void**)&dmb); - ok(hr == S_OK, "DirectMusicBand create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicBand create failed: %#lx, expected S_OK\n", hr); /* Unimplemented IPersistStream methods */ hr = IDirectMusicBand_QueryInterface(dmb, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == E_NOTIMPL, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_GetClassID failed: %#lx\n", hr); hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %#lx\n", hr); hr = IPersistStream_GetSizeMax(ps, &size); - ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %#lx\n", hr); hr = IPersistStream_Save(ps, NULL, TRUE); - ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %#lx\n", hr); while (IDirectMusicBand_Release(dmb)); } @@ -223,86 +223,86 @@ static void test_bandtrack(void) hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, (void**)&dmt8); - ok(hr == S_OK, "DirectMusicBandTrack create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicBandTrack create failed: %#lx, expected S_OK\n", hr); /* IDirectMusicTrack8 */ todo_wine { hr = IDirectMusicTrack8_Init(dmt8, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %#lx\n", hr); hr = IDirectMusicTrack8_InitPlay(dmt8, NULL, NULL, NULL, 0, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %#lx\n", hr); } hr = IDirectMusicTrack8_EndPlay(dmt8, NULL); - ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); + ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %#lx\n", hr); hr = IDirectMusicTrack8_Play(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); todo_wine - ok(hr == DMUS_S_END, "IDirectMusicTrack8_Play failed: %08x\n", hr); + ok(hr == DMUS_S_END, "IDirectMusicTrack8_Play failed: %#lx\n", hr); hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %#lx\n", hr); hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %#lx\n", hr); hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %#lx\n", hr); for (i = 0; i < ARRAY_SIZE(param_types); i++) { hr = IDirectMusicTrack8_IsParamSupported(dmt8, param_types[i].type); if (param_types[i].supported) { - ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + ok(hr == S_OK, "IsParamSupported(%s) failed: %#lx, expected S_OK\n", param_types[i].name, hr); hr = IDirectMusicTrack8_GetParam(dmt8, param_types[i].type, 0, NULL, buf); if (param_types[i].type != &GUID_BandParam) ok(hr == DMUS_E_GET_UNSUPPORTED, - "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + "GetParam(%s) failed: %#lx, expected DMUS_E_GET_UNSUPPORTED\n", param_types[i].name, hr); } else { ok(hr == DMUS_E_TYPE_UNSUPPORTED, - "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + "IsParamSupported(%s) failed: %#lx, expected DMUS_E_TYPE_UNSUPPORTED\n", param_types[i].name, hr); hr = IDirectMusicTrack8_GetParam(dmt8, param_types[i].type, 0, NULL, buf); ok(hr == DMUS_E_GET_UNSUPPORTED, - "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + "GetParam(%s) failed: %#lx, expected DMUS_E_GET_UNSUPPORTED\n", param_types[i].name, hr); hr = IDirectMusicTrack8_SetParam(dmt8, param_types[i].type, 0, buf); ok(hr == DMUS_E_TYPE_UNSUPPORTED, - "SetParam(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + "SetParam(%s) failed: %#lx, expected DMUS_E_TYPE_UNSUPPORTED\n", param_types[i].name, hr); } } hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %#lx\n", hr); hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %#lx\n", hr); todo_wine { hr = IDirectMusicTrack8_Clone(dmt8, 0, 0, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %#lx\n", hr); hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); - ok(hr == DMUS_S_END, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + ok(hr == DMUS_S_END, "IDirectMusicTrack8_PlayEx failed: %#lx\n", hr); hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParamEx failed: %#lx\n", hr); hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParamEx failed: %#lx\n", hr); } hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %#lx\n", hr); hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %#lx\n", hr); /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %#lx\n", hr); ok(IsEqualGUID(&class, &CLSID_DirectMusicBandTrack), "Expected class CLSID_DirectMusicBandTrack got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %#lx\n", hr); hr = IPersistStream_GetSizeMax(ps, &size); - ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %#lx\n", hr); hr = IPersistStream_Save(ps, NULL, TRUE); - ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %#lx\n", hr); while (IDirectMusicTrack8_Release(dmt8)); } @@ -416,12 +416,12 @@ static void test_parsedescriptor(void) hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void **)&dmo); - ok(hr == S_OK, "DirectMusicBand create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicBand create failed: %#lx, expected S_OK\n", hr); /* Nothing loaded */ hr = IDirectMusicObject_GetDescriptor(dmo, &desc); - ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", + ok(hr == S_OK, "GetDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_OBJECT\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicBand), "Got class guid %s, expected CLSID_DirectMusicBand\n", @@ -431,8 +431,8 @@ static void test_parsedescriptor(void) stream = gen_riff_stream(empty); memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicBand), "Got class guid %s, expected CLSID_DirectMusicBand\n", @@ -442,34 +442,34 @@ static void test_parsedescriptor(void) /* NULL pointers */ memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, NULL, &desc); - ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "ParseDescriptor failed: %#lx, expected E_POINTER\n", hr); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, NULL); - ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "ParseDescriptor failed: %#lx, expected E_POINTER\n", hr); /* Wrong form */ empty[1] = DMUS_FOURCC_CONTAINER_FORM; stream = gen_riff_stream(empty); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == DMUS_E_INVALID_BAND, - "ParseDescriptor failed: %08x, expected DMUS_E_INVALID_BAND\n", hr); + "ParseDescriptor failed: %#lx, expected DMUS_E_INVALID_BAND\n", hr); IStream_Release(stream); /* A category chunk adds DMUS_OBJ_DATE too */ stream = gen_riff_stream(catdate); memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); valid = DMUS_OBJ_CLASS | DMUS_OBJ_CATEGORY | DMUS_OBJ_DATE; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); IStream_Release(stream); /* All desc chunks, extra DMUS_OBJ_DATE */ stream = gen_riff_stream(alldesc); memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION|DMUS_OBJ_DATE; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicBand), "Got class guid %s, expected CLSID_DirectMusicBand\n", wine_dbgstr_guid(&desc.guidClass)); @@ -478,7 +478,7 @@ static void test_parsedescriptor(void) ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); ok(!desc.ftDate.dwHighDateTime && !desc.ftDate.dwLowDateTime, - "Got file time %08x %08x, expected 0\n", desc.ftDate.dwHighDateTime, + "Got file time %#08lx %#08lx, expected 0\n", desc.ftDate.dwHighDateTime, desc.ftDate.dwLowDateTime); IStream_Release(stream); @@ -487,9 +487,9 @@ static void test_parsedescriptor(void) stream = gen_riff_stream(inam); memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME), - "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); + "Got valid data %#lx, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -499,8 +499,8 @@ static void test_parsedescriptor(void) stream = gen_riff_stream(inam); memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); IStream_Release(stream); @@ -508,9 +508,9 @@ static void test_parsedescriptor(void) stream = gen_riff_stream(dupes); memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION|DMUS_OBJ_DATE; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); -- 2.34.1

1 0

[PATCH] dmime: Build without -DWINE_NO_LONG_TYPES
by Michael Stefaniuc Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/Makefile.in | 1 - dlls/dmime/audiopath.c | 10 +++--- dlls/dmime/dmobject.c | 20 ++++++------ dlls/dmime/graph.c | 8 ++--- dlls/dmime/lyricstrack.c | 32 +++++++++--------- dlls/dmime/markertrack.c | 14 ++++---- dlls/dmime/paramcontroltrack.c | 24 +++++++------- dlls/dmime/performance.c | 60 +++++++++++++++++----------------- dlls/dmime/segment.c | 58 ++++++++++++++++---------------- dlls/dmime/segmentstate.c | 8 ++--- dlls/dmime/segtriggertrack.c | 34 +++++++++---------- dlls/dmime/seqtrack.c | 24 +++++++------- dlls/dmime/sysextrack.c | 24 +++++++------- dlls/dmime/tempotrack.c | 26 +++++++-------- dlls/dmime/timesigtrack.c | 16 ++++----- dlls/dmime/wavetrack.c | 50 ++++++++++++++-------------- 16 files changed, 204 insertions(+), 205 deletions(-) diff --git a/dlls/dmime/Makefile.in b/dlls/dmime/Makefile.in index 4098a2c9fdb..51d1492585f 100644 --- a/dlls/dmime/Makefile.in +++ b/dlls/dmime/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dmime.dll IMPORTS = dxguid uuid dsound ole32 user32 advapi32 diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 078d843d466..5018be9d453 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -94,7 +94,7 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_AddRef (IDirectMusicAudioPath *ifa struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p): AddRef from %d\n", This, ref - 1); + TRACE("(%p): ref=%ld\n", This, ref); DMIME_LockModule(); return ref; @@ -105,7 +105,7 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_Release (IDirectMusicAudioPath *if struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ReleaseRef to %d\n", This, ref); + TRACE("(%p): ref=%ld\n", This, ref); if (ref == 0) { if (This->pPrimary) @@ -126,7 +126,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); HRESULT hr; - FIXME("(%p, %d, %d, %d, %s, %d, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), + FIXME("(%p, %ld, %ld, %ld, %s, %d, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), dwIndex, debugstr_dmguid(iidInterface), ppObject); switch (dwStage) { @@ -238,14 +238,14 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_Activate(IDirectMusicAudioPath * static HRESULT WINAPI IDirectMusicAudioPathImpl_SetVolume (IDirectMusicAudioPath *iface, LONG lVolume, DWORD dwDuration) { struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); - FIXME("(%p, %i, %d): stub\n", This, lVolume, dwDuration); + FIXME("(%p, %li, %ld): stub\n", This, lVolume, dwDuration); return S_OK; } static HRESULT WINAPI IDirectMusicAudioPathImpl_ConvertPChannel (IDirectMusicAudioPath *iface, DWORD dwPChannelIn, DWORD* pdwPChannelOut) { struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); - FIXME("(%p, %d, %p): stub\n", This, dwPChannelIn, pdwPChannelOut); + FIXME("(%p, %ld, %p): stub\n", This, dwPChannelIn, pdwPChannelOut); return S_OK; } diff --git a/dlls/dmime/dmobject.c b/dlls/dmime/dmobject.c index e6a1ce906a7..b526b23d031 100644 --- a/dlls/dmime/dmobject.c +++ b/dlls/dmime/dmobject.c @@ -226,10 +226,10 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) return; TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc); - TRACE_(dmfile)(" - dwSize = %u\n", desc->dwSize); + TRACE_(dmfile)(" - dwSize = %lu\n", desc->dwSize); #define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ") - TRACE_(dmfile)(" - dwValidData = %#08x ( ", desc->dwValidData); + TRACE_(dmfile)(" - dwValidData = %#08lx ( ", desc->dwValidData); X(DMUS_OBJ_OBJECT); X(DMUS_OBJ_CLASS); X(DMUS_OBJ_NAME); @@ -285,7 +285,7 @@ const char *debugstr_chunk(const struct chunk_entry *chunk) return "(null)"; if (chunk->id == FOURCC_RIFF || chunk->id == FOURCC_LIST) type = wine_dbg_sprintf("type %s, ", debugstr_fourcc(chunk->type)); - return wine_dbg_sprintf("%s chunk, %ssize %u", debugstr_fourcc(chunk->id), type, chunk->size); + return wine_dbg_sprintf("%s chunk, %ssize %lu", debugstr_fourcc(chunk->id), type, chunk->size); } static HRESULT stream_read(IStream *stream, void *data, ULONG size) @@ -295,10 +295,10 @@ static HRESULT stream_read(IStream *stream, void *data, ULONG size) hr = IStream_Read(stream, data, size, &read); if (FAILED(hr)) - TRACE_(dmfile)("IStream_Read failed: %08x\n", hr); + TRACE_(dmfile)("IStream_Read failed: %#lx\n", hr); else if (!read && read < size) { /* All or nothing: Handle a partial read due to end of stream as an error */ - TRACE_(dmfile)("Short read: %u < %u\n", read, size); + TRACE_(dmfile)("Short read: %lu < %lu\n", read, size); return E_FAIL; } @@ -393,7 +393,7 @@ HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, if (FAILED(hr = stream_read(stream, &size, sizeof(DWORD)))) return hr; if (size != elem_size) { - WARN_(dmfile)("%s: Array element size mismatch: got %u, expected %u\n", + WARN_(dmfile)("%s: Array element size mismatch: got %lu, expected %lu\n", debugstr_chunk(chunk), size, elem_size); return DMUS_E_UNSUPPORTED_STREAM; } @@ -420,7 +420,7 @@ HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, ULONG size) { if (chunk->size != size) { - WARN_(dmfile)("Chunk %s (size %u, offset %s) doesn't contains the expected data size %u\n", + WARN_(dmfile)("Chunk %s (size %lu, offset %s) doesn't contains the expected data size %lu\n", debugstr_fourcc(chunk->id), chunk->size, wine_dbgstr_longlong(chunk->offset.QuadPart), size); return E_FAIL; @@ -567,7 +567,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff, struct chunk_entry chunk = {.parent = riff}; HRESULT hr; - TRACE("Looking for %#x in %p: %s\n", supported, stream, debugstr_chunk(riff)); + TRACE("Looking for %#lx in %p: %s\n", supported, stream, debugstr_chunk(riff)); desc->dwValidData = 0; desc->dwSize = sizeof(*desc); @@ -612,7 +612,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff, break; } } - TRACE("Found %#x\n", desc->dwValidData); + TRACE("Found %#lx\n", desc->dwValidData); return hr; } @@ -636,7 +636,7 @@ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list, WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); return hr; } - TRACE("REFERENCE guidClassID %s, dwValidData %#x\n", debugstr_dmguid(&reference.guidClassID), + TRACE("REFERENCE guidClassID %s, dwValidData %#lx\n", debugstr_dmguid(&reference.guidClassID), reference.dwValidData); if (FAILED(hr = dmobj_parsedescriptor(stream, list, &desc, reference.dwValidData))) diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index 85eef9c091d..526163e5b54 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -73,7 +73,7 @@ static ULONG WINAPI DirectMusicGraph_AddRef(IDirectMusicGraph *iface) IDirectMusicGraphImpl *This = impl_from_IDirectMusicGraph(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p): %d\n", This, ref); + TRACE("(%p): %ld\n", This, ref); DMIME_LockModule(); return ref; @@ -84,7 +84,7 @@ static ULONG WINAPI DirectMusicGraph_Release(IDirectMusicGraph *iface) IDirectMusicGraphImpl *This = impl_from_IDirectMusicGraph(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): %d\n", This, ref); + TRACE("(%p): %ld\n", This, ref); if (ref == 0) HeapFree(GetProcessHeap(), 0, This); @@ -108,7 +108,7 @@ static HRESULT WINAPI DirectMusicGraph_InsertTool(IDirectMusicGraph *iface, IDir LPDMUS_PRIVATE_GRAPH_TOOL pIt = NULL; LPDMUS_PRIVATE_GRAPH_TOOL pNewTool = NULL; - FIXME("(%p, %p, %p, %d, %i): use of pdwPChannels\n", This, pTool, pdwPChannels, cPChannels, lIndex); + FIXME("(%p, %p, %p, %ld, %li): use of pdwPChannels\n", This, pTool, pdwPChannels, cPChannels, lIndex); if (!pTool) return E_POINTER; @@ -150,7 +150,7 @@ static HRESULT WINAPI DirectMusicGraph_GetTool(IDirectMusicGraph *iface, DWORD d struct list* pEntry = NULL; LPDMUS_PRIVATE_GRAPH_TOOL pIt = NULL; - TRACE("(%p, %d, %p)\n", This, dwIndex, ppTool); + TRACE("(%p, %ld, %p)\n", This, dwIndex, ppTool); LIST_FOR_EACH (pEntry, &This->Tools) { diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c index b2ce3e0a4c1..769713a6ba1 100644 --- a/dlls/dmime/lyricstrack.c +++ b/dlls/dmime/lyricstrack.c @@ -70,7 +70,7 @@ static ULONG WINAPI lyrics_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -80,7 +80,7 @@ static ULONG WINAPI lyrics_track_Release(IDirectMusicTrack8 *iface) IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -102,7 +102,7 @@ static HRESULT WINAPI lyrics_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -118,7 +118,7 @@ static HRESULT WINAPI lyrics_track_Play(IDirectMusicTrack8 *iface, void *pStateD IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -127,7 +127,7 @@ static HRESULT WINAPI lyrics_track_GetParam(IDirectMusicTrack8 *iface, REFGUID t { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); return DMUS_E_GET_UNSUPPORTED; } @@ -136,7 +136,7 @@ static HRESULT WINAPI lyrics_track_SetParam(IDirectMusicTrack8 *iface, REFGUID t { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): not supported\n", This, debugstr_dmguid(type), time, param); return DMUS_E_SET_UNSUPPORTED; } @@ -169,7 +169,7 @@ static HRESULT WINAPI lyrics_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME m MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -178,7 +178,7 @@ static HRESULT WINAPI lyrics_track_PlayEx(IDirectMusicTrack8 *iface, void *pStat IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -188,7 +188,7 @@ static HRESULT WINAPI lyrics_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID DWORD dwFlags) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -197,7 +197,7 @@ static HRESULT WINAPI lyrics_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -207,7 +207,7 @@ static HRESULT WINAPI lyrics_track_Compose(IDirectMusicTrack8 *iface, IUnknown * { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -215,7 +215,7 @@ static HRESULT WINAPI lyrics_track_Join(IDirectMusicTrack8 *iface, IDirectMusicT MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } @@ -267,10 +267,10 @@ static HRESULT parse_lyrics_track_events(IDirectMusicLyricsTrack *This, IStream } TRACE("Found DMUS_IO_LYRICSTRACK_EVENTHEADER\n"); - TRACE(" - dwFlags 0x%08x\n", header.dwFlags); - TRACE(" - dwTimingFlags 0x%08x\n", header.dwTimingFlags); - TRACE(" - lTimeLogical %d\n", header.lTimeLogical); - TRACE(" - lTimePhysical %d\n", header.lTimePhysical); + TRACE(" - dwFlags %#lx\n", header.dwFlags); + TRACE(" - dwTimingFlags %#lx\n", header.dwTimingFlags); + TRACE(" - lTimeLogical %ld\n", header.lTimeLogical); + TRACE(" - lTimePhysical %ld\n", header.lTimePhysical); if (FAILED(hr = stream_next_chunk(stream, &child))) return hr; diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c index f41bed668a6..cfb788ccf50 100644 --- a/dlls/dmime/markertrack.c +++ b/dlls/dmime/markertrack.c @@ -64,7 +64,7 @@ static ULONG WINAPI IDirectMusicTrackImpl_AddRef(IDirectMusicTrack *iface) IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -74,7 +74,7 @@ static ULONG WINAPI IDirectMusicTrackImpl_Release(IDirectMusicTrack *iface) IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -97,7 +97,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_InitPlay(IDirectMusicTrack *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -113,7 +113,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Play(IDirectMusicTrack *iface, void IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -122,7 +122,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_GetParam(IDirectMusicTrack *iface, R { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); if (!param) return E_POINTER; @@ -144,7 +144,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_SetParam(IDirectMusicTrack *iface, R { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): not supported\n", This, debugstr_dmguid(type), time, param); return DMUS_E_SET_UNSUPPORTED; } @@ -183,7 +183,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Clone(IDirectMusicTrack *iface, MUSI MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } diff --git a/dlls/dmime/paramcontroltrack.c b/dlls/dmime/paramcontroltrack.c index 8fb3d40332f..c0aed374101 100644 --- a/dlls/dmime/paramcontroltrack.c +++ b/dlls/dmime/paramcontroltrack.c @@ -65,7 +65,7 @@ static ULONG WINAPI paramcontrol_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -75,7 +75,7 @@ static ULONG WINAPI paramcontrol_track_Release(IDirectMusicTrack8 *iface) IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -98,7 +98,7 @@ static HRESULT WINAPI paramcontrol_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -114,7 +114,7 @@ static HRESULT WINAPI paramcontrol_track_Play(IDirectMusicTrack8 *iface, void *p IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -123,7 +123,7 @@ static HRESULT WINAPI paramcontrol_track_GetParam(IDirectMusicTrack8 *iface, REF { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); return DMUS_E_GET_UNSUPPORTED; } @@ -132,7 +132,7 @@ static HRESULT WINAPI paramcontrol_track_SetParam(IDirectMusicTrack8 *iface, REF { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): not supported\n", This, debugstr_dmguid(type), time, param); return DMUS_E_SET_UNSUPPORTED; } @@ -166,7 +166,7 @@ static HRESULT WINAPI paramcontrol_track_Clone(IDirectMusicTrack8 *iface, MUSIC_ MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -175,7 +175,7 @@ static HRESULT WINAPI paramcontrol_track_PlayEx(IDirectMusicTrack8 *iface, void IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -185,7 +185,7 @@ static HRESULT WINAPI paramcontrol_track_GetParamEx(IDirectMusicTrack8 *iface, R DWORD dwFlags) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -194,7 +194,7 @@ static HRESULT WINAPI paramcontrol_track_SetParamEx(IDirectMusicTrack8 *iface, R REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -204,7 +204,7 @@ static HRESULT WINAPI paramcontrol_track_Compose(IDirectMusicTrack8 *iface, IUnk { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -213,7 +213,7 @@ static HRESULT WINAPI paramcontrol_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTrack **resulttrack) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 58d16de234d..f59be107c58 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -103,7 +103,7 @@ static DMUS_PMSGItem* ProceedMsg(IDirectMusicPerformance8Impl* This, DMUS_PMSGIt case DMUS_PMSGT_TEMPO: case DMUS_PMSGT_STOP: default: - FIXME("Unhandled PMsg Type: 0x%x\n", cur->pMsg.dwType); + FIXME("Unhandled PMsg Type: %#lx\n", cur->pMsg.dwType); break; } return cur; @@ -276,7 +276,7 @@ static ULONG WINAPI IDirectMusicPerformance8Impl_AddRef(IDirectMusicPerformance8 IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p): AddRef from %d\n", This, ref - 1); + TRACE("(%p): ref=%ld\n", This, ref); DMIME_LockModule(); @@ -288,7 +288,7 @@ static ULONG WINAPI IDirectMusicPerformance8Impl_Release(IDirectMusicPerformance IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ReleaseRef to %d\n", This, ref); + TRACE("(%p): ref=%ld\n", This, ref); if (ref == 0) { wine_rb_destroy(&This->pchannels, pchannel_block_free, NULL); @@ -318,7 +318,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_PlaySegment(IDirectMusicPerfo { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p, %d, 0x%s, %p): stub\n", This, pSegment, dwFlags, + FIXME("(%p, %p, %ld, 0x%s, %p): stub\n", This, pSegment, dwFlags, wine_dbgstr_longlong(i64StartTime), ppSegmentState); if (ppSegmentState) return create_dmsegmentstate(&IID_IDirectMusicSegmentState,(void**)ppSegmentState); @@ -331,7 +331,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Stop(IDirectMusicPerformance8 { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p, %p, %d, %d): stub\n", This, pSegment, pSegmentState, mtTime, dwFlags); + FIXME("(%p, %p, %p, %ld, %ld): stub\n", This, pSegment, pSegmentState, mtTime, dwFlags); return S_OK; } @@ -340,7 +340,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetSegmentState(IDirectMusicP { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p,%p, %d): stub\n", This, ppSegmentState, mtTime); + FIXME("(%p,%p, %ld): stub\n", This, ppSegmentState, mtTime); return S_OK; } @@ -349,7 +349,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetPrepareTime(IDirectMusicPe { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - TRACE("(%p, %d)\n", This, dwMilliSeconds); + TRACE("(%p, %ld)\n", This, dwMilliSeconds); This->dwPrepareTime = dwMilliSeconds; return S_OK; } @@ -372,7 +372,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetBumperLength(IDirectMusicP { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - TRACE("(%p, %d)\n", This, dwMilliSeconds); + TRACE("(%p, %ld)\n", This, dwMilliSeconds); This->dwBumperLength = dwMilliSeconds; return S_OK; } @@ -447,7 +447,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_MusicToReferenceTime(IDirectM { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %d, %p): stub\n", This, mtTime, prtTime); + FIXME("(%p, %ld, %p): stub\n", This, mtTime, prtTime); return S_OK; } @@ -496,9 +496,9 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AllocPMsg(IDirectMusicPerform { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); DMUS_PMSGItem* pItem = NULL; - - FIXME("(%p, %d, %p): stub\n", This, cb, ppPMSG); - + + FIXME("(%p, %ld, %p): stub\n", This, cb, ppPMSG); + if (sizeof(DMUS_PMSG) > cb) { return E_INVALIDARG; } @@ -698,7 +698,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannelBlock(IDirectMu { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %d, %p, %d): semi-stub\n", This, block_num, port, group); + FIXME("(%p, %ld, %p, %ld): semi-stub\n", This, block_num, port, group); if (!port) return E_POINTER; @@ -716,7 +716,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannel(IDirectMusicPe IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); struct pchannel_block *block; - FIXME("(%p)->(%d, %p, %d, %d) semi-stub\n", This, pchannel, port, group, channel); + FIXME("(%p)->(%ld, %p, %ld, %ld) semi-stub\n", This, pchannel, port, group, channel); if (!port) return E_POINTER; @@ -739,7 +739,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_PChannelInfo(IDirectMusicPerf DWORD block_num = pchannel / 16; unsigned int index = pchannel % 16; - TRACE("(%p)->(%d, %p, %p, %p)\n", This, pchannel, port, group, channel); + TRACE("(%p)->(%ld, %p, %p, %p)\n", This, pchannel, port, group, channel); entry = wine_rb_get(&This->pchannels, &block_num); if (!entry) @@ -765,7 +765,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_DownloadInstrument(IDirectMus { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p, %d, %p, %p, %d, %p, %p, %p): stub\n", This, pInst, dwPChannel, ppDownInst, pNoteRanges, dwNumNoteRanges, ppPort, pdwGroup, pdwMChannel); + FIXME("(%p, %p, %ld, %p, %p, %ld, %p, %p, %p): stub\n", This, pInst, dwPChannel, ppDownInst, pNoteRanges, dwNumNoteRanges, ppPort, pdwGroup, pdwMChannel); return S_OK; } @@ -774,7 +774,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Invalidate(IDirectMusicPerfor { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %d, %d): stub\n", This, mtTime, dwFlags); + FIXME("(%p, %ld, %ld): stub\n", This, mtTime, dwFlags); return S_OK; } @@ -784,7 +784,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetParam(IDirectMusicPerforma { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %s, %d, %d, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pmtNext, pParam); + FIXME("(%p, %s, %ld, %ld, %ld, %p, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pmtNext, pParam); return S_OK; } @@ -793,7 +793,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetParam(IDirectMusicPerforma { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %s, %d, %d, %d, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); + FIXME("(%p, %s, %ld, %ld, %ld, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); return S_OK; } @@ -802,8 +802,8 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetGlobalParam(IDirectMusicPe { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - TRACE("(%p, %s, %p, %d): stub\n", This, debugstr_dmguid(rguidType), pParam, dwSize); - + TRACE("(%p, %s, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), pParam, dwSize); + if (IsEqualGUID (rguidType, &GUID_PerfAutoDownload)) memcpy(pParam, &This->fAutoDownload, sizeof(This->fAutoDownload)); if (IsEqualGUID (rguidType, &GUID_PerfMasterGrooveLevel)) @@ -821,8 +821,8 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetGlobalParam(IDirectMusicPe { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - TRACE("(%p, %s, %p, %d)\n", This, debugstr_dmguid(rguidType), pParam, dwSize); - + TRACE("(%p, %s, %p, %ld)\n", This, debugstr_dmguid(rguidType), pParam, dwSize); + if (IsEqualGUID (rguidType, &GUID_PerfAutoDownload)) { memcpy(&This->fAutoDownload, pParam, dwSize); TRACE("=> AutoDownload set to %d\n", This->fAutoDownload); @@ -900,7 +900,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetResolvedTime(IDirectMusicP { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, 0x%s, %p, %d): stub\n", This, wine_dbgstr_longlong(rtTime), + FIXME("(%p, 0x%s, %p, %ld): stub\n", This, wine_dbgstr_longlong(rtTime), prtResolved, dwTimeResolveFlags); return S_OK; } @@ -931,7 +931,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_TimeToRhythm(IDirectMusicPerf { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %d, %p, %p, %p, %p, %p): stub\n", This, mtTime, pTimeSig, pwMeasure, pbBeat, pbGrid, pnOffset); + FIXME("(%p, %ld, %p, %p, %p, %p, %p): stub\n", This, mtTime, pTimeSig, pwMeasure, pbBeat, pbGrid, pnOffset); return S_OK; } @@ -953,7 +953,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerform IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); HRESULT hr = S_OK; - TRACE("(%p, %p, %p, %p, %x, %u, %x, %p)\n", This, dmusic, dsound, hwnd, default_path_type, + TRACE("(%p, %p, %p, %p, %lx, %lu, %lx, %p)\n", This, dmusic, dsound, hwnd, default_path_type, num_channels, flags, params); if (This->dmusic) @@ -1038,7 +1038,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_PlaySegmentEx(IDirectMusicPer { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p, %p, %p, %d, 0x%s, %p, %p, %p): stub\n", This, pSource, pwzSegmentName, + FIXME("(%p, %p, %p, %p, %ld, 0x%s, %p, %p, %p): stub\n", This, pSource, pwzSegmentName, pTransition, dwFlags, wine_dbgstr_longlong(i64StartTime), ppSegmentState, pFrom, pAudioPath); if (ppSegmentState) return create_dmsegmentstate(&IID_IDirectMusicSegmentState,(void**)ppSegmentState); @@ -1050,7 +1050,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_StopEx(IDirectMusicPerformanc { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p, 0x%s, %d): stub\n", This, pObjectToStop, + FIXME("(%p, %p, 0x%s, %ld): stub\n", This, pObjectToStop, wine_dbgstr_longlong(i64StopTime), dwFlags); return S_OK; } @@ -1097,7 +1097,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire IDirectSoundBuffer *buffer, *primary_buffer; HRESULT hr = S_OK; - FIXME("(%p)->(%d, %d, %d, %p): semi-stub\n", This, dwType, pchannel_count, fActivate, ppNewPath); + FIXME("(%p)->(%ld, %ld, %d, %p): semi-stub\n", This, dwType, pchannel_count, fActivate, ppNewPath); if (NULL == ppNewPath) { return E_POINTER; @@ -1222,7 +1222,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetParamEx(IDirectMusicPerfor { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %s, %d, %d, %d, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), dwTrackID, dwGroupBits, dwIndex, mtTime, pmtNext, pParam); + FIXME("(%p, %s, %ld, %ld, %ld, %ld, %p, %p): stub\n", This, debugstr_dmguid(rguidType), dwTrackID, dwGroupBits, dwIndex, mtTime, pmtNext, pParam); return S_OK; } diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 326ffe98e18..8ec4059e8f9 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -71,7 +71,7 @@ static ULONG WINAPI IDirectMusicSegment8Impl_AddRef(IDirectMusicSegment8 *iface) IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -81,7 +81,7 @@ static ULONG WINAPI IDirectMusicSegment8Impl_Release(IDirectMusicSegment8 *iface IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -109,7 +109,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetLength(IDirectMusicSegment8 *i { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - TRACE("(%p, %d)\n", This, mtLength); + TRACE("(%p, %ld)\n", This, mtLength); This->header.mtLength = mtLength; return S_OK; } @@ -132,7 +132,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetRepeats(IDirectMusicSegment8 * { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - TRACE("(%p, %d)\n", This, dwRepeats); + TRACE("(%p, %ld)\n", This, dwRepeats); This->header.dwRepeats = dwRepeats; return S_OK; } @@ -155,7 +155,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetDefaultResolution(IDirectMusic { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - TRACE("(%p, %d)\n", This, dwResolution); + TRACE("(%p, %ld)\n", This, dwResolution); This->header.dwResolution = dwResolution; return S_OK; } @@ -170,7 +170,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrack(IDirectMusicSegment8 *if IPersistStream* pCLSIDStream = NULL; HRESULT hr = S_OK; - TRACE("(%p, %s, %#x, %#x, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, ppTrack); + TRACE("(%p, %s, %#lx, %#lx, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, ppTrack); if (NULL == ppTrack) { return E_POINTER; @@ -178,7 +178,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrack(IDirectMusicSegment8 *if LIST_FOR_EACH (pEntry, &This->Tracks) { pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); - TRACE(" - %p -> 0x%x,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack); + TRACE(" - %p -> %#lx,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack); if (0xFFFFFFFF != dwGroupBits && 0 == (pIt->dwGroupBits & dwGroupBits)) continue ; if (FALSE == IsEqualGUID(&GUID_NULL, rguidType)) { /** @@ -224,7 +224,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrackGroup(IDirectMusicSegment LIST_FOR_EACH (pEntry, &This->Tracks) { pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); - TRACE(" - %p -> %#x, %p\n", pIt, pIt->dwGroupBits, pIt->pTrack); + TRACE(" - %p -> %#lx, %p\n", pIt, pIt->dwGroupBits, pIt->pTrack); if (NULL != pIt && pIt->pTrack == pTrack) { *pdwGroupBits = pIt->dwGroupBits; return S_OK; @@ -243,7 +243,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL; LPDMUS_PRIVATE_SEGMENT_TRACK pNewSegTrack = NULL; - TRACE("(%p, %p, %#x)\n", This, pTrack, group); + TRACE("(%p, %p, %#lx)\n", This, pTrack, group); if (!group) return E_INVALIDARG; @@ -251,7 +251,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 LIST_FOR_EACH (pEntry, &This->Tracks) { i++; pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); - TRACE(" - #%u: %p -> %#x, %p\n", i, pIt, pIt->dwGroupBits, pIt->pTrack); + TRACE(" - #%lu: %p -> %#lx, %p\n", i, pIt, pIt->dwGroupBits, pIt->pTrack); if (NULL != pIt && pIt->pTrack == pTrack) { ERR("(%p, %p): track is already in list\n", This, pTrack); return E_FAIL; @@ -303,7 +303,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InitPlay(IDirectMusicSegment8 *if IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); HRESULT hr; - FIXME("(%p, %p, %p, %d): semi-stub\n", This, ppSegState, pPerformance, dwFlags); + FIXME("(%p, %p, %p, %ld): semi-stub\n", This, ppSegState, pPerformance, dwFlags); if (NULL == ppSegState) { return E_POINTER; } @@ -376,7 +376,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetParam(IDirectMusicSegment8 *if unsigned int i, count; HRESULT hr = DMUS_E_TRACK_NOT_FOUND; - TRACE("(%p, %s, %#x, %u, %d, %p, %p)\n", This, debugstr_dmguid(type), group, index, time, + TRACE("(%p, %s, %#lx, %lu, %ld, %p, %p)\n", This, debugstr_dmguid(type), group, index, time, next, param); if (!type) @@ -406,7 +406,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetParam(IDirectMusicSegment8 *if REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, MUSIC_TIME mtTime, void *pParam) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %s, %#x, %d, %d, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); + FIXME("(%p, %s, %#lx, %ld, %ld, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); return S_OK; } @@ -414,7 +414,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_Clone(IDirectMusicSegment8 *iface MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicSegment **ppSegment) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppSegment); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppSegment); return S_OK; } @@ -423,7 +423,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetStartPoint(IDirectMusicSegment { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - TRACE("(%p, %d)\n", This, mtStart); + TRACE("(%p, %ld)\n", This, mtStart); if (mtStart >= This->header.mtLength) { return DMUS_E_OUT_OF_RANGE; } @@ -449,7 +449,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetLoopPoints(IDirectMusicSegment { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - TRACE("(%p, %d, %d)\n", This, start, end); + TRACE("(%p, %ld, %ld)\n", This, start, end); if ((end || start) && (start >= This->header.mtLength || end > This->header.mtLength || start > end)) @@ -479,7 +479,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetPChannelsUsed(IDirectMusicSegm DWORD dwNumPChannels, DWORD *paPChannels) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %d, %p): stub\n", This, dwNumPChannels, paPChannels); + FIXME("(%p, %ld, %p): stub\n", This, dwNumPChannels, paPChannels); return S_OK; } @@ -488,7 +488,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetTrackConfig(IDirectMusicSegmen DWORD dwFlagsOff) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %s, %#x, %d, %d, %d): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); + FIXME("(%p, %s, %#lx, %ld, %ld, %ld): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); return S_OK; } @@ -505,7 +505,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_Compose(IDirectMusicSegment8 *ifa IDirectMusicSegment **ppComposedSegment) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %d, %p, %p, %p): stub\n", This, mtTime, pFromSegment, pToSegment, ppComposedSegment); + FIXME("(%p, %ld, %p, %p, %p): stub\n", This, mtTime, pFromSegment, pToSegment, ppComposedSegment); return S_OK; } @@ -629,7 +629,7 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, return hr; TRACE("Found DMUS_IO_TRACK_HEADER\n"); TRACE("\tclass: %s\n", debugstr_guid (&thdr.guidClassID)); - TRACE("\tdwGroup: %#x\n", thdr.dwGroup); + TRACE("\tdwGroup: %#lx\n", thdr.dwGroup); TRACE("\tckid: %s\n", debugstr_fourcc (thdr.ckid)); TRACE("\tfccType: %s\n", debugstr_fourcc (thdr.fccType)); @@ -649,7 +649,7 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, if (chunk.id == DMUS_FOURCC_TRACK_EXTRAS_CHUNK && SUCCEEDED(stream_chunk_get_data(stream, &chunk, &txhdr, sizeof(txhdr)))) { FIXME("DMUS_IO_TRACK_EXTRAS_HEADER chunk not fully handled\n"); - TRACE("dwFlags: %#x, dwPriority: %u\n", txhdr.dwFlags, txhdr.dwPriority); + TRACE("dwFlags: %#lx, dwPriority: %lu\n", txhdr.dwFlags, txhdr.dwPriority); } } if (hr != S_OK) @@ -713,16 +713,16 @@ static inline void dump_segment_header(DMUS_IO_SEGMENT_HEADER *h, DWORD size) else if (size == offsetof(DMUS_IO_SEGMENT_HEADER, rtLoopStart)) dx = 8; TRACE("Found DirectX%d DMUS_IO_SEGMENT_HEADER\n", dx); - TRACE("\tdwRepeats: %u\n", h->dwRepeats); - TRACE("\tmtLength: %u\n", h->mtLength); - TRACE("\tmtPlayStart: %u\n", h->mtPlayStart); - TRACE("\tmtLoopStart: %u\n", h->mtLoopStart); - TRACE("\tmtLoopEnd: %u\n", h->mtLoopEnd); - TRACE("\tdwResolution: %u\n", h->dwResolution); + TRACE("\tdwRepeats: %lu\n", h->dwRepeats); + TRACE("\tmtLength: %lu\n", h->mtLength); + TRACE("\tmtPlayStart: %lu\n", h->mtPlayStart); + TRACE("\tmtLoopStart: %lu\n", h->mtLoopStart); + TRACE("\tmtLoopEnd: %lu\n", h->mtLoopEnd); + TRACE("\tdwResolution: %lu\n", h->dwResolution); if (dx >= 8) { TRACE("\trtLength: %s\n", wine_dbgstr_longlong(h->rtLength)); - TRACE("\tdwFlags: %u\n", h->dwFlags); - TRACE("\tdwReserved: %u\n", h->dwReserved); + TRACE("\tdwFlags: %lu\n", h->dwFlags); + TRACE("\tdwReserved: %lu\n", h->dwReserved); } if (dx == 9) { TRACE("\trtLoopStart: %s\n", wine_dbgstr_longlong(h->rtLoopStart)); diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index edd7ed70f05..61347d8c1a2 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -61,7 +61,7 @@ static ULONG WINAPI DirectMusicSegmentState8_AddRef(IDirectMusicSegmentState8 *i IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p): %d\n", This, ref); + TRACE("(%p): %ld\n", This, ref); DMIME_LockModule(); @@ -73,7 +73,7 @@ static ULONG WINAPI DirectMusicSegmentState8_Release(IDirectMusicSegmentState8 * IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): %d\n", This, ref); + TRACE("(%p): %ld\n", This, ref); if (ref == 0) HeapFree(GetProcessHeap(), 0, This); @@ -120,13 +120,13 @@ static HRESULT WINAPI DirectMusicSegmentState8_GetStartPoint(IDirectMusicSegment static HRESULT WINAPI DirectMusicSegmentState8_SetTrackConfig(IDirectMusicSegmentState8 *iface, REFGUID rguidTrackClassID, DWORD dwGroupBits, DWORD dwIndex, DWORD dwFlagsOn, DWORD dwFlagsOff) { IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface); - FIXME("(%p, %s, %d, %d, %d, %d): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); + FIXME("(%p, %s, %ld, %ld, %ld, %ld): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); return S_OK; } static HRESULT WINAPI DirectMusicSegmentState8_GetObjectInPath(IDirectMusicSegmentState8 *iface, DWORD dwPChannel, DWORD dwStage, DWORD dwBuffer, REFGUID guidObject, DWORD dwIndex, REFGUID iidInterface, void** ppObject) { IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface); - FIXME("(%p, %d, %d, %d, %s, %d, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), dwIndex, debugstr_dmguid(iidInterface), ppObject); + FIXME("(%p, %ld, %ld, %ld, %s, %ld, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), dwIndex, debugstr_dmguid(iidInterface), ppObject); return S_OK; } diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 9a7602f58db..14e013c8e16 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -76,7 +76,7 @@ static ULONG WINAPI segment_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -86,7 +86,7 @@ static ULONG WINAPI segment_track_Release(IDirectMusicTrack8 *iface) IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { struct list *cursor, *cursor2; @@ -120,7 +120,7 @@ static HRESULT WINAPI segment_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -136,7 +136,7 @@ static HRESULT WINAPI segment_track_Play(IDirectMusicTrack8 *iface, void *pState IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -145,7 +145,7 @@ static HRESULT WINAPI segment_track_GetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); return DMUS_E_GET_UNSUPPORTED; } @@ -154,7 +154,7 @@ static HRESULT WINAPI segment_track_SetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): not supported\n", This, debugstr_dmguid(type), time, param); return S_OK; } @@ -188,7 +188,7 @@ static HRESULT WINAPI segment_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -197,7 +197,7 @@ static HRESULT WINAPI segment_track_PlayEx(IDirectMusicTrack8 *iface, void *pSta IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -207,7 +207,7 @@ static HRESULT WINAPI segment_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUI DWORD dwFlags) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -216,7 +216,7 @@ static HRESULT WINAPI segment_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUI REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -226,7 +226,7 @@ static HRESULT WINAPI segment_track_Compose(IDirectMusicTrack8 *iface, IUnknown { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -234,7 +234,7 @@ static HRESULT WINAPI segment_track_Join(IDirectMusicTrack8 *iface, IDirectMusic MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } @@ -282,10 +282,10 @@ static HRESULT parse_segment_item(IDirectMusicSegTriggerTrack *This, IStream *st goto error; TRACE("Found DMUS_IO_SEGMENT_ITEM_HEADER\n"); - TRACE("\tlTimePhysical: %u\n", item->header.lTimeLogical); - TRACE("\tlTimePhysical: %u\n", item->header.lTimePhysical); - TRACE("\tdwPlayFlags: %#08x\n", item->header.dwPlayFlags); - TRACE("\tdwFlags: %#08x\n", item->header.dwFlags); + TRACE("\tlTimePhysical: %lu\n", item->header.lTimeLogical); + TRACE("\tlTimePhysical: %lu\n", item->header.lTimePhysical); + TRACE("\tdwPlayFlags: %#08lx\n", item->header.dwPlayFlags); + TRACE("\tdwFlags: %#08lx\n", item->header.dwFlags); /* Second chunk is a reference list */ if (stream_next_chunk(stream, &chunk) != S_OK || chunk.id != FOURCC_LIST || @@ -358,7 +358,7 @@ static HRESULT WINAPI trigger_IPersistStream_Load(IPersistStream *iface, IStream if (FAILED(hr)) return hr; if (header.dwFlags) - WARN("Got flags %#x; must be zero\n", header.dwFlags); + WARN("Got flags %#lx; must be zero\n", header.dwFlags); if ((hr = stream_get_chunk(stream, &chunk)) != S_OK) return FAILED(hr) ? hr : DMUS_E_INVALID_SEGMENTTRIGGERTRACK; diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index 5d9a579988d..3c4e2c22439 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -65,7 +65,7 @@ static ULONG WINAPI sequence_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -75,7 +75,7 @@ static ULONG WINAPI sequence_track_Release(IDirectMusicTrack8 *iface) IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -97,7 +97,7 @@ static HRESULT WINAPI sequence_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -113,7 +113,7 @@ static HRESULT WINAPI sequence_track_Play(IDirectMusicTrack8 *iface, void *pStat IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -122,7 +122,7 @@ static HRESULT WINAPI sequence_track_GetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time, + TRACE("(%p, %s, %ld, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time, next, param); return E_NOTIMPL; } @@ -132,7 +132,7 @@ static HRESULT WINAPI sequence_track_SetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p): method not implemented\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): method not implemented\n", This, debugstr_dmguid(type), time, param); return E_NOTIMPL; } @@ -166,7 +166,7 @@ static HRESULT WINAPI sequence_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -175,7 +175,7 @@ static HRESULT WINAPI sequence_track_PlayEx(IDirectMusicTrack8 *iface, void *pSt IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -185,7 +185,7 @@ static HRESULT WINAPI sequence_track_GetParamEx(IDirectMusicTrack8 *iface, REFGU { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %s, %p, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + TRACE("(%p, %s, %s, %p, %p, %p, %lx): method not implemented\n", This, debugstr_dmguid(type), wine_dbgstr_longlong(time), next, param, state, flags); return E_NOTIMPL; } @@ -195,7 +195,7 @@ static HRESULT WINAPI sequence_track_SetParamEx(IDirectMusicTrack8 *iface, REFGU { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %s, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + TRACE("(%p, %s, %s, %p, %p, %lx): method not implemented\n", This, debugstr_dmguid(type), wine_dbgstr_longlong(time), param, state, flags); return E_NOTIMPL; } @@ -205,7 +205,7 @@ static HRESULT WINAPI sequence_track_Compose(IDirectMusicTrack8 *iface, IUnknown { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -213,7 +213,7 @@ static HRESULT WINAPI sequence_track_Join(IDirectMusicTrack8 *iface, IDirectMusi MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c index 81d60f2a29e..ded348aede9 100644 --- a/dlls/dmime/sysextrack.c +++ b/dlls/dmime/sysextrack.c @@ -65,7 +65,7 @@ static ULONG WINAPI sysex_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -75,7 +75,7 @@ static ULONG WINAPI sysex_track_Release(IDirectMusicTrack8 *iface) IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -97,7 +97,7 @@ static HRESULT WINAPI sysex_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -113,7 +113,7 @@ static HRESULT WINAPI sysex_track_Play(IDirectMusicTrack8 *iface, void *pStateDa IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -122,7 +122,7 @@ static HRESULT WINAPI sysex_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time, + TRACE("(%p, %s, %ld, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time, next, param); return E_NOTIMPL; } @@ -132,7 +132,7 @@ static HRESULT WINAPI sysex_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ty { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p): method not implemented\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): method not implemented\n", This, debugstr_dmguid(type), time, param); return E_NOTIMPL; } @@ -165,7 +165,7 @@ static HRESULT WINAPI sysex_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mt MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -174,7 +174,7 @@ static HRESULT WINAPI sysex_track_PlayEx(IDirectMusicTrack8 *iface, void *pState IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -184,7 +184,7 @@ static HRESULT WINAPI sysex_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %s, %p, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + TRACE("(%p, %s, %s, %p, %p, %p, %lx): method not implemented\n", This, debugstr_dmguid(type), wine_dbgstr_longlong(time), next, param, state, flags); return E_NOTIMPL; } @@ -194,7 +194,7 @@ static HRESULT WINAPI sysex_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %s, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + TRACE("(%p, %s, %s, %p, %p, %lx): method not implemented\n", This, debugstr_dmguid(type), wine_dbgstr_longlong(time), param, state, flags); return E_NOTIMPL; } @@ -204,7 +204,7 @@ static HRESULT WINAPI sysex_track_Compose(IDirectMusicTrack8 *iface, IUnknown *c { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -212,7 +212,7 @@ static HRESULT WINAPI sysex_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTr MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 57931bf1e56..0e8d5bcab48 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -72,7 +72,7 @@ static ULONG WINAPI tempo_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -82,7 +82,7 @@ static ULONG WINAPI tempo_track_Release(IDirectMusicTrack8 *iface) IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { heap_free(This->items); @@ -108,7 +108,7 @@ static HRESULT WINAPI tempo_track_InitPlay(IDirectMusicTrack8 *iface, LPDMUS_PRIVATE_TEMPO_PLAY_STATE pState = NULL; - FIXME("(%p, %p, %p, %p, %d, %d): semi-stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): semi-stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); pState = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_TEMPO_PLAY_STATE)); if (NULL == pState) @@ -141,7 +141,7 @@ static HRESULT WINAPI tempo_track_Play(IDirectMusicTrack8 *iface, void *pStateDa IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); /** should use IDirectMusicPerformance_SendPMsg here */ return S_OK; } @@ -153,7 +153,7 @@ static HRESULT WINAPI tempo_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty DMUS_TEMPO_PARAM *prm = param; unsigned int i; - TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); if (!param) return E_POINTER; @@ -190,7 +190,7 @@ static HRESULT WINAPI tempo_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ty { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param); if (IsEqualGUID(type, &GUID_DisableTempo)) { if (!param) @@ -250,7 +250,7 @@ static HRESULT WINAPI tempo_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mt MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -259,7 +259,7 @@ static HRESULT WINAPI tempo_track_PlayEx(IDirectMusicTrack8 *iface, void *pState IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -269,7 +269,7 @@ static HRESULT WINAPI tempo_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID DWORD dwFlags) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -278,7 +278,7 @@ static HRESULT WINAPI tempo_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -288,7 +288,7 @@ static HRESULT WINAPI tempo_track_Compose(IDirectMusicTrack8 *iface, IUnknown *c { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -297,7 +297,7 @@ static HRESULT WINAPI tempo_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTr IDirectMusicTrack **ppResultTrack) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); + FIXME("(%p, %p, %ld, %p, %ld, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); return S_OK; } @@ -351,7 +351,7 @@ static HRESULT WINAPI tempo_IPersistStream_Load(IPersistStream *iface, IStream * for (i = 0; i < This->count; i++) { TRACE_(dmfile)("DMUS_IO_TEMPO_ITEM #%u\n", i); - TRACE_(dmfile)(" - lTime = %u\n", This->items[i].lTime); + TRACE_(dmfile)(" - lTime = %lu\n", This->items[i].lTime); TRACE_(dmfile)(" - dblTempo = %g\n", This->items[i].dblTempo); } diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index c34049beb18..d6452e92e1b 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -73,7 +73,7 @@ static ULONG WINAPI IDirectMusicTrackImpl_AddRef(IDirectMusicTrack *iface) IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -83,7 +83,7 @@ static ULONG WINAPI IDirectMusicTrackImpl_Release(IDirectMusicTrack *iface) IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { heap_free(This->items); @@ -107,7 +107,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_InitPlay(IDirectMusicTrack *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -123,7 +123,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Play(IDirectMusicTrack *iface, void IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -132,7 +132,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_GetParam(IDirectMusicTrack *iface, R { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); if (IsEqualGUID(type, &GUID_TimeSignature)) { FIXME("GUID_TimeSignature not handled yet\n"); @@ -147,7 +147,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_SetParam(IDirectMusicTrack *iface, R { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param); if (IsEqualGUID(type, &GUID_DisableTimeSig)) { FIXME("GUID_DisableTimeSig not handled yet\n"); @@ -197,7 +197,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Clone(IDirectMusicTrack *iface, MUSI MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -242,7 +242,7 @@ static HRESULT parse_timetrack_list(IDirectMusicTimeSigTrack *This, IStream *str for (i = 0; i < This->count; i++) { TRACE("Found DMUS_IO_TIMESIGNATURE_ITEM\n"); - TRACE(" - lTime %d\n", This->items[i].lTime); + TRACE(" - lTime %ld\n", This->items[i].lTime); TRACE(" - bBeatsPerMeasure %d\n", This->items[i].bBeatsPerMeasure); TRACE(" - bBeat %d\n", This->items[i].bBeat); TRACE(" - wGridsPerBeat %d\n", This->items[i].wGridsPerBeat); diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 454695ebfb6..171c3e5c6b7 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -85,7 +85,7 @@ static ULONG WINAPI wave_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -95,7 +95,7 @@ static ULONG WINAPI wave_track_Release(IDirectMusicTrack8 *iface) IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { struct wave_item *item, *item2; @@ -131,7 +131,7 @@ static HRESULT WINAPI wave_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -147,7 +147,7 @@ static HRESULT WINAPI wave_track_Play(IDirectMusicTrack8 *iface, void *pStateDat IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -156,7 +156,7 @@ static HRESULT WINAPI wave_track_GetParam(IDirectMusicTrack8 *iface, REFGUID typ { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); return DMUS_E_GET_UNSUPPORTED; } @@ -165,7 +165,7 @@ static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param); if (IsEqualGUID(type, &GUID_Disable_Auto_Download)) { FIXME("GUID_Disable_Auto_Download not handled yet\n"); @@ -239,7 +239,7 @@ static HRESULT WINAPI wave_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtS MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -248,7 +248,7 @@ static HRESULT WINAPI wave_track_PlayEx(IDirectMusicTrack8 *iface, void *pStateD IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -258,7 +258,7 @@ static HRESULT WINAPI wave_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID r DWORD dwFlags) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -267,7 +267,7 @@ static HRESULT WINAPI wave_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID r REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -277,7 +277,7 @@ static HRESULT WINAPI wave_track_Compose(IDirectMusicTrack8 *iface, IUnknown *co { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -285,7 +285,7 @@ static HRESULT WINAPI wave_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTra MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } @@ -341,15 +341,15 @@ static HRESULT parse_wave_item(struct wave_part *part, IStream *stream, struct c } TRACE("Found DMUS_IO_WAVE_ITEM_HEADER\n"); - TRACE("\tlVolume %d\n", item->header.lVolume); - TRACE("\tdwVariations %d\n", item->header.dwVariations); + TRACE("\tlVolume %ld\n", item->header.lVolume); + TRACE("\tdwVariations %ld\n", item->header.dwVariations); TRACE("\trtTime %s\n", wine_dbgstr_longlong(item->header.rtTime)); TRACE("\trtStartOffset %s\n", wine_dbgstr_longlong(item->header.rtStartOffset)); TRACE("\trtReserved %s\n", wine_dbgstr_longlong(item->header.rtReserved)); TRACE("\trtDuration %s\n", wine_dbgstr_longlong(item->header.rtDuration)); - TRACE("\tdwLoopStart %d\n", item->header.dwLoopStart); - TRACE("\tdwLoopEnd %d\n", item->header.dwLoopEnd); - TRACE("\tdwFlags %#08x\n", item->header.dwFlags); + TRACE("\tdwLoopStart %ld\n", item->header.dwLoopStart); + TRACE("\tdwLoopEnd %ld\n", item->header.dwLoopEnd); + TRACE("\tdwFlags %#08lx\n", item->header.dwFlags); TRACE("\twVolumeRange %d\n", item->header.wVolumeRange); TRACE("\twPitchRange %d\n", item->header.wPitchRange); @@ -394,12 +394,12 @@ static HRESULT parse_wave_part(IDirectMusicWaveTrack *This, IStream *stream, } TRACE("Found DMUS_IO_WAVE_PART_HEADER\n"); - TRACE("\tlVolume %d\n", part->header.lVolume); - TRACE("\tdwVariations %d\n", part->header.dwVariations); - TRACE("\tdwPChannel %d\n", part->header.dwPChannel); - TRACE("\tdwLockToPart %d\n", part->header.dwLockToPart); - TRACE("\tdwFlags %#08x\n", part->header.dwFlags); - TRACE("\tdwIndex %d\n", part->header.dwIndex); + TRACE("\tlVolume %ld\n", part->header.lVolume); + TRACE("\tdwVariations %ld\n", part->header.dwVariations); + TRACE("\tdwPChannel %ld\n", part->header.dwPChannel); + TRACE("\tdwLockToPart %ld\n", part->header.dwLockToPart); + TRACE("\tdwFlags %#08lx\n", part->header.dwFlags); + TRACE("\tdwIndex %ld\n", part->header.dwIndex); /* Array of wave items */ while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) @@ -447,8 +447,8 @@ static HRESULT WINAPI wave_IPersistStream_Load(IPersistStream *iface, IStream *s return hr; TRACE("Found DMUS_IO_WAVE_TRACK_HEADER\n"); - TRACE("\tlVolume %d\n", This->header.lVolume); - TRACE("\tdwFlags %#08x\n", This->header.dwFlags); + TRACE("\tlVolume %ld\n", This->header.lVolume); + TRACE("\tdwFlags %#08lx\n", This->header.dwFlags); /* Array of wave parts */ while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) -- 2.34.1

1 0

[PATCH v3] win32u: Cache GL driver functions in DC.
by Paul Gofman Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 225319-225320. dlls/win32u/dc.c | 56 ++++++++++++++++++++++++------------- dlls/win32u/driver.c | 23 +++++++++++---- dlls/win32u/ntgdi_private.h | 23 +++++++++++++++ 3 files changed, 77 insertions(+), 25 deletions(-) diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index aed2d3684a7..f9ea909371d 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -63,25 +63,6 @@ static const struct gdi_obj_funcs dc_funcs = }; -static inline DC *get_dc_obj( HDC hdc ) -{ - DWORD type; - DC *dc = get_any_obj_ptr( hdc, &type ); - if (!dc) return NULL; - - switch (type) - { - case NTGDI_OBJ_DC: - case NTGDI_OBJ_MEMDC: - case NTGDI_OBJ_ENHMETADC: - return dc; - default: - GDI_ReleaseObj( hdc ); - SetLastError( ERROR_INVALID_HANDLE ); - return NULL; - } -} - /* alloc DC_ATTR from a pool of memory accessible from client */ static DC_ATTR *alloc_dc_attr(void) { @@ -310,6 +291,43 @@ DC *get_dc_ptr( HDC hdc ) } +/*********************************************************************** + * grab_dc + * + * Retrieve a DC pointer, increase ref count and release the GDI lock. + */ +DC *grab_dc( HDC hdc ) +{ + DC *dc; + + if (!GDI_inc_ref_count( hdc )) return NULL; + if (!(dc = get_dc_obj( hdc ))) + { + GDI_dec_ref_count( hdc ); + return NULL; + } + if (dc->attr->disabled) + { + GDI_dec_ref_count( hdc ); + GDI_ReleaseObj( hdc ); + return NULL; + } + GDI_ReleaseObj( hdc ); + return dc; +} + + +/*********************************************************************** + * put_dc + * + * Decrease ref count previously increased by grab_dc(). + */ +void put_dc( HDC hdc ) +{ + GDI_dec_ref_count( hdc ); +} + + /*********************************************************************** * release_dc_ptr */ diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 39996086c6d..19987817cc9 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1347,14 +1347,25 @@ NTSTATUS WINAPI NtGdiDdDDICheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNE */ struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ) { - struct opengl_funcs *ret = NULL; - DC * dc = get_dc_ptr( hdc ); + struct opengl_funcs *ret; + PHYSDEV physdev; + DC * dc; - if (dc) + if (!(dc = get_dc_obj( hdc ))) return NULL; + if (dc->attr->disabled) { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, wine_get_wgl_driver ); - ret = physdev->funcs->wine_get_wgl_driver( physdev, version ); - release_dc_ptr( dc ); + GDI_ReleaseObj( hdc ); + return NULL; } + ret = dc->gl_funcs; + GDI_ReleaseObj( hdc ); + + if (ret) return ret; + + if (!(dc = grab_dc( hdc ))) return NULL; + physdev = GET_DC_PHYSDEV( dc, wine_get_wgl_driver ); + ret = physdev->funcs->wine_get_wgl_driver( physdev, version ); + InterlockedCompareExchangePointer( (void * volatile *)&dc->gl_funcs, ret, NULL ); + put_dc( hdc ); return ret; } diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h index bfeb4557da7..20a41ccda32 100644 --- a/dlls/win32u/ntgdi_private.h +++ b/dlls/win32u/ntgdi_private.h @@ -87,6 +87,8 @@ typedef struct tagDC XFORM xformVport2World; /* Inverse of the above transformation */ BOOL vport2WorldValid; /* Is xformVport2World valid? */ RECT bounds; /* Current bounding rect */ + + struct opengl_funcs *gl_funcs; /* Opengl driver functions */ } DC; /* Certain functions will do no further processing if the driver returns this. @@ -170,6 +172,8 @@ static inline HRGN get_dc_region( DC *dc ) extern DC *alloc_dc_ptr( DWORD magic ) DECLSPEC_HIDDEN; extern void free_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; extern DC *get_dc_ptr( HDC hdc ) DECLSPEC_HIDDEN; +extern DC *grab_dc( HDC hdc ) DECLSPEC_HIDDEN; +extern void put_dc( HDC hdc ) DECLSPEC_HIDDEN; extern void release_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; extern void update_dc( DC *dc ) DECLSPEC_HIDDEN; extern void DC_InitDC( DC * dc ) DECLSPEC_HIDDEN; @@ -660,6 +664,25 @@ static inline void copy_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *src ) memcpy( dst, src, get_dib_info_size( src, DIB_RGB_COLORS )); } +static inline DC *get_dc_obj( HDC hdc ) +{ + DWORD type; + DC *dc = get_any_obj_ptr( hdc, &type ); + if (!dc) return NULL; + + switch (type) + { + case NTGDI_OBJ_DC: + case NTGDI_OBJ_MEMDC: + case NTGDI_OBJ_ENHMETADC: + return dc; + default: + GDI_ReleaseObj( hdc ); + SetLastError( ERROR_INVALID_HANDLE ); + return NULL; + } +} + extern void CDECL free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; void set_gdi_client_ptr( HGDIOBJ handle, void *ptr ) DECLSPEC_HIDDEN; -- 2.34.1

2 1

[PATCH] diasymreader: Stub ISymUnmanagedDocumentWriter.
by Esme Povirk Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/diasymreader/writer.c | 96 +++++++++++++++++++++++++++++++++++++- 1 file changed, 95 insertions(+), 1 deletion(-) diff --git a/dlls/diasymreader/writer.c b/dlls/diasymreader/writer.c index 1820ccb51b0..64fdbdb8272 100644 --- a/dlls/diasymreader/writer.c +++ b/dlls/diasymreader/writer.c @@ -45,6 +45,11 @@ typedef struct SymWriter { WCHAR pdb_filename[MAX_PATH]; } SymWriter; +typedef struct SymDocumentWriter { + ISymUnmanagedDocumentWriter iface; + LONG ref; +} SymDocumentWriter; + static inline SymWriter *impl_from_ISymUnmanagedWriter5(ISymUnmanagedWriter5 *iface) { return CONTAINING_RECORD(iface, SymWriter, iface); @@ -55,6 +60,81 @@ static inline SymWriter *impl_from_IPdbWriter(IPdbWriter *iface) return CONTAINING_RECORD(iface, SymWriter, IPdbWriter_iface); } +static inline SymDocumentWriter *impl_from_ISymUnmanagedDocumentWriter(ISymUnmanagedDocumentWriter *iface) +{ + return CONTAINING_RECORD(iface, SymDocumentWriter, iface); +} + +static HRESULT WINAPI SymDocumentWriter_QueryInterface(ISymUnmanagedDocumentWriter *iface, REFIID iid, + void **ppv) +{ + SymDocumentWriter *This = impl_from_ISymUnmanagedDocumentWriter(iface); + + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_ISymUnmanagedDocumentWriter, iid)) + { + *ppv = &This->iface; + } + else + { + WARN("unknown interface %s\n", debugstr_guid(iid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI SymDocumentWriter_AddRef(ISymUnmanagedDocumentWriter *iface) +{ + SymDocumentWriter *This = impl_from_ISymUnmanagedDocumentWriter(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI SymDocumentWriter_Release(ISymUnmanagedDocumentWriter *iface) +{ + SymDocumentWriter *This = impl_from_ISymUnmanagedDocumentWriter(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI SymDocumentWriter_SetSource(ISymUnmanagedDocumentWriter *iface, ULONG sourceSize, + BYTE source[]) +{ + FIXME("(%p,%u,%p)\n", iface, sourceSize, source); + return S_OK; +} + +static HRESULT WINAPI SymDocumentWriter_SetChecksum(ISymUnmanagedDocumentWriter *iface, GUID algorithmID, + ULONG32 checkSumSize, BYTE checkSum[]) +{ + FIXME("(%p,%s,%u,%p)\n", iface, debugstr_guid(&algorithmID), checkSumSize, checkSum); + return S_OK; +} + +static const ISymUnmanagedDocumentWriterVtbl SymDocumentWriter_Vtbl = { + SymDocumentWriter_QueryInterface, + SymDocumentWriter_AddRef, + SymDocumentWriter_Release, + SymDocumentWriter_SetSource, + SymDocumentWriter_SetChecksum +}; + static HRESULT WINAPI SymWriter_QueryInterface(ISymUnmanagedWriter5 *iface, REFIID iid, void **ppv) { @@ -117,9 +197,23 @@ static HRESULT WINAPI SymWriter_DefineDocument(ISymUnmanagedWriter5 *iface, cons const GUID *language, const GUID *languageVendor, const GUID *documentType, ISymUnmanagedDocumentWriter** pRetVal) { + SymDocumentWriter *result; + FIXME("(%p,%s,%s,%s,%s,%p)\n", iface, debugstr_w(url), debugstr_guid(language), debugstr_guid(languageVendor), debugstr_guid(documentType), pRetVal); - return E_NOTIMPL; + + if (!pRetVal) + return E_POINTER; + + result = heap_alloc(sizeof(*result)); + if (!result) + return E_OUTOFMEMORY; + + result->iface.lpVtbl = &SymDocumentWriter_Vtbl; + result->ref = 1; + *pRetVal = &result->iface; + + return S_OK; } static HRESULT WINAPI SymWriter_SetUserEntryPoint(ISymUnmanagedWriter5 *iface, mdMethodDef entryMethod) -- 2.30.2

1 0

[RFC PATCH 1/4] ntdll: Consolidate 2 STRs into 1 STRD in ARM syscall dispatcher.
by Jinoh Kang Feb. 8, 2022

Feb. 8, 2022

STRD is an ARMv7 instruction that stores two consecutive 32-bit words in one operation. A single STRD saves one clock cycle compared to two LDRs. Shortened code also leads to less time spent on instruction fetch and more efficient I-cache utilization. Running llvm-mca --timeline on the old code reports: 0123 Index 0123456789 [0,0] DeeeeER . . ldr.w r1, [r1, #472] [0,1] D====eER . . add.w r0, r1, #16 [0,2] D=====eeeeeER. stm.w r0, {r4, r5, r6, r7, r8, r9, r10, r11, r12, lr} [0,3] .DeE--------R. add r2, sp, #16 [0,4] .D=====eE---R. str r2, [r1, #56] [0,5] .D======eE--R. str r3, [r1, #60] [0,6] . D---------R. mrs r0, apsr [0,7] . DeeE------R. bfi r0, lr, #5, #1 [0,8] . D======eE-R. str r0, [r1, #64] [0,9] . DeE-------R. mov.w r0, #0 [0,10] . D======eER. str r0, [r1, #68] [0,11] . D======E-R. vmrs r0, fpscr [0,12] . D=======eER str r0, [r1, #72] [0,13] . D=eE------R add.w r0, r1, #96 Running llvm-mca --timeline on the new code reports: 012 Index 0123456789 [0,0] DeeeeER . . ldr.w r1, [r1, #472] [0,1] D====eER . . add.w r0, r1, #16 [0,2] D=====eeeeeER stm.w r0, {r4, r5, r6, r7, r8, r9, r10, r11, r12, lr} [0,3] .DeE--------R add r2, sp, #16 [0,4] .D=====eE---R strd r2, r3, [r1, #56] [0,5] .D----------R mrs r0, apsr [0,6] .DeeE-------R bfi r0, lr, #5, #1 [0,7] . D=====eE--R str r0, [r1, #64] [0,8] . DeE-------R mov.w r0, #0 [0,9] . D======eE-R str r0, [r1, #68] [0,10] . D=====E--R vmrs r0, fpscr [0,11] . D======eER str r0, [r1, #72] [0,12] . D=eE-----R add.w r0, r1, #96 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/unix/signal_arm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index a1bcb0ddd32..8c8750153df 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1157,8 +1157,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "add r0, r1, #0x10\n\t" "stm r0, {r4-r12,lr}\n\t" "add r2, sp, #0x10\n\t" - "str r2, [r1, #0x38]\n\t" - "str r3, [r1, #0x3c]\n\t" + "strd r2, r3, [r1, #0x38]\n\t" "mrs r0, CPSR\n\t" "bfi r0, lr, #5, #1\n\t" /* set thumb bit */ "str r0, [r1, #0x40]\n\t" -- 2.35.1

5 8

[PATCH 6/6] d3dcompiler: Build without -DWINE_NO_LONG_TYPES.
by Henri Verbeet Feb. 8, 2022

Feb. 8, 2022

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3dcompiler_33/Makefile.in | 2 +- dlls/d3dcompiler_34/Makefile.in | 2 +- dlls/d3dcompiler_35/Makefile.in | 2 +- dlls/d3dcompiler_36/Makefile.in | 2 +- dlls/d3dcompiler_37/Makefile.in | 2 +- dlls/d3dcompiler_38/Makefile.in | 2 +- dlls/d3dcompiler_39/Makefile.in | 2 +- dlls/d3dcompiler_40/Makefile.in | 2 +- dlls/d3dcompiler_41/Makefile.in | 2 +- dlls/d3dcompiler_42/Makefile.in | 2 +- dlls/d3dcompiler_43/Makefile.in | 2 +- dlls/d3dcompiler_43/asmparser.c | 22 ++++---- dlls/d3dcompiler_43/blob.c | 26 ++++----- dlls/d3dcompiler_43/bytecodewriter.c | 81 ++++++++++++++-------------- dlls/d3dcompiler_43/compiler.c | 16 +++--- dlls/d3dcompiler_43/reflection.c | 43 +++++++-------- dlls/d3dcompiler_43/utils.c | 49 ++++++++--------- dlls/d3dcompiler_46/Makefile.in | 2 +- dlls/d3dcompiler_47/Makefile.in | 2 +- 19 files changed, 129 insertions(+), 134 deletions(-) diff --git a/dlls/d3dcompiler_33/Makefile.in b/dlls/d3dcompiler_33/Makefile.in index c14c691bcd3..7130fb48376 100644 --- a/dlls/d3dcompiler_33/Makefile.in +++ b/dlls/d3dcompiler_33/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_33.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=33 +EXTRADEFS = -DD3D_COMPILER_VERSION=33 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_34/Makefile.in b/dlls/d3dcompiler_34/Makefile.in index 9f861992476..e4dfc72cae8 100644 --- a/dlls/d3dcompiler_34/Makefile.in +++ b/dlls/d3dcompiler_34/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_34.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=34 +EXTRADEFS = -DD3D_COMPILER_VERSION=34 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_35/Makefile.in b/dlls/d3dcompiler_35/Makefile.in index 775ba345800..56c87186c2e 100644 --- a/dlls/d3dcompiler_35/Makefile.in +++ b/dlls/d3dcompiler_35/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_35.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=35 +EXTRADEFS = -DD3D_COMPILER_VERSION=35 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_36/Makefile.in b/dlls/d3dcompiler_36/Makefile.in index 9ca476790d4..f23ac2cb990 100644 --- a/dlls/d3dcompiler_36/Makefile.in +++ b/dlls/d3dcompiler_36/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_36.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=36 +EXTRADEFS = -DD3D_COMPILER_VERSION=36 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_37/Makefile.in b/dlls/d3dcompiler_37/Makefile.in index a7d001d0f7c..331f5f5f068 100644 --- a/dlls/d3dcompiler_37/Makefile.in +++ b/dlls/d3dcompiler_37/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_37.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=37 +EXTRADEFS = -DD3D_COMPILER_VERSION=37 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_38/Makefile.in b/dlls/d3dcompiler_38/Makefile.in index 7c4e49b6911..b34c2322aae 100644 --- a/dlls/d3dcompiler_38/Makefile.in +++ b/dlls/d3dcompiler_38/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_38.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=38 +EXTRADEFS = -DD3D_COMPILER_VERSION=38 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_39/Makefile.in b/dlls/d3dcompiler_39/Makefile.in index 92b8053ea54..cf4dc2cdd83 100644 --- a/dlls/d3dcompiler_39/Makefile.in +++ b/dlls/d3dcompiler_39/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_39.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=39 +EXTRADEFS = -DD3D_COMPILER_VERSION=39 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_40/Makefile.in b/dlls/d3dcompiler_40/Makefile.in index 8e98ae6bfc6..c8d415baf83 100644 --- a/dlls/d3dcompiler_40/Makefile.in +++ b/dlls/d3dcompiler_40/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_40.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=40 +EXTRADEFS = -DD3D_COMPILER_VERSION=40 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_41/Makefile.in b/dlls/d3dcompiler_41/Makefile.in index 43c5672c90b..2fa69b5a18d 100644 --- a/dlls/d3dcompiler_41/Makefile.in +++ b/dlls/d3dcompiler_41/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_41.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=41 +EXTRADEFS = -DD3D_COMPILER_VERSION=41 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_42/Makefile.in b/dlls/d3dcompiler_42/Makefile.in index e550851fcfd..d821b888bde 100644 --- a/dlls/d3dcompiler_42/Makefile.in +++ b/dlls/d3dcompiler_42/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_42.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=42 +EXTRADEFS = -DD3D_COMPILER_VERSION=42 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index aff97a6d3e8..b527f1681d7 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_43.dll IMPORTLIB = d3dcompiler_43 -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=43 +EXTRADEFS = -DD3D_COMPILER_VERSION=43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_43/asmparser.c b/dlls/d3dcompiler_43/asmparser.c index 7a901576181..fff11969581 100644 --- a/dlls/d3dcompiler_43/asmparser.c +++ b/dlls/d3dcompiler_43/asmparser.c @@ -73,8 +73,8 @@ static void asmparser_end(struct asm_parser *This) { static void asmparser_constF(struct asm_parser *This, DWORD reg, float x, float y, float z, float w) { if(!This->shader) return; - TRACE("Adding float constant %u at pos %u\n", reg, This->shader->num_cf); - TRACE_(parsed_shader)("def c%u, %f, %f, %f, %f\n", reg, x, y, z, w); + TRACE("Adding float constant %lu at pos %u.\n", reg, This->shader->num_cf); + TRACE_(parsed_shader)("def c%lu, %f, %f, %f, %f\n", reg, x, y, z, w); if(!add_constF(This->shader, reg, x, y, z, w)) { ERR("Out of memory\n"); set_parse_status(&This->status, PARSE_ERR); @@ -83,8 +83,8 @@ static void asmparser_constF(struct asm_parser *This, DWORD reg, float x, float static void asmparser_constB(struct asm_parser *This, DWORD reg, BOOL x) { if(!This->shader) return; - TRACE("Adding boolean constant %u at pos %u\n", reg, This->shader->num_cb); - TRACE_(parsed_shader)("def b%u, %s\n", reg, x ? "true" : "false"); + TRACE("Adding boolean constant %lu at pos %u.\n", reg, This->shader->num_cb); + TRACE_(parsed_shader)("def b%lu, %s\n", reg, x ? "true" : "false"); if(!add_constB(This->shader, reg, x)) { ERR("Out of memory\n"); set_parse_status(&This->status, PARSE_ERR); @@ -93,8 +93,8 @@ static void asmparser_constB(struct asm_parser *This, DWORD reg, BOOL x) { static void asmparser_constI(struct asm_parser *This, DWORD reg, INT x, INT y, INT z, INT w) { if(!This->shader) return; - TRACE("Adding integer constant %u at pos %u\n", reg, This->shader->num_ci); - TRACE_(parsed_shader)("def i%u, %d, %d, %d, %d\n", reg, x, y, z, w); + TRACE("Adding integer constant %lu at pos %u.\n", reg, This->shader->num_ci); + TRACE_(parsed_shader)("def i%lu, %d, %d, %d, %d\n", reg, x, y, z, w); if(!add_constI(This->shader, reg, x, y, z, w)) { ERR("Out of memory\n"); set_parse_status(&This->status, PARSE_ERR); @@ -240,7 +240,7 @@ static struct shader_reg map_oldps_register(const struct shader_reg *reg, BOOL t case 6: ret.regnum = T6_VARYING; break; case 7: ret.regnum = T7_VARYING; break; default: - FIXME("Unexpected TEXTURE register t%u\n", reg->regnum); + FIXME("Unexpected TEXTURE register t%lu.\n", reg->regnum); return *reg; } return ret; @@ -253,7 +253,7 @@ static struct shader_reg map_oldps_register(const struct shader_reg *reg, BOOL t case 2: ret.regnum = T2_REG; break; case 3: ret.regnum = T3_REG; break; default: - FIXME("Unexpected TEXTURE register t%u\n", reg->regnum); + FIXME("Unexpected TEXTURE register t%lu.\n", reg->regnum); return *reg; } return ret; @@ -620,7 +620,7 @@ static struct shader_reg map_oldvs_register(const struct shader_reg *reg) { ret.u.writemask = OPTS_WRITEMASK; break; default: - FIXME("Unhandled RASTOUT register %u\n", reg->regnum); + FIXME("Unhandled RASTOUT register %lu.\n", reg->regnum); return *reg; } return ret; @@ -638,7 +638,7 @@ static struct shader_reg map_oldvs_register(const struct shader_reg *reg) { case 6: ret.regnum = OT6_REG; break; case 7: ret.regnum = OT7_REG; break; default: - FIXME("Unhandled TEXCRDOUT regnum %u\n", reg->regnum); + FIXME("Unhandled TEXCRDOUT regnum %lu.\n", reg->regnum); return *reg; } return ret; @@ -650,7 +650,7 @@ static struct shader_reg map_oldvs_register(const struct shader_reg *reg) { case 0: ret.regnum = OD0_REG; break; case 1: ret.regnum = OD1_REG; break; default: - FIXME("Unhandled ATTROUT regnum %u\n", reg->regnum); + FIXME("Unhandled ATTROUT regnum %lu.\n", reg->regnum); return *reg; } return ret; diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index ee23893576d..c8c198fb520 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -62,7 +62,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_blob_AddRef(ID3DBlob *iface) struct d3dcompiler_blob *blob = impl_from_ID3DBlob(iface); ULONG refcount = InterlockedIncrement(&blob->refcount); - TRACE("%p increasing refcount to %u\n", blob, refcount); + TRACE("%p increasing refcount to %lu.\n", blob, refcount); return refcount; } @@ -72,7 +72,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_blob_Release(ID3DBlob *iface) struct d3dcompiler_blob *blob = impl_from_ID3DBlob(iface); ULONG refcount = InterlockedDecrement(&blob->refcount); - TRACE("%p decreasing refcount to %u\n", blob, refcount); + TRACE("%p decreasing refcount to %lu.\n", blob, refcount); if (!refcount) { @@ -135,7 +135,7 @@ HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob) struct d3dcompiler_blob *object; HRESULT hr; - TRACE("data_size %lu, blob %p\n", data_size, blob); + TRACE("data_size %Iu, blob %p.\n", data_size, blob); if (!blob) { @@ -150,7 +150,7 @@ HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob) hr = d3dcompiler_blob_init(object, data_size); if (FAILED(hr)) { - WARN("Failed to initialize blob, hr %#x.\n", hr); + WARN("Failed to initialize blob, hr %#lx.\n", hr); HeapFree(GetProcessHeap(), 0, object); return hr; } @@ -222,7 +222,7 @@ static HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D if (!data || !data_size || flags || !blob) { - WARN("Invalid arguments: data %p, data_size %lu, flags %#x, blob %p\n", data, data_size, flags, blob); + WARN("Invalid arguments: data %p, data_size %Iu, flags %#x, blob %p.\n", data, data_size, flags, blob); return D3DERR_INVALIDCALL; } @@ -369,7 +369,7 @@ static HRESULT d3dcompiler_strip_shader(const void *data, SIZE_T data_size, UINT if (!data || !data_size) { - WARN("Invalid arguments: data %p, data_size %lu\n", data, data_size); + WARN("Invalid arguments: data %p, data_size %Iu.\n", data, data_size); return D3DERR_INVALIDCALL; } @@ -420,7 +420,7 @@ static HRESULT d3dcompiler_strip_shader(const void *data, SIZE_T data_size, UINT HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob) { - TRACE("data %p, data_size %lu, part %s, flags %#x, blob %p\n", data, + TRACE("data %p, data_size %Iu, part %s, flags %#x, blob %p.\n", data, data_size, debug_d3dcompiler_d3d_blob_part(part), flags, blob); return d3dcompiler_get_blob_part(data, data_size, part, flags, blob); @@ -428,35 +428,35 @@ HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob) { - TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); + TRACE("data %p, data_size %Iu, blob %p.\n", data, data_size, blob); return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, blob); } HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob) { - TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); + TRACE("data %p, data_size %Iu, blob %p.\n", data, data_size, blob); return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_OUTPUT_SIGNATURE_BLOB, 0, blob); } HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob) { - TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); + TRACE("data %p, data_size %Iu, blob %p.\n", data, data_size, blob); return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB, 0, blob); } HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob) { - TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); + TRACE("data %p, data_size %Iu, blob %p.\n", data, data_size, blob); return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_DEBUG_INFO, 0, blob); } HRESULT WINAPI D3DStripShader(const void *data, SIZE_T data_size, UINT flags, ID3D10Blob **blob) { - TRACE("data %p, data_size %lu, flags %#x, blob %p\n", data, data_size, flags, blob); + TRACE("data %p, data_size %Iu, flags %#x, blob %p.\n", data, data_size, flags, blob); return d3dcompiler_strip_shader(data, data_size, flags, blob); } @@ -490,7 +490,7 @@ HRESULT WINAPI D3DReadFileToBlob(const WCHAR *filename, ID3DBlob **contents) if (FAILED(hr = d3dcompiler_blob_init(object, data_size))) { - WARN("Failed to initialize blob, hr %#x.\n", hr); + WARN("Failed to initialise blob, hr %#lx.\n", hr); CloseHandle(file); heap_free(object); return hr; diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index d5e55e2c4ed..2e5e24ea884 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -245,7 +245,7 @@ BOOL record_declaration(struct bwriter_shader *shader, DWORD usage, struct declaration *newdecl; for(i = 0; i < *num; i++) { if((*decl)[i].regnum == regnum && ((*decl)[i].writemask & writemask)) { - WARN("Declaration of register %u already exists, writemask match 0x%x\n", + WARN("Declaration of register %lu already exists, writemask match %#lx.\n", regnum, (*decl)[i].writemask & writemask); } } @@ -285,7 +285,7 @@ BOOL record_sampler(struct bwriter_shader *shader, DWORD samptype, DWORD mod, DW for(i = 0; i < shader->num_samplers; i++) { if(shader->samplers[i].regnum == regnum) { - WARN("Sampler %u already declared\n", regnum); + WARN("Sampler %lu already declared.\n", regnum); /* This is not an error as far as the assembler is concerned. * Direct3D might refuse to load the compiled shader though */ @@ -456,7 +456,7 @@ static DWORD d3d9_srcmod(DWORD bwriter_srcmod) case BWRITERSPSM_ABSNEG: return D3DSPSM_ABSNEG; case BWRITERSPSM_NOT: return D3DSPSM_NOT; default: - FIXME("Unhandled BWRITERSPSM token %#x.\n", bwriter_srcmod); + FIXME("Unhandled BWRITERSPSM token %#lx.\n", bwriter_srcmod); return 0; } } @@ -483,7 +483,7 @@ static DWORD d3d9_comparetype(DWORD asmshader_comparetype) case BWRITER_COMPARISON_NE: return D3DSPC_NE; case BWRITER_COMPARISON_LE: return D3DSPC_LE; default: - FIXME("Unexpected BWRITER_COMPARISON type %#x.\n", asmshader_comparetype); + FIXME("Unexpected BWRITER_COMPARISON type %#lx.\n", asmshader_comparetype); return 0; } } @@ -495,7 +495,7 @@ static DWORD d3d9_sampler(DWORD bwriter_sampler) if (bwriter_sampler == BWRITERSTT_2D) return D3DSTT_2D; if (bwriter_sampler == BWRITERSTT_CUBE) return D3DSTT_CUBE; if (bwriter_sampler == BWRITERSTT_VOLUME) return D3DSTT_VOLUME; - FIXME("Unexpected BWRITERSAMPLER_TEXTURE_TYPE type %#x.\n", bwriter_sampler); + FIXME("Unexpected BWRITERSAMPLER_TEXTURE_TYPE type %#lx.\n", bwriter_sampler); return 0; } @@ -521,7 +521,7 @@ static DWORD d3d9_register(DWORD bwriter_register) if (bwriter_register == BWRITERSPR_LABEL) return D3DSPR_LABEL; if (bwriter_register == BWRITERSPR_PREDICATE) return D3DSPR_PREDICATE; - FIXME("Unexpected BWRITERSPR %#x.\n", bwriter_register); + FIXME("Unexpected BWRITERSPR %#lx.\n", bwriter_register); return ~0U; } @@ -620,7 +620,7 @@ static DWORD d3d9_opcode(DWORD bwriter_opcode) case BWRITERSIO_TEXLDB: return D3DSIO_TEX | D3DSI_TEXLD_BIAS; default: - FIXME("Unhandled BWRITERSIO token %#x.\n", bwriter_opcode); + FIXME("Unhandled BWRITERSIO token %#lx.\n", bwriter_opcode); return ~0U; } } @@ -715,29 +715,29 @@ static HRESULT vs_find_builtin_varyings(struct bc_writer *This, const struct bwr case BWRITERDECLUSAGE_POSITION: case BWRITERDECLUSAGE_POSITIONT: if(usage_idx > 0) { - WARN("dcl_position%u not supported in sm 1/2 shaders\n", usage_idx); + WARN("dcl_position%lu not supported in sm 1/2 shaders.\n", usage_idx); return E_INVALIDARG; } - TRACE("o%u is oPos\n", regnum); + TRACE("o%lu is oPos.\n", regnum); This->oPos_regnum = regnum; break; case BWRITERDECLUSAGE_COLOR: if(usage_idx > 1) { - WARN("dcl_color%u not supported in sm 1/2 shaders\n", usage_idx); + WARN("dcl_color%lu not supported in sm 1/2 shaders.\n", usage_idx); return E_INVALIDARG; } if(writemask != BWRITERSP_WRITEMASK_ALL) { WARN("Only WRITEMASK_ALL is supported on color in sm 1/2\n"); return E_INVALIDARG; } - TRACE("o%u is oD%u\n", regnum, usage_idx); + TRACE("o%lu is oD%lu.\n", regnum, usage_idx); This->oD_regnum[usage_idx] = regnum; break; case BWRITERDECLUSAGE_TEXCOORD: if(usage_idx >= 8) { - WARN("dcl_color%u not supported in sm 1/2 shaders\n", usage_idx); + WARN("dcl_color%lu not supported in sm 1/2 shaders.\n", usage_idx); return E_INVALIDARG; } if(writemask != (BWRITERSP_WRITEMASK_0) && @@ -747,23 +747,23 @@ static HRESULT vs_find_builtin_varyings(struct bc_writer *This, const struct bwr WARN("Partial writemasks not supported on texture coordinates in sm 1 and 2\n"); return E_INVALIDARG; } - TRACE("o%u is oT%u\n", regnum, usage_idx); + TRACE("o%lu is oT%lu.\n", regnum, usage_idx); This->oT_regnum[usage_idx] = regnum; break; case BWRITERDECLUSAGE_PSIZE: if(usage_idx > 0) { - WARN("dcl_psize%u not supported in sm 1/2 shaders\n", usage_idx); + WARN("dcl_psize%lu not supported in sm 1/2 shaders.\n", usage_idx); return E_INVALIDARG; } - TRACE("o%u writemask 0x%08x is oPts\n", regnum, writemask); + TRACE("o%lu writemask 0x%08lx is oPts.\n", regnum, writemask); This->oPts_regnum = regnum; This->oPts_mask = writemask; break; case BWRITERDECLUSAGE_FOG: if(usage_idx > 0) { - WARN("dcl_fog%u not supported in sm 1 shaders\n", usage_idx); + WARN("dcl_fog%lu not supported in sm 1 shaders.\n", usage_idx); return E_INVALIDARG; } if(writemask != BWRITERSP_WRITEMASK_0 && writemask != BWRITERSP_WRITEMASK_1 && @@ -771,13 +771,13 @@ static HRESULT vs_find_builtin_varyings(struct bc_writer *This, const struct bwr WARN("Unsupported fog writemask\n"); return E_INVALIDARG; } - TRACE("o%u writemask 0x%08x is oFog\n", regnum, writemask); + TRACE("o%lu writemask 0x%08lx is oFog.\n", regnum, writemask); This->oFog_regnum = regnum; This->oFog_mask = writemask; break; default: - WARN("Varying type %u is not supported in shader model 1.x\n", usage); + WARN("Varying type %lu is not supported in shader model 1.x.\n", usage); return E_INVALIDARG; } } @@ -825,20 +825,20 @@ static HRESULT find_ps_builtin_semantics(struct bc_writer *This, switch(usage) { case BWRITERDECLUSAGE_COLOR: if(usage_idx > 1) { - WARN("dcl_color%u not supported in sm 1 shaders\n", usage_idx); + WARN("dcl_color%lu not supported in sm 1 shaders\n", usage_idx); return E_INVALIDARG; } if(writemask != BWRITERSP_WRITEMASK_ALL) { WARN("Only WRITEMASK_ALL is supported on color in sm 1\n"); return E_INVALIDARG; } - TRACE("v%u is v%u\n", regnum, usage_idx); + TRACE("v%lu is v%lu\n", regnum, usage_idx); This->v_regnum[usage_idx] = regnum; break; case BWRITERDECLUSAGE_TEXCOORD: if(usage_idx > texcoords) { - WARN("dcl_texcoord%u not supported in this shader version\n", usage_idx); + WARN("dcl_texcoord%lu not supported in this shader version\n", usage_idx); return E_INVALIDARG; } if(writemask != (BWRITERSP_WRITEMASK_0) && @@ -849,12 +849,12 @@ static HRESULT find_ps_builtin_semantics(struct bc_writer *This, } else { writemask = BWRITERSP_WRITEMASK_ALL; } - TRACE("v%u is t%u\n", regnum, usage_idx); + TRACE("v%lu is t%lu\n", regnum, usage_idx); This->t_regnum[usage_idx] = regnum; break; default: - WARN("Varying type %u is not supported in shader model 1.x\n", usage); + WARN("Varying type %lu is not supported in shader model 1.x\n", usage); return E_INVALIDARG; } } @@ -934,7 +934,7 @@ static DWORD map_vs_output(struct bc_writer *This, DWORD regnum, DWORD mask, DWO /* The varying must be undeclared - if an unsupported varying was declared, * the vs_find_builtin_varyings function would have caught it and this code * would not run */ - WARN("Undeclared varying %u\n", regnum); + WARN("Undeclared varying %lu.\n", regnum); This->state = E_INVALIDARG; return -1; } @@ -961,7 +961,7 @@ static void vs_12_dstreg(struct bc_writer *This, const struct shader_reg *reg, /* These registers are mapped to input and output regs. They can be encoded in the bytecode, * but are unexpected. If we hit this path it might be due to an error. */ - FIXME("Unexpected register type %u\n", reg->type); + FIXME("Unexpected register type %lu.\n", reg->type); /* drop through */ case BWRITERSPR_INPUT: case BWRITERSPR_TEMP: @@ -1050,7 +1050,7 @@ static void vs_1_x_srcreg(struct bc_writer *This, const struct shader_reg *reg, /* These registers are mapped to input and output regs. They can be encoded in the bytecode, * but are unexpected. If we hit this path it might be due to an error. */ - FIXME("Unexpected register type %u\n", reg->type); + FIXME("Unexpected register type %lu.\n", reg->type); /* drop through */ case BWRITERSPR_INPUT: case BWRITERSPR_TEMP: @@ -1163,7 +1163,7 @@ static void ps_1_0123_srcreg(struct bc_writer *This, const struct shader_reg *re if(reg->srcmod == BWRITERSPSM_DZ || reg->srcmod == BWRITERSPSM_DW || reg->srcmod == BWRITERSPSM_ABS || reg->srcmod == BWRITERSPSM_ABSNEG || reg->srcmod == BWRITERSPSM_NOT) { - WARN("Invalid source modifier %u for <= ps_1_3\n", reg->srcmod); + WARN("Invalid source modifier %lu for <= ps_1_3.\n", reg->srcmod); This->state = E_INVALIDARG; return; } @@ -1292,7 +1292,7 @@ static void instr_ps_1_0123_texld(struct bc_writer *This, if(instr->src[1].type != BWRITERSPR_SAMPLER || instr->src[1].regnum > 3) { - WARN("Unsupported sampler type %u regnum %u\n", + WARN("Unsupported sampler type %lu regnum %lu.\n", instr->src[1].type, instr->src[1].regnum); This->state = E_INVALIDARG; return; @@ -1307,7 +1307,7 @@ static void instr_ps_1_0123_texld(struct bc_writer *This, (idx == 1 && instr->dst.regnum != T1_REG) || (idx == 2 && instr->dst.regnum != T2_REG) || (idx == 3 && instr->dst.regnum != T3_REG)) { - WARN("Sampling from sampler s%u to register r%u is not possible in ps_1_x\n", + WARN("Sampling from sampler s%lu to register r%lu is not possible in ps_1_x.\n", idx, instr->dst.regnum); This->state = E_INVALIDARG; return; @@ -1315,7 +1315,7 @@ static void instr_ps_1_0123_texld(struct bc_writer *This, if(instr->src[0].type == BWRITERSPR_INPUT) { /* A simple non-dependent read tex instruction */ if(instr->src[0].regnum != This->t_regnum[idx]) { - WARN("Cannot sample from s%u with texture address data from interpolator %u\n", + WARN("Cannot sample from s%lu with texture address data from interpolator %lu.\n", idx, instr->src[0].regnum); This->state = E_INVALIDARG; return; @@ -1337,7 +1337,7 @@ static void instr_ps_1_0123_texld(struct bc_writer *This, TRACE("writing texreg2gb\n"); This->funcs->opcode(This, instr, D3DSIO_TEXREG2GB & D3DSI_OPCODE_MASK, buffer); } else { - WARN("Unsupported src addr swizzle in dependent texld: 0x%08x\n", instr->src[0].u.swizzle); + WARN("Unsupported src addr swizzle in dependent texld: 0x%08lx.\n", instr->src[0].u.swizzle); This->state = E_INVALIDARG; return; } @@ -1462,7 +1462,7 @@ static void ps_1_4_srcreg(struct bc_writer *This, const struct shader_reg *reg, if(reg->srcmod == BWRITERSPSM_ABS || reg->srcmod == BWRITERSPSM_ABSNEG || reg->srcmod == BWRITERSPSM_NOT) { - WARN("Invalid source modifier %u for ps_1_4\n", reg->srcmod); + WARN("Invalid source modifier %lu for ps_1_4.\n", reg->srcmod); This->state = E_INVALIDARG; return; } @@ -1538,7 +1538,7 @@ static void instr_ps_1_4_texld(struct bc_writer *This, struct bytecode_buffer *buffer) { if(instr->src[1].type != BWRITERSPR_SAMPLER || instr->src[1].regnum > 5) { - WARN("Unsupported sampler type %u regnum %u\n", + WARN("Unsupported sampler type %lu regnum %lu.\n", instr->src[1].type, instr->src[1].regnum); This->state = E_INVALIDARG; return; @@ -1549,7 +1549,7 @@ static void instr_ps_1_4_texld(struct bc_writer *This, } if(instr->src[1].regnum != instr->dst.regnum) { - WARN("Sampling from sampler s%u to register r%u is not possible in ps_1_4\n", + WARN("Sampling from sampler s%lu to register r%lu is not possible in ps_1_4.\n", instr->src[1].regnum, instr->dst.regnum); This->state = E_INVALIDARG; return; @@ -1654,7 +1654,7 @@ static void vs_2_srcreg(struct bc_writer *This, /* These registers are mapped to input and output regs. They can be encoded in the bytecode, * but are unexpected. If we hit this path it might be due to an error. */ - FIXME("Unexpected register type %u\n", reg->type); + FIXME("Unexpected register type %lu.\n", reg->type); /* drop through */ case BWRITERSPR_INPUT: case BWRITERSPR_TEMP: @@ -1920,8 +1920,9 @@ static void ps_2_srcreg(struct bc_writer *This, WARN("Predicate register not supported in ps_2_0\n"); This->state = E_INVALIDARG; } - if(reg->regnum) { - WARN("Predicate register with regnum %u not supported\n", + if (reg->regnum) + { + WARN("Predicate register with regnum %lu not supported.\n", reg->regnum); This->state = E_INVALIDARG; } @@ -2130,7 +2131,7 @@ static void sm_3_srcreg(struct bc_writer *This, if(reg->rel_reg) { if (reg->type == BWRITERSPR_CONST && shader->type == ST_PIXEL) { - WARN("c%u[...] is unsupported in ps_3_0\n", reg->regnum); + WARN("c%lu[...] is unsupported in ps_3_0.\n", reg->regnum); This->state = E_INVALIDARG; return; } @@ -2359,7 +2360,7 @@ static HRESULT call_instr_handler(struct bc_writer *writer, while(writer->funcs->instructions[i].opcode != BWRITERSIO_END) { if(instr->opcode == writer->funcs->instructions[i].opcode) { if(!writer->funcs->instructions[i].func) { - WARN("Opcode %u not supported by this profile\n", instr->opcode); + WARN("Opcode %lu not supported by this profile.\n", instr->opcode); return E_INVALIDARG; } writer->funcs->instructions[i].func(writer, instr, buffer); @@ -2368,7 +2369,7 @@ static HRESULT call_instr_handler(struct bc_writer *writer, i++; } - FIXME("Unhandled instruction %u - %s\n", instr->opcode, + FIXME("Unhandled instruction %lu - %s.\n", instr->opcode, debug_print_opcode(instr->opcode)); return E_INVALIDARG; } diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 112e82d6d44..d7d2e1e681d 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -689,7 +689,7 @@ static HRESULT assemble_shader(const char *preproc_shader, SlDeleteShader(shader); if (FAILED(hr)) { - ERR("Failed to write bytecode, hr %#x.\n", hr); + ERR("Failed to write bytecode, hr %#lx.\n", hr); return D3DXERR_INVALIDDATA; } @@ -716,7 +716,7 @@ HRESULT WINAPI D3DAssemble(const void *data, SIZE_T datasize, const char *filena { HRESULT hr; - TRACE("data %p, datasize %lu, filename %s, defines %p, include %p, sflags %#x, " + TRACE("data %p, datasize %Iu, filename %s, defines %p, include %p, sflags %#x, " "shader %p, error_messages %p.\n", data, datasize, debugstr_a(filename), defines, include, flags, shader, error_messages); @@ -745,9 +745,9 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen { HRESULT hr; - TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s, " + TRACE("data %p, data_size %Iu, filename %s, defines %p, include %p, entrypoint %s, " "target %s, sflags %#x, eflags %#x, secondary_flags %#x, secondary_data %p, " - "secondary_data_size %lu, shader %p, error_messages %p.\n", + "secondary_data_size %Iu, shader %p, error_messages %p.\n", data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint), debugstr_a(target), sflags, eflags, secondary_flags, secondary_data, secondary_data_size, shader, error_messages); @@ -776,7 +776,7 @@ HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filena const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages) { - TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s, " + TRACE("data %p, data_size %Iu, filename %s, defines %p, include %p, entrypoint %s, " "target %s, sflags %#x, eflags %#x, shader %p, error_messages %p.\n", data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint), debugstr_a(target), sflags, eflags, shader, error_messages); @@ -792,7 +792,7 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename HRESULT hr; ID3DBlob *buffer; - TRACE("data %p, size %lu, filename %s, defines %p, include %p, shader %p, error_messages %p\n", + TRACE("data %p, size %Iu, filename %s, defines %p, include %p, shader %p, error_messages %p.\n", data, size, debugstr_a(filename), defines, include, shader, error_messages); if (!data) @@ -827,7 +827,7 @@ cleanup: HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T size, UINT flags, const char *comments, ID3DBlob **disassembly) { - FIXME("data %p, size %lu, flags %#x, comments %p, disassembly %p stub!\n", + FIXME("data %p, size %Iu, flags %#x, comments %p, disassembly %p stub!\n", data, size, flags, comments, disassembly); return E_NOTIMPL; } @@ -881,6 +881,6 @@ end: HRESULT WINAPI D3DLoadModule(const void *data, SIZE_T size, ID3D11Module **module) { - FIXME("data %p, size %lu, module %p stub!\n", data, size, module); + FIXME("data %p, size %Iu, module %p stub!\n", data, size, module); return E_NOTIMPL; } diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 69970136390..cbcf8246b70 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -18,9 +18,6 @@ * */ -#ifndef WINE_NO_LONG_TYPES -#define WINE_NO_LONG_TYPES -#endif #include "initguid.h" #include "d3dcompiler_private.h" #include "d3d10.h" @@ -365,7 +362,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_AddRef(ID3D11Shader struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); ULONG refcount = InterlockedIncrement(&This->refcount); - TRACE("%p increasing refcount to %u\n", This, refcount); + TRACE("%p increasing refcount to %lu.\n", This, refcount); return refcount; } @@ -375,7 +372,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_Release(ID3D11Shade struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); ULONG refcount = InterlockedDecrement(&This->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %lu.\n", This, refcount); if (!refcount) { @@ -1095,7 +1092,7 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c const char *ptr = data; DWORD size = data_size >> 2; - TRACE("Size %u\n", size); + TRACE("Size %lu\n", size); r->instruction_count = read_dword(&ptr); TRACE("InstructionCount: %u\n", r->instruction_count); @@ -1202,7 +1199,7 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c /* dx11 stat size */ if (size == 37) return S_OK; - FIXME("Unhandled size %u\n", size); + FIXME("Unhandled size %lu.\n", size); return E_FAIL; } @@ -1221,7 +1218,7 @@ static HRESULT d3dcompiler_parse_type_members(struct d3dcompiler_shader_reflecti TRACE("Member name: %s.\n", debugstr_a(member->name)); offset = read_dword(ptr); - TRACE("Member type offset: %x\n", offset); + TRACE("Member type offset: %#lx\n", offset); member->type = get_reflection_type(ref, data, offset); if (!member->type) @@ -1232,7 +1229,7 @@ static HRESULT d3dcompiler_parse_type_members(struct d3dcompiler_shader_reflecti } member->offset = read_dword(ptr); - TRACE("Member offset %x\n", member->offset); + TRACE("Member offset %#lx\n", member->offset); return S_OK; } @@ -1266,7 +1263,7 @@ static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type TRACE("Elements %u, Members %u\n", desc->Elements, desc->Members); member_offset = read_dword(&ptr); - TRACE("Member Offset %u\n", member_offset); + TRACE("Member Offset %lu\n", member_offset); if ((type->reflection->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK) >= 0x500) skip_dword_unknown(&ptr, 4); @@ -1344,7 +1341,7 @@ static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3d hr = d3dcompiler_parse_type(type, data, offset); if (FAILED(hr)) { - ERR("Failed to parse type info, hr %#x.\n", hr); + ERR("Failed to parse type info, hr %#lx.\n", hr); HeapFree(GetProcessHeap(), 0, type); return NULL; } @@ -1401,7 +1398,7 @@ static HRESULT d3dcompiler_parse_variables(struct d3dcompiler_shader_reflection_ TRACE("Variable flags: %u\n", v->flags); offset = read_dword(&ptr); - TRACE("Variable type offset: %x\n", offset); + TRACE("Variable type offset: %#lx.\n", offset); v->type = get_reflection_type(cb->reflection, data, offset); if (!v->type) { @@ -1411,7 +1408,7 @@ static HRESULT d3dcompiler_parse_variables(struct d3dcompiler_shader_reflection_ } offset = read_dword(&ptr); - TRACE("Variable default value offset: %x\n", offset); + TRACE("Variable default value offset: %#lx.\n", offset); if (!copy_value(data + offset, &v->default_value, offset ? v->size : 0)) { ERR("Failed to copy name.\n"); @@ -1448,29 +1445,29 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c DWORD target_version; HRESULT hr; - TRACE("Size %u\n", size); + TRACE("Size %lu\n", size); r->constant_buffer_count = read_dword(&ptr); TRACE("Constant buffer count: %u\n", r->constant_buffer_count); cbuffer_offset = read_dword(&ptr); - TRACE("Constant buffer offset: %#x\n", cbuffer_offset); + TRACE("Constant buffer offset: %#lx\n", cbuffer_offset); r->bound_resource_count = read_dword(&ptr); TRACE("Bound resource count: %u\n", r->bound_resource_count); resource_offset = read_dword(&ptr); - TRACE("Bound resource offset: %#x\n", resource_offset); + TRACE("Bound resource offset: %#lx\n", resource_offset); r->target = read_dword(&ptr); - TRACE("Target: %#x\n", r->target); + TRACE("Target: %#lx\n", r->target); target_version = r->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK; #if D3D_COMPILER_VERSION < 47 if (target_version >= 0x501) { - WARN("Target version %#x is not supported in d3dcompiler %u.\n", target_version, D3D_COMPILER_VERSION); + WARN("Target version %#lx is not supported in d3dcompiler %u.\n", target_version, D3D_COMPILER_VERSION); return E_INVALIDARG; } #endif @@ -1479,7 +1476,7 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c TRACE("Flags: %u\n", r->flags); creator_offset = read_dword(&ptr); - TRACE("Creator at offset %#x.\n", creator_offset); + TRACE("Creator at offset %#lx.\n", creator_offset); if (!copy_name(data + creator_offset, &creator)) { @@ -1594,7 +1591,7 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c TRACE("Variable count: %u\n", cb->variable_count); offset = read_dword(&ptr); - TRACE("Variable offset: %x\n", offset); + TRACE("Variable offset: %#lx\n", offset); hr = d3dcompiler_parse_variables(cb, data, data_size, data + offset); if (hr != S_OK) @@ -1664,7 +1661,7 @@ static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature * } count = read_dword(&ptr); - TRACE("%u elements\n", count); + TRACE("%lu elements\n", count); skip_dword_unknown(&ptr, 1); @@ -1901,7 +1898,7 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_AddRef(ID3D10ShaderReflec struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D10ShaderReflection(iface); ULONG refcount = InterlockedIncrement(&reflection->refcount); - TRACE("%p increasing refcount to %u.\n", reflection, refcount); + TRACE("%p increasing refcount to %lu.\n", reflection, refcount); return refcount; } @@ -1911,7 +1908,7 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_Release(ID3D10ShaderRefle struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D10ShaderReflection(iface); ULONG refcount = InterlockedDecrement(&reflection->refcount); - TRACE("%p decreasing refcount to %u.\n", reflection, refcount); + TRACE("%p decreasing refcount to %lu.\n", reflection, refcount); if (!refcount) heap_free(reflection); diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 84f776626ba..7d5c5395d6a 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -21,9 +21,6 @@ * */ -#ifndef WINE_NO_LONG_TYPES -#define WINE_NO_LONG_TYPES -#endif #include <stdio.h> #include "d3dcompiler_private.h" @@ -146,7 +143,7 @@ const char *debug_print_srcmod(DWORD mod) WINE_D3DCOMPILER_TO_STR(BWRITERSPSM_ABSNEG); WINE_D3DCOMPILER_TO_STR(BWRITERSPSM_NOT); default: - FIXME("Unrecognized source modifier %#x.\n", mod); + FIXME("Unrecognized source modifier %#lx.\n", mod); return "unrecognized_src_mod"; } } @@ -207,15 +204,15 @@ static const char *get_regname(const struct shader_reg *reg) switch (reg->type) { case BWRITERSPR_TEMP: - return wine_dbg_sprintf("r%u", reg->regnum); + return wine_dbg_sprintf("r%lu", reg->regnum); case BWRITERSPR_INPUT: - return wine_dbg_sprintf("v%u", reg->regnum); + return wine_dbg_sprintf("v%lu", reg->regnum); case BWRITERSPR_CONST: - return wine_dbg_sprintf("c%u", reg->regnum); + return wine_dbg_sprintf("c%lu", reg->regnum); case BWRITERSPR_ADDR: - return wine_dbg_sprintf("a%u", reg->regnum); + return wine_dbg_sprintf("a%lu", reg->regnum); case BWRITERSPR_TEXTURE: - return wine_dbg_sprintf("t%u", reg->regnum); + return wine_dbg_sprintf("t%lu", reg->regnum); case BWRITERSPR_RASTOUT: switch (reg->regnum) { @@ -225,21 +222,21 @@ static const char *get_regname(const struct shader_reg *reg) default: return "Unexpected RASTOUT"; } case BWRITERSPR_ATTROUT: - return wine_dbg_sprintf("oD%u", reg->regnum); + return wine_dbg_sprintf("oD%lu", reg->regnum); case BWRITERSPR_TEXCRDOUT: - return wine_dbg_sprintf("oT%u", reg->regnum); + return wine_dbg_sprintf("oT%lu", reg->regnum); case BWRITERSPR_OUTPUT: - return wine_dbg_sprintf("o%u", reg->regnum); + return wine_dbg_sprintf("o%lu", reg->regnum); case BWRITERSPR_CONSTINT: - return wine_dbg_sprintf("i%u", reg->regnum); + return wine_dbg_sprintf("i%lu", reg->regnum); case BWRITERSPR_COLOROUT: - return wine_dbg_sprintf("oC%u", reg->regnum); + return wine_dbg_sprintf("oC%lu", reg->regnum); case BWRITERSPR_DEPTHOUT: return "oDepth"; case BWRITERSPR_SAMPLER: - return wine_dbg_sprintf("s%u", reg->regnum); + return wine_dbg_sprintf("s%lu", reg->regnum); case BWRITERSPR_CONSTBOOL: - return wine_dbg_sprintf("b%u", reg->regnum); + return wine_dbg_sprintf("b%lu", reg->regnum); case BWRITERSPR_LOOP: return "aL"; case BWRITERSPR_MISCTYPE: @@ -250,11 +247,11 @@ static const char *get_regname(const struct shader_reg *reg) default: return "unexpected misctype"; } case BWRITERSPR_LABEL: - return wine_dbg_sprintf("l%u", reg->regnum); + return wine_dbg_sprintf("l%lu", reg->regnum); case BWRITERSPR_PREDICATE: - return wine_dbg_sprintf("p%u", reg->regnum); + return wine_dbg_sprintf("p%lu", reg->regnum); default: - return wine_dbg_sprintf("unknown regname %#x", reg->type); + return wine_dbg_sprintf("unknown regname %#lx", reg->type); } } @@ -323,7 +320,7 @@ static const char *debug_print_relarg(const struct shader_reg *reg) short_swizzle = debug_print_swizzle(reg->rel_reg->u.swizzle); if (reg->rel_reg->type == BWRITERSPR_ADDR) - return wine_dbg_sprintf("[a%u%s]", reg->rel_reg->regnum, short_swizzle); + return wine_dbg_sprintf("[a%lu%s]", reg->rel_reg->regnum, short_swizzle); else if(reg->rel_reg->type == BWRITERSPR_LOOP && reg->rel_reg->regnum == 0) return wine_dbg_sprintf("[aL%s]", short_swizzle); else @@ -519,19 +516,19 @@ void skip_dword_unknown(const char **ptr, unsigned int count) for (i = 0; i < count; ++i) { d = read_dword(ptr); - FIXME("\t0x%08x\n", d); + FIXME("\t0x%08lx\n", d); } } static void write_dword_unknown(char **ptr, DWORD d) { - FIXME("Writing unknown DWORD 0x%08x\n", d); + FIXME("Writing unknown DWORD 0x%08lx.\n", d); write_dword(ptr, d); } HRESULT dxbc_add_section(struct dxbc *dxbc, DWORD tag, const char *data, DWORD data_size) { - TRACE("dxbc %p, tag %s, size %#x.\n", dxbc, debugstr_an((const char *)&tag, 4), data_size); + TRACE("dxbc %p, tag %s, size %#lx.\n", dxbc, debugstr_an((const char *)&tag, 4), data_size); if (dxbc->count >= dxbc->size) { @@ -605,7 +602,7 @@ HRESULT dxbc_parse(const char *data, SIZE_T data_size, struct dxbc *dxbc) skip_dword_unknown(&ptr, 1); total_size = read_dword(&ptr); - TRACE("total size: %#x\n", total_size); + TRACE("total size: %#lx\n", total_size); if (data_size != total_size) { @@ -614,7 +611,7 @@ HRESULT dxbc_parse(const char *data, SIZE_T data_size, struct dxbc *dxbc) } chunk_count = read_dword(&ptr); - TRACE("chunk count: %#x\n", chunk_count); + TRACE("chunk count: %#lx\n", chunk_count); hr = dxbc_init(dxbc, chunk_count); if (FAILED(hr)) @@ -630,7 +627,7 @@ HRESULT dxbc_parse(const char *data, SIZE_T data_size, struct dxbc *dxbc) DWORD chunk_offset; chunk_offset = read_dword(&ptr); - TRACE("chunk %u at offset %#x\n", i, chunk_offset); + TRACE("chunk %u at offset %#lx\n", i, chunk_offset); chunk_ptr = data + chunk_offset; diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in index b3bdcb6a630..066bd6fdd1c 100644 --- a/dlls/d3dcompiler_46/Makefile.in +++ b/dlls/d3dcompiler_46/Makefile.in @@ -1,7 +1,7 @@ MODULE = d3dcompiler_46.dll IMPORTLIB = d3dcompiler_46 IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=46 +EXTRADEFS = -DD3D_COMPILER_VERSION=46 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_47/Makefile.in b/dlls/d3dcompiler_47/Makefile.in index b19b6d5fe39..379f0aa4b3a 100644 --- a/dlls/d3dcompiler_47/Makefile.in +++ b/dlls/d3dcompiler_47/Makefile.in @@ -1,7 +1,7 @@ MODULE = d3dcompiler_47.dll IMPORTLIB = d3dcompiler IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=47 +EXTRADEFS = -DD3D_COMPILER_VERSION=47 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native -- 2.30.2

1 0

[PATCH 5/6] d3d10: Build without -DWINE_NO_LONG_TYPES.
by Henri Verbeet Feb. 8, 2022

Feb. 8, 2022

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10/Makefile.in | 2 +- dlls/d3d10/d3d10_main.c | 24 ++-- dlls/d3d10/effect.c | 228 +++++++++++++++---------------- dlls/d3d10/shader.c | 2 +- dlls/d3d10/stateblock.c | 4 +- dlls/d3dcompiler_43/reflection.c | 7 +- dlls/d3dcompiler_43/utils.c | 3 + 7 files changed, 138 insertions(+), 132 deletions(-) diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in index 38d2055ecd9..1b869f47f6c 100644 --- a/dlls/d3d10/Makefile.in +++ b/dlls/d3d10/Makefile.in @@ -1,7 +1,7 @@ MODULE = d3d10.dll IMPORTLIB = d3d10 IMPORTS = uuid d3d10core d3dcompiler dxgi -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=0 +EXTRADEFS = -DD3D_COMPILER_VERSION=0 PARENTSRC = ../d3dcompiler_43 C_SRCS = \ diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 6961589ca31..82c2ecc2ec9 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -64,7 +64,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); if (FAILED(hr)) { - WARN("Failed to get dxgi factory, returning %#x.\n", hr); + WARN("Failed to get dxgi factory, returning %#lx.\n", hr); return hr; } } @@ -73,7 +73,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory); if (FAILED(hr)) { - WARN("Failed to create dxgi factory, returning %#x.\n", hr); + WARN("Failed to create dxgi factory, returning %#lx.\n", hr); return hr; } @@ -86,7 +86,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); if (FAILED(hr)) { - WARN("No adapters found, returning %#x.\n", hr); + WARN("No adapters found, returning %#lx.\n", hr); IDXGIFactory_Release(factory); return hr; } @@ -109,7 +109,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv FreeLibrary(refrast); if (FAILED(hr)) { - WARN("Failed to create a software adapter, returning %#x.\n", hr); + WARN("Failed to create a software adapter, returning %#lx.\n", hr); IDXGIFactory_Release(factory); return hr; } @@ -127,7 +127,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv hr = IDXGIFactory_CreateSoftwareAdapter(factory, swrast, &adapter); if (FAILED(hr)) { - WARN("Failed to create a software adapter, returning %#x.\n", hr); + WARN("Failed to create a software adapter, returning %#lx.\n", hr); IDXGIFactory_Release(factory); return hr; } @@ -146,7 +146,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv IDXGIFactory_Release(factory); if (FAILED(hr)) { - WARN("Failed to create a device, returning %#x.\n", hr); + WARN("Failed to create a device, returning %#lx.\n", hr); return hr; } @@ -178,7 +178,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER * hooking these entry-points. */ if (FAILED(hr = d3d10_create_device(adapter, driver_type, swrast, flags, sdk_version, device))) { - WARN("Failed to create a device, returning %#x\n", hr); + WARN("Failed to create a device, returning %#lx.\n", hr); *device = NULL; return hr; } @@ -188,7 +188,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER hr = ID3D10Device_QueryInterface(*device, &IID_IDXGIDevice, (void **)&dxgi_device); if (FAILED(hr)) { - ERR("Failed to get a dxgi device from the d3d10 device, returning %#x\n", hr); + ERR("Failed to get a dxgi device from the d3d10 device, returning %#lx.\n", hr); ID3D10Device_Release(*device); *device = NULL; return hr; @@ -198,7 +198,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER IDXGIDevice_Release(dxgi_device); if (FAILED(hr)) { - ERR("Failed to get the device adapter, returning %#x\n", hr); + ERR("Failed to get the device adapter, returning %#lx.\n", hr); ID3D10Device_Release(*device); *device = NULL; return hr; @@ -208,7 +208,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER IDXGIAdapter_Release(adapter); if (FAILED(hr)) { - ERR("Failed to get the adapter factory, returning %#x\n", hr); + ERR("Failed to get the adapter factory, returning %#lx.\n", hr); ID3D10Device_Release(*device); *device = NULL; return hr; @@ -221,7 +221,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER ID3D10Device_Release(*device); *device = NULL; - WARN("Failed to create a swapchain, returning %#x\n", hr); + WARN("Failed to create a swapchain, returning %#lx.\n", hr); return hr; } @@ -234,7 +234,7 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const const D3D10_SHADER_MACRO *defines, ID3D10Include *include, UINT hlsl_flags, UINT fx_flags, ID3D10Blob **effect, ID3D10Blob **errors) { - TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, " + TRACE("data %p, data_size %Iu, filename %s, defines %p, include %p, " "hlsl_flags %#x, fx_flags %#x, effect %p, errors %p.\n", data, data_size, wine_dbgstr_a(filename), defines, include, hlsl_flags, fx_flags, effect, errors); diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 68afc061d1e..bb105beee6d 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -778,7 +778,7 @@ static void d3d10_effect_update_dependent_props(struct d3d10_effect_prop_depende if (FAILED(hr = d3d10_effect_preshader_eval(&d->index_expr.index))) { - WARN("Failed to evaluate index expression, hr %#x.\n", hr); + WARN("Failed to evaluate index expression, hr %#lx.\n", hr); return; } @@ -786,7 +786,7 @@ static void d3d10_effect_update_dependent_props(struct d3d10_effect_prop_depende if (variable_idx >= v->type->element_count) { - WARN("Expression evaluated to invalid index value %u, array %s of size %u.\n", + WARN("Expression evaluated to invalid index value %u, array %s of size %lu.\n", variable_idx, debugstr_a(v->name), v->type->element_count); variable_idx = 0; } @@ -861,7 +861,7 @@ static void skip_dword_unknown(const char *location, const char **ptr, unsigned for (i = 0; i < count; ++i) { d = read_dword(ptr); - FIXME("\t0x%08x\n", d); + FIXME("\t0x%08lx\n", d); } } @@ -894,15 +894,15 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, skip_dword_unknown("DXBC checksum", &ptr, 4); version = read_dword(&ptr); - TRACE("version: %#x.\n", version); + TRACE("version: %#lx.\n", version); if (version != 0x00000001) { - WARN("Got unexpected DXBC version %#x.\n", version); + WARN("Got unexpected DXBC version %#lx.\n", version); return E_FAIL; } total_size = read_dword(&ptr); - TRACE("total size: %#x\n", total_size); + TRACE("total size: %#lx\n", total_size); if (data_size != total_size) { @@ -911,7 +911,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, } chunk_count = read_dword(&ptr); - TRACE("chunk count: %#x\n", chunk_count); + TRACE("chunk count: %#lx\n", chunk_count); for (i = 0; i < chunk_count; ++i) { @@ -920,11 +920,11 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, DWORD chunk_offset; chunk_offset = read_dword(&ptr); - TRACE("chunk %u at offset %#x\n", i, chunk_offset); + TRACE("chunk %u at offset %#lx\n", i, chunk_offset); 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 %#lx (data size %#Ix).\n", chunk_offset, data_size); return E_FAIL; } @@ -935,7 +935,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 %#lx (data size %#Ix, chunk offset %#lx).\n", chunk_size, data_size, chunk_offset); return E_FAIL; } @@ -953,7 +953,7 @@ static BOOL fx10_get_string(const char *data, size_t data_size, DWORD offset, co if (offset >= data_size) { - WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + WARN("Invalid offset %#lx (data size %#Ix).\n", offset, data_size); return FALSE; } @@ -1264,17 +1264,17 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse if (offset >= data_size || !require_space(offset, 1, sizeof(dxbc_size), data_size)) { - WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + WARN("Invalid offset %#lx (data size %#Ix).\n", offset, data_size); return E_FAIL; } ptr = data + offset; dxbc_size = read_dword(&ptr); - TRACE("dxbc size: %#x\n", dxbc_size); + TRACE("dxbc size: %#lx\n", dxbc_size); if (!require_space(ptr - data, 1, dxbc_size, data_size)) { - WARN("Invalid dxbc size %#x (data size %#lx, offset %#x).\n", offset, (long)data_size, offset); + WARN("Invalid dxbc size %#lx (data size %#Ix, offset %#lx).\n", offset, data_size, offset); return E_FAIL; } @@ -1311,7 +1311,7 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse if (FAILED(hr = d3d10_effect_parse_stream_output_declaration(v->u.shader.stream_output_declaration, &so_decl))) { - WARN("Failed to parse stream output declaration, hr %#x.\n", hr); + WARN("Failed to parse stream output declaration, hr %#lx.\n", hr); break; } @@ -1341,7 +1341,7 @@ static D3D10_SHADER_VARIABLE_CLASS d3d10_variable_class(DWORD c, BOOL is_column_ case 3: if (is_column_major) return D3D10_SVC_MATRIX_COLUMNS; else return D3D10_SVC_MATRIX_ROWS; default: - FIXME("Unknown variable class %#x.\n", c); + FIXME("Unknown variable class %#lx.\n", c); return 0; } } @@ -1381,7 +1381,7 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object, case 21: return D3D10_SVT_SAMPLER; case 22: return D3D10_SVT_BUFFER; default: - FIXME("Unknown variable type %#x.\n", t); + FIXME("Unknown variable type %#lx.\n", t); return D3D10_SVT_VOID; } } @@ -1394,7 +1394,7 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object, case 3: return D3D10_SVT_UINT; case 4: return D3D10_SVT_BOOL; default: - FIXME("Unknown variable type %#x.\n", t); + FIXME("Unknown variable type %#lx.\n", t); return D3D10_SVT_VOID; } } @@ -1408,13 +1408,13 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, if (offset >= data_size || !require_space(offset, 6, sizeof(DWORD), data_size)) { - WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + WARN("Invalid offset %#lx (data size %#Ix).\n", offset, data_size); return E_FAIL; } ptr = data + offset; offset = read_dword(&ptr); - TRACE("Type name at offset %#x.\n", offset); + TRACE("Type name at offset %#lx.\n", offset); if (!fx10_copy_string(data, data_size, offset, &t->name)) { @@ -1427,16 +1427,16 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, TRACE("Kind: %u.\n", type_kind); t->element_count = read_dword(&ptr); - TRACE("Element count: %u.\n", t->element_count); + TRACE("Element count: %lu.\n", t->element_count); t->size_unpacked = read_dword(&ptr); - TRACE("Unpacked size: %#x.\n", t->size_unpacked); + TRACE("Unpacked size: %#lx.\n", t->size_unpacked); t->stride = read_dword(&ptr); - TRACE("Stride: %#x.\n", t->stride); + TRACE("Stride: %#lx.\n", t->stride); t->size_packed = read_dword(&ptr); - TRACE("Packed size %#x.\n", t->size_packed); + TRACE("Packed size %#lx.\n", t->size_packed); switch (type_kind) { @@ -1445,7 +1445,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, if (!require_space(ptr - data, 1, sizeof(typeinfo), data_size)) { - WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + WARN("Invalid offset %#lx (data size %#Ix).\n", offset, data_size); return E_FAIL; } @@ -1457,8 +1457,8 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, t->type_class = d3d10_variable_class((typeinfo & D3D10_FX10_TYPE_CLASS_MASK) >> D3D10_FX10_TYPE_CLASS_SHIFT, typeinfo & D3D10_FX10_TYPE_MATRIX_COLUMN_MAJOR_MASK); TRACE("Type description: %#x.\n", typeinfo); - TRACE("\tcolumns: %u.\n", t->column_count); - TRACE("\trows: %u.\n", t->row_count); + TRACE("\tcolumns: %lu.\n", t->column_count); + TRACE("\trows: %lu.\n", t->row_count); TRACE("\tbasetype: %s.\n", debug_d3d10_shader_variable_type(t->basetype)); TRACE("\tclass: %s.\n", debug_d3d10_shader_variable_class(t->type_class)); TRACE("\tunknown bits: %#x.\n", typeinfo & ~(D3D10_FX10_TYPE_COLUMN_MASK | D3D10_FX10_TYPE_ROW_MASK @@ -1470,7 +1470,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, if (!require_space(ptr - data, 1, sizeof(typeinfo), data_size)) { - WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + WARN("Invalid offset %#lx (data size %#Ix).\n", offset, data_size); return E_FAIL; } @@ -1493,12 +1493,12 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, if (!require_space(ptr - data, 1, sizeof(t->member_count), data_size)) { - WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + WARN("Invalid offset %#lx (data size %#Ix).\n", offset, data_size); return E_FAIL; } t->member_count = read_dword(&ptr); - TRACE("Member count: %u.\n", t->member_count); + TRACE("Member count: %lu.\n", t->member_count); t->column_count = 0; t->row_count = 0; @@ -1513,8 +1513,8 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, if (!require_space(ptr - data, t->member_count, 4 * sizeof(DWORD), data_size)) { - WARN("Invalid member count %#x (data size %#lx, offset %#x).\n", - t->member_count, (long)data_size, offset); + WARN("Invalid member count %#lx (data size %#Ix, offset %#lx).\n", + t->member_count, data_size, offset); return E_FAIL; } @@ -1523,7 +1523,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, struct d3d10_effect_type_member *typem = &t->members[i]; offset = read_dword(&ptr); - TRACE("Member name at offset %#x.\n", offset); + TRACE("Member name at offset %#lx.\n", offset); if (!fx10_copy_string(data, data_size, offset, &typem->name)) { @@ -1533,7 +1533,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, TRACE("Member name: %s.\n", debugstr_a(typem->name)); offset = read_dword(&ptr); - TRACE("Member semantic at offset %#x.\n", offset); + TRACE("Member semantic at offset %#lx.\n", offset); if (!fx10_copy_string(data, data_size, offset, &typem->semantic)) { @@ -1543,10 +1543,10 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, TRACE("Member semantic: %s.\n", debugstr_a(typem->semantic)); typem->buffer_offset = read_dword(&ptr); - TRACE("Member offset in struct: %#x.\n", typem->buffer_offset); + TRACE("Member offset in struct: %#lx.\n", typem->buffer_offset); offset = read_dword(&ptr); - TRACE("Member type info at offset %#x.\n", offset); + TRACE("Member type info at offset %#lx.\n", offset); if (!(typem->type = get_fx10_type(t->effect, data, data_size, offset))) { @@ -1563,7 +1563,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, if (t->element_count) { - TRACE("Elementtype for type at offset: %#x\n", t->id); + TRACE("Elementtype for type at offset: %#lx\n", t->id); /* allocate elementtype - we need only one, because all elements have the same type */ if (!(t->elementtype = heap_alloc_zero(sizeof(*t->elementtype)))) @@ -1584,29 +1584,29 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, TRACE("\tType name: %s.\n", debugstr_a(t->elementtype->name)); t->elementtype->element_count = 0; - TRACE("\tElement count: %u.\n", t->elementtype->element_count); + TRACE("\tElement count: %lu.\n", t->elementtype->element_count); /* * Not sure if this calculation is 100% correct, but a test * shows that these values work. */ t->elementtype->size_unpacked = t->size_packed / t->element_count; - TRACE("\tUnpacked size: %#x.\n", t->elementtype->size_unpacked); + TRACE("\tUnpacked size: %#lx.\n", t->elementtype->size_unpacked); t->elementtype->stride = t->stride; - TRACE("\tStride: %#x.\n", t->elementtype->stride); + TRACE("\tStride: %#lx.\n", t->elementtype->stride); t->elementtype->size_packed = t->size_packed / t->element_count; - TRACE("\tPacked size: %#x.\n", t->elementtype->size_packed); + TRACE("\tPacked size: %#lx.\n", t->elementtype->size_packed); t->elementtype->member_count = t->member_count; - TRACE("\tMember count: %u.\n", t->elementtype->member_count); + TRACE("\tMember count: %lu.\n", t->elementtype->member_count); t->elementtype->column_count = t->column_count; - TRACE("\tColumns: %u.\n", t->elementtype->column_count); + TRACE("\tColumns: %lu.\n", t->elementtype->column_count); t->elementtype->row_count = t->row_count; - TRACE("\tRows: %u.\n", t->elementtype->row_count); + TRACE("\tRows: %lu.\n", t->elementtype->row_count); t->elementtype->basetype = t->basetype; TRACE("\tBasetype: %s.\n", debug_d3d10_shader_variable_type(t->elementtype->basetype)); @@ -1645,7 +1645,7 @@ static struct d3d10_effect_type *get_fx10_type(struct d3d10_effect *effect, type->effect = effect; if (FAILED(hr = parse_fx10_type(data, data_size, offset, type))) { - ERR("Failed to parse type info, hr %#x.\n", hr); + ERR("Failed to parse type info, hr %#lx.\n", hr); heap_free(type); return NULL; } @@ -1785,7 +1785,7 @@ static HRESULT copy_variableinfo_from_type(struct d3d10_effect_variable *v) TRACE("Variable semantic: %s.\n", debugstr_a(var->semantic)); var->buffer_offset = v->buffer_offset + typem->buffer_offset; - TRACE("Variable buffer offset: %u.\n", var->buffer_offset); + TRACE("Variable buffer offset: %lu.\n", var->buffer_offset); hr = copy_variableinfo_from_type(var); if (FAILED(hr)) return hr; @@ -1830,7 +1830,7 @@ static HRESULT copy_variableinfo_from_type(struct d3d10_effect_variable *v) bufferoffset += v->type->stride; } var->buffer_offset = bufferoffset; - TRACE("Variable buffer offset: %u.\n", var->buffer_offset); + TRACE("Variable buffer offset: %lu.\n", var->buffer_offset); hr = copy_variableinfo_from_type(var); if (FAILED(hr)) return hr; @@ -1846,7 +1846,7 @@ static HRESULT parse_fx10_variable_head(const char *data, size_t data_size, DWORD offset; offset = read_dword(ptr); - TRACE("Variable name at offset %#x.\n", offset); + TRACE("Variable name at offset %#lx.\n", offset); if (!fx10_copy_string(data, data_size, offset, &v->name)) { @@ -1856,7 +1856,7 @@ static HRESULT parse_fx10_variable_head(const char *data, size_t data_size, TRACE("Variable name: %s.\n", debugstr_a(v->name)); offset = read_dword(ptr); - TRACE("Variable type info at offset %#x.\n", offset); + TRACE("Variable type info at offset %#lx.\n", offset); if (!(v->type = get_fx10_type(v->effect, data, data_size, offset))) { @@ -1883,7 +1883,7 @@ static HRESULT parse_fx10_annotation(const char *data, size_t data_size, return hr; offset = read_dword(ptr); - TRACE("Annotation value is at offset %#x.\n", offset); + TRACE("Annotation value is at offset %#lx.\n", offset); switch (a->type->basetype) { @@ -2306,7 +2306,7 @@ static HRESULT parse_fx10_ctab(void *ctx, const char *data, unsigned int data_si if (!require_space(header.constantinfo, header.constants, sizeof(*info), data_size)) { - WARN("Invalid constant info section offset %#x.\n", header.constantinfo); + WARN("Invalid constant info section offset %#lx.\n", header.constantinfo); return E_FAIL; } @@ -2348,7 +2348,7 @@ static HRESULT parse_fx10_ctab(void *ctx, const char *data, unsigned int data_si static HRESULT fxlvm_chunk_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) { - TRACE("Chunk tag: %s, size: %u.\n", debugstr_an((const char *)&tag, 4), data_size); + TRACE("Chunk tag: %s, size: %lu.\n", debugstr_an((const char *)&tag, 4), data_size); switch (tag) { @@ -2510,7 +2510,7 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size { if (property_info->size * sizeof(float) > variable->type->size_unpacked) { - WARN("Mismatching variable size %u, property size %u.\n", + WARN("Mismatching variable size %lu, property size %u.\n", variable->type->size_unpacked, property_info->size); return E_FAIL; } @@ -2557,7 +2557,7 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size { if (!variable->type->element_count || variable_idx >= variable->type->element_count) { - WARN("Invalid array size %u.\n", variable->type->element_count); + WARN("Invalid array size %lu.\n", variable->type->element_count); return E_FAIL; } @@ -2663,7 +2663,7 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size dep.index_expr.v = variable; if (FAILED(hr = parse_fx10_preshader(data_ptr, blob_size, effect, &dep.index_expr.index))) { - WARN("Failed to parse preshader, hr %#x.\n", hr); + WARN("Failed to parse preshader, hr %#lx.\n", hr); return hr; } @@ -2691,7 +2691,7 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size dep.operation = operation; if (FAILED(hr = parse_fx10_preshader(data_ptr, blob_size, effect, &dep.value_expr.value))) { - WARN("Failed to parse preshader, hr %#x.\n", hr); + WARN("Failed to parse preshader, hr %#lx.\n", hr); return hr; } @@ -2771,7 +2771,7 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, HRESULT hr; offset = read_dword(ptr); - TRACE("Pass name at offset %#x.\n", offset); + TRACE("Pass name at offset %#lx.\n", offset); if (!fx10_copy_string(data, data_size, offset, &p->name)) { @@ -2781,7 +2781,7 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, TRACE("Pass name: %s.\n", debugstr_a(p->name)); object_count = read_dword(ptr); - TRACE("Pass has %u effect objects.\n", object_count); + TRACE("Pass has %lu effect objects.\n", object_count); p->annotations.count = read_dword(ptr); TRACE("Pass has %u annotations.\n", p->annotations.count); @@ -2789,7 +2789,7 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, p->technique->effect, &p->annotations))) { - ERR("Failed to parse pass annotations, hr %#x.\n", hr); + ERR("Failed to parse pass annotations, hr %#lx.\n", hr); return hr; } @@ -2802,7 +2802,7 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_property_assignment(data, data_size, ptr, D3D10_C_PASS, p->technique->effect, p, &p->dependencies))) { - WARN("Failed to parse pass assignment %u, hr %#x.\n", i, hr); + WARN("Failed to parse pass assignment %u, hr %#lx.\n", i, hr); return hr; } } @@ -2818,7 +2818,7 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, HRESULT hr; offset = read_dword(ptr); - TRACE("Technique name at offset %#x.\n", offset); + TRACE("Technique name at offset %#lx.\n", offset); if (!fx10_copy_string(data, data_size, offset, &t->name)) { @@ -2828,7 +2828,7 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, TRACE("Technique name: %s.\n", debugstr_a(t->name)); t->pass_count = read_dword(ptr); - TRACE("Technique has %u passes\n", t->pass_count); + TRACE("Technique has %lu passes.\n", t->pass_count); t->annotations.count = read_dword(ptr); TRACE("Technique has %u annotations.\n", t->annotations.count); @@ -2836,7 +2836,7 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, t->effect, &t->annotations))) { - ERR("Failed to parse technique annotations, hr %#x.\n", hr); + ERR("Failed to parse technique annotations, hr %#lx.\n", hr); return hr; } @@ -2974,7 +2974,7 @@ static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, { if (!require_space(default_value_offset, 1, v->type->size_packed, data_size)) { - WARN("Invalid default value offset %#x, variable packed size %u.\n", default_value_offset, + WARN("Invalid default value offset %#x, variable packed size %lu.\n", default_value_offset, v->type->size_packed); return E_FAIL; } @@ -2989,7 +2989,7 @@ static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, v->effect, &v->annotations))) { - ERR("Failed to parse variable annotations, hr %#x.\n", hr); + ERR("Failed to parse variable annotations, hr %#lx.\n", hr); return hr; } } @@ -3052,7 +3052,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, return hr; offset = read_dword(ptr); - TRACE("Variable semantic at offset %#x.\n", offset); + TRACE("Variable semantic at offset %#lx.\n", offset); if (!fx10_copy_string(data, data_size, offset, &v->semantic)) { @@ -3062,7 +3062,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, TRACE("Variable semantic: %s.\n", debugstr_a(v->semantic)); v->explicit_bind_point = read_dword(ptr); - TRACE("Variable explicit bind point %#x.\n", v->explicit_bind_point); + TRACE("Variable explicit bind point %#lx.\n", v->explicit_bind_point); /* Shared variable description contains only type information. */ if (shared_type_desc) return S_OK; @@ -3114,12 +3114,12 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, var = d3d10_array_get_element(v, i); shader_offset = read_dword(ptr); - TRACE("Shader offset: %#x.\n", shader_offset); + TRACE("Shader offset: %#lx.\n", shader_offset); if (v->type->flags & D3D10_EOT_FLAG_GS_SO) { sodecl_offset = read_dword(ptr); - TRACE("Stream output declaration at offset %#x.\n", sodecl_offset); + TRACE("Stream output declaration at offset %#lx.\n", sodecl_offset); if (!fx10_copy_string(data, data_size, sodecl_offset, &var->u.shader.stream_output_declaration)) @@ -3152,7 +3152,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, if (storage_info->size > sizeof(v->u.state.desc)) { - ERR("Invalid storage size %#lx.\n", storage_info->size); + ERR("Invalid storage size %#Ix.\n", storage_info->size); return E_FAIL; } @@ -3221,7 +3221,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, v->effect, &v->annotations))) { - ERR("Failed to parse variable annotations, hr %#x.\n", hr); + ERR("Failed to parse variable annotations, hr %#lx.\n", hr); return hr; } @@ -3292,7 +3292,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char l->type->effect = l->effect; offset = read_dword(ptr); - TRACE("%s buffer name at offset %#x.\n", prefix, offset); + TRACE("%s buffer name at offset %#lx.\n", prefix, offset); if (!fx10_copy_string(data, data_size, offset, &l->name)) { @@ -3302,7 +3302,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char TRACE("%s buffer name: %s.\n", prefix, debugstr_a(l->name)); l->data_size = read_dword(ptr); - TRACE("%s buffer data size: %#x.\n", prefix, l->data_size); + TRACE("%s buffer data size: %#lx.\n", prefix, l->data_size); d3d10_cbuffer_type = read_dword(ptr); TRACE("%s buffer type: %#x.\n", prefix, d3d10_cbuffer_type); @@ -3333,10 +3333,10 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char } l->type->member_count = read_dword(ptr); - TRACE("%s buffer member count: %#x.\n", prefix, l->type->member_count); + TRACE("%s buffer member count: %#lx.\n", prefix, l->type->member_count); l->explicit_bind_point = read_dword(ptr); - TRACE("%s buffer explicit bind point: %#x.\n", prefix, l->explicit_bind_point); + TRACE("%s buffer explicit bind point: %#lx.\n", prefix, l->explicit_bind_point); if (l->effect->flags & D3D10_EFFECT_IS_POOL) l->flag |= D3D10_EFFECT_VARIABLE_POOLED; @@ -3349,7 +3349,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, l->effect, &l->annotations))) { - ERR("Failed to parse buffer annotations, hr %#x.\n", hr); + ERR("Failed to parse buffer annotations, hr %#lx.\n", hr); return hr; } } @@ -3404,7 +3404,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char TRACE("Variable semantic: %s.\n", debugstr_a(typem->semantic)); typem->buffer_offset = v->buffer_offset; - TRACE("Variable buffer offset: %u.\n", typem->buffer_offset); + TRACE("Variable buffer offset: %lu.\n", typem->buffer_offset); l->type->size_packed += v->type->size_packed; @@ -3453,11 +3453,11 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char TRACE("%s constant buffer:\n", prefix); TRACE("\tType name: %s.\n", debugstr_a(l->type->name)); - TRACE("\tElement count: %u.\n", l->type->element_count); - TRACE("\tMember count: %u.\n", l->type->member_count); - TRACE("\tUnpacked size: %#x.\n", l->type->size_unpacked); - TRACE("\tStride: %#x.\n", l->type->stride); - TRACE("\tPacked size %#x.\n", l->type->size_packed); + TRACE("\tElement count: %lu.\n", l->type->element_count); + TRACE("\tMember count: %lu.\n", l->type->member_count); + TRACE("\tUnpacked size: %#lx.\n", l->type->size_unpacked); + TRACE("\tStride: %#lx.\n", l->type->stride); + TRACE("\tPacked size %#lx.\n", l->type->size_packed); TRACE("\tBasetype: %s.\n", debug_d3d10_shader_variable_type(l->type->basetype)); TRACE("\tTypeclass: %s.\n", debug_d3d10_shader_variable_class(l->type->type_class)); @@ -3465,7 +3465,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char { if (FAILED(hr = create_buffer_object(l))) { - WARN("Failed to create a buffer object, hr %#x.\n", hr); + WARN("Failed to create a buffer object, hr %#lx.\n", hr); return hr; } } @@ -3574,7 +3574,7 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d if (e->index_offset >= data_size) { - WARN("Invalid index offset %#x (data size %#x).\n", e->index_offset, data_size); + WARN("Invalid index offset %#lx (data size %#lx).\n", e->index_offset, data_size); return E_FAIL; } ptr = data + e->index_offset; @@ -3711,43 +3711,43 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s if (!require_space(0, 19, sizeof(DWORD), data_size)) { - WARN("Invalid data size %#x.\n", data_size); + WARN("Invalid data size %#lx.\n", data_size); return E_INVALIDARG; } /* Compiled target version (e.g. fx_4_0=0xfeff1001, fx_4_1=0xfeff1011). */ e->version = read_dword(&ptr); - TRACE("Target: %#x\n", e->version); + TRACE("Target: %#lx\n", e->version); e->local_buffer_count = read_dword(&ptr); - TRACE("Local buffer count: %u.\n", e->local_buffer_count); + TRACE("Local buffer count: %lu.\n", e->local_buffer_count); e->variable_count = read_dword(&ptr); - TRACE("Variable count: %u\n", e->variable_count); + TRACE("Variable count: %lu\n", e->variable_count); e->local_variable_count = read_dword(&ptr); - TRACE("Object count: %u\n", e->local_variable_count); + TRACE("Object count: %lu\n", e->local_variable_count); e->shared_buffer_count = read_dword(&ptr); - TRACE("Pool buffer count: %u\n", e->shared_buffer_count); + TRACE("Pool buffer count: %lu\n", e->shared_buffer_count); unused = read_dword(&ptr); - TRACE("Pool variable count: %u\n", unused); + TRACE("Pool variable count: %lu\n", unused); e->shared_object_count = read_dword(&ptr); - TRACE("Pool objects count: %u\n", e->shared_object_count); + TRACE("Pool objects count: %lu\n", e->shared_object_count); e->technique_count = read_dword(&ptr); - TRACE("Technique count: %u\n", e->technique_count); + TRACE("Technique count: %lu\n", e->technique_count); e->index_offset = read_dword(&ptr); - TRACE("Index offset: %#x\n", e->index_offset); + TRACE("Index offset: %#lx\n", e->index_offset); unused = read_dword(&ptr); - TRACE("String count: %u\n", unused); + TRACE("String count: %lu\n", unused); e->texture_count = read_dword(&ptr); - TRACE("Texture count: %u\n", e->texture_count); + TRACE("Texture count: %lu\n", e->texture_count); e->ds_states.count = read_dword(&ptr); TRACE("Depthstencilstate count: %u\n", e->ds_states.count); @@ -3771,7 +3771,7 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s TRACE("Used shader count: %u\n", e->shaders.count); e->anonymous_shader_count = read_dword(&ptr); - TRACE("Anonymous shader count: %u\n", e->anonymous_shader_count); + TRACE("Anonymous shader count: %lu\n", e->anonymous_shader_count); if (!e->pool && (e->shared_object_count || e->shared_buffer_count)) { @@ -3788,7 +3788,7 @@ static HRESULT fx10_chunk_handler(const char *data, DWORD data_size, DWORD tag, TRACE("tag: %s.\n", debugstr_an((const char *)&tag, 4)); - TRACE("chunk size: %#x\n", data_size); + TRACE("chunk size: %#lx\n", data_size); switch(tag) { @@ -4015,7 +4015,7 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_AddRef(ID3D10Effect *iface) struct d3d10_effect *This = impl_from_ID3D10Effect(iface); ULONG refcount = InterlockedIncrement(&This->refcount); - TRACE("%p increasing refcount to %u\n", This, refcount); + TRACE("%p increasing refcount to %lu.\n", This, refcount); return refcount; } @@ -4025,7 +4025,7 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) struct d3d10_effect *effect = impl_from_ID3D10Effect(iface); ULONG refcount = InterlockedDecrement(&effect->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) { @@ -5815,13 +5815,13 @@ static void write_variable_array_to_buffer(struct d3d10_effect_variable *variabl if (offset >= variable->type->element_count) { - WARN("Offset %u larger than element count %u, ignoring.\n", offset, variable->type->element_count); + WARN("Offset %u larger than element count %lu, ignoring.\n", offset, variable->type->element_count); return; } if (count > variable->type->element_count - offset) { - WARN("Offset %u, count %u overruns the variable (element count %u), fixing up.\n", + WARN("Offset %u, count %u overruns the variable (element count %lu), fixing up.\n", offset, count, variable->type->element_count); count = variable->type->element_count - offset; } @@ -5865,13 +5865,13 @@ static void read_variable_array_from_buffer(struct d3d10_effect_variable *variab if (offset >= variable->type->element_count) { - WARN("Offset %u larger than element count %u, ignoring.\n", offset, variable->type->element_count); + WARN("Offset %u larger than element count %lu, ignoring.\n", offset, variable->type->element_count); return; } if (count > variable->type->element_count - offset) { - WARN("Offset %u, count %u overruns the variable (element count %u), fixing up.\n", + WARN("Offset %u, count %u overruns the variable (element count %lu), fixing up.\n", offset, count, variable->type->element_count); count = variable->type->element_count - offset; } @@ -6617,13 +6617,13 @@ static void write_matrix_variable_array_to_buffer(struct d3d10_effect_variable * if (offset >= variable->type->element_count) { - WARN("Offset %u larger than element count %u, ignoring.\n", offset, variable->type->element_count); + WARN("Offset %u larger than element count %lu, ignoring.\n", offset, variable->type->element_count); return; } if (count > variable->type->element_count - offset) { - WARN("Offset %u, count %u overruns the variable (element count %u), fixing up.\n", + WARN("Offset %u, count %u overruns the variable (element count %lu), fixing up.\n", offset, count, variable->type->element_count); count = variable->type->element_count - offset; } @@ -6693,13 +6693,13 @@ static void read_matrix_variable_array_from_buffer(struct d3d10_effect_variable if (offset >= variable->type->element_count) { - WARN("Offset %u larger than element count %u, ignoring.\n", offset, variable->type->element_count); + WARN("Offset %u larger than element count %lu, ignoring.\n", offset, variable->type->element_count); return; } if (count > variable->type->element_count - offset) { - WARN("Offset %u, count %u overruns the variable (element count %u), fixing up.\n", + WARN("Offset %u, count %u overruns the variable (element count %lu), fixing up.\n", offset, count, variable->type->element_count); count = variable->type->element_count - offset; } @@ -7441,13 +7441,13 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_resource_variable_SetResour if (offset >= v->type->element_count) { - WARN("Offset %u larger than element count %u, ignoring.\n", offset, v->type->element_count); + WARN("Offset %u larger than element count %lu, ignoring.\n", offset, v->type->element_count); return S_OK; } if (count > v->type->element_count - offset) { - WARN("Offset %u, count %u overruns the variable (element count %u), fixing up.\n", + WARN("Offset %u, count %u overruns the variable (element count %lu), fixing up.\n", offset, count, v->type->element_count); count = v->type->element_count - offset; } @@ -9600,7 +9600,7 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl struct d3d10_effect *object, *pool = NULL; HRESULT hr; - TRACE("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p.\n", + TRACE("data %p, data_size %Iu, flags %#x, device %p, effect_pool %p, effect %p.\n", data, data_size, flags, device, effect_pool, effect); if (!(flags & D3D10_EFFECT_COMPILE_CHILD_EFFECT) != !effect_pool) @@ -9614,7 +9614,7 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl if (FAILED(hr = d3d10_create_effect(data, data_size, device, pool, 0, &object))) { - WARN("Failed to create an effect, hr %#x.\n", hr); + WARN("Failed to create an effect, hr %#lx.\n", hr); return hr; } @@ -9663,13 +9663,13 @@ HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UIN struct d3d10_effect *object; HRESULT hr; - TRACE("data %p, data_size %lu, fx_flags %#x, device %p, effect_pool %p.\n", + TRACE("data %p, data_size %Iu, fx_flags %#x, device %p, effect_pool %p.\n", data, data_size, fx_flags, device, effect_pool); if (FAILED(hr = d3d10_create_effect(data, data_size, device, NULL, D3D10_EFFECT_IS_POOL, &object))) { - WARN("Failed to create an effect, hr %#x.\n", hr); + WARN("Failed to create an effect, hr %#lx.\n", hr); return hr; } diff --git a/dlls/d3d10/shader.c b/dlls/d3d10/shader.c index d198689af64..761b2b3211f 100644 --- a/dlls/d3d10/shader.c +++ b/dlls/d3d10/shader.c @@ -34,7 +34,7 @@ HRESULT WINAPI D3D10CompileShader(const char *data, SIZE_T data_size, const char HRESULT WINAPI D3D10DisassembleShader(const void *data, SIZE_T data_size, BOOL color_code, const char *comments, ID3D10Blob **disassembly) { - TRACE("data %p, data_size %#lx, color_code %#x, comments %p, disassembly %p.\n", + TRACE("data %p, data_size %#Ix, color_code %#x, comments %p, disassembly %p.\n", data, data_size, color_code, comments, disassembly); return D3DDisassemble(data, data_size, color_code ? D3D_DISASM_ENABLE_COLOR_CODE : 0, comments, disassembly); diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index fef78872a49..ac4ddedc898 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -294,7 +294,7 @@ static ULONG STDMETHODCALLTYPE d3d10_stateblock_AddRef(ID3D10StateBlock *iface) struct d3d10_stateblock *stateblock = impl_from_ID3D10StateBlock(iface); ULONG refcount = InterlockedIncrement(&stateblock->refcount); - TRACE("%p increasing refcount to %u.\n", stateblock, refcount); + TRACE("%p increasing refcount to %lu.\n", stateblock, refcount); return refcount; } @@ -304,7 +304,7 @@ static ULONG STDMETHODCALLTYPE d3d10_stateblock_Release(ID3D10StateBlock *iface) struct d3d10_stateblock *stateblock = impl_from_ID3D10StateBlock(iface); ULONG refcount = InterlockedDecrement(&stateblock->refcount); - TRACE("%p decreasing refcount to %u.\n", stateblock, refcount); + TRACE("%p decreasing refcount to %lu.\n", stateblock, refcount); if (!refcount) { diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 97abad4da30..69970136390 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -18,6 +18,9 @@ * */ +#ifndef WINE_NO_LONG_TYPES +#define WINE_NO_LONG_TYPES +#endif #include "initguid.h" #include "d3dcompiler_private.h" #include "d3d10.h" @@ -2322,7 +2325,7 @@ HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10Shad struct d3dcompiler_shader_reflection *object; HRESULT hr; - TRACE("data %p, data_size %lu, reflector %p.\n", data, data_size, reflector); + TRACE("data %p, data_size %Iu, reflector %p.\n", data, data_size, reflector); if (!(object = heap_alloc_zero(sizeof(*object)))) { @@ -2356,7 +2359,7 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void HRESULT hr; const DWORD *temp = data; - TRACE("data %p, data_size %lu, riid %s, blob %p\n", data, data_size, debugstr_guid(riid), reflector); + TRACE("data %p, data_size %Iu, riid %s, blob %p.\n", data, data_size, debugstr_guid(riid), reflector); if (!data || data_size < 32) { diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 2c5c903106e..84f776626ba 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -21,6 +21,9 @@ * */ +#ifndef WINE_NO_LONG_TYPES +#define WINE_NO_LONG_TYPES +#endif #include <stdio.h> #include "d3dcompiler_private.h" -- 2.30.2

1 0

[PATCH 4/6] d3d10: Store the type fields in parse_fx10_type() as uint32_t.
by Henri Verbeet Feb. 8, 2022

Feb. 8, 2022

In particular, d3d10_variable_type() takes an integer flags pointer. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 4759dea5ee9..68afc061d1e 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1402,7 +1402,7 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object, static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, struct d3d10_effect_type *t) { - DWORD typeinfo, type_flags, type_kind; + uint32_t typeinfo, type_flags, type_kind; const char *ptr; unsigned int i; -- 2.30.2

1 0

[PATCH 3/6] d3d10: Return the read value from read_dword().
by Henri Verbeet Feb. 8, 2022

Feb. 8, 2022

This makes it consistent with d3dcompiler after commit e6961f6e16b35729301967b04078158cd66eaab2. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10/effect.c | 202 ++++++++++++++++++++++---------------------- 1 file changed, 103 insertions(+), 99 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index e3c261d0270..4759dea5ee9 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -837,10 +837,14 @@ static BOOL d3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, S return TRUE; } -static void read_dword(const char **ptr, DWORD *d) +static inline DWORD read_dword(const char **ptr) { - memcpy(d, *ptr, sizeof(*d)); - *ptr += sizeof(*d); + DWORD d; + + memcpy(&d, *ptr, sizeof(d)); + *ptr += sizeof(d); + + return d; } static BOOL require_space(size_t offset, size_t count, size_t size, size_t data_size) @@ -856,7 +860,7 @@ static void skip_dword_unknown(const char *location, const char **ptr, unsigned FIXME("Skipping %u unknown DWORDs (%s):\n", count, location); for (i = 0; i < count; ++i) { - read_dword(ptr, &d); + d = read_dword(ptr); FIXME("\t0x%08x\n", d); } } @@ -878,7 +882,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, return E_FAIL; } - read_dword(&ptr, &tag); + tag = read_dword(&ptr); TRACE("tag: %s.\n", debugstr_an((const char *)&tag, 4)); if (tag != TAG_DXBC) @@ -889,7 +893,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, skip_dword_unknown("DXBC checksum", &ptr, 4); - read_dword(&ptr, &version); + version = read_dword(&ptr); TRACE("version: %#x.\n", version); if (version != 0x00000001) { @@ -897,7 +901,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, return E_FAIL; } - read_dword(&ptr, &total_size); + total_size = read_dword(&ptr); TRACE("total size: %#x\n", total_size); if (data_size != total_size) @@ -906,7 +910,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, return E_FAIL; } - read_dword(&ptr, &chunk_count); + chunk_count = read_dword(&ptr); TRACE("chunk count: %#x\n", chunk_count); for (i = 0; i < chunk_count; ++i) @@ -915,7 +919,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, const char *chunk_ptr; DWORD chunk_offset; - read_dword(&ptr, &chunk_offset); + chunk_offset = read_dword(&ptr); TRACE("chunk %u at offset %#x\n", i, chunk_offset); if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) @@ -926,8 +930,8 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, chunk_ptr = data + chunk_offset; - read_dword(&chunk_ptr, &chunk_tag); - read_dword(&chunk_ptr, &chunk_size); + chunk_tag = read_dword(&chunk_ptr); + chunk_size = read_dword(&chunk_ptr); if (!require_space(chunk_ptr - data, 1, chunk_size, data_size)) { @@ -1265,7 +1269,7 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse } ptr = data + offset; - read_dword(&ptr, &dxbc_size); + dxbc_size = read_dword(&ptr); TRACE("dxbc size: %#x\n", dxbc_size); if (!require_space(ptr - data, 1, dxbc_size, data_size)) @@ -1409,7 +1413,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, } ptr = data + offset; - read_dword(&ptr, &offset); + offset = read_dword(&ptr); TRACE("Type name at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &t->name)) @@ -1419,19 +1423,19 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, } TRACE("Type name: %s.\n", debugstr_a(t->name)); - read_dword(&ptr, &type_kind); + type_kind = read_dword(&ptr); TRACE("Kind: %u.\n", type_kind); - read_dword(&ptr, &t->element_count); + t->element_count = read_dword(&ptr); TRACE("Element count: %u.\n", t->element_count); - read_dword(&ptr, &t->size_unpacked); + t->size_unpacked = read_dword(&ptr); TRACE("Unpacked size: %#x.\n", t->size_unpacked); - read_dword(&ptr, &t->stride); + t->stride = read_dword(&ptr); TRACE("Stride: %#x.\n", t->stride); - read_dword(&ptr, &t->size_packed); + t->size_packed = read_dword(&ptr); TRACE("Packed size %#x.\n", t->size_packed); switch (type_kind) @@ -1445,7 +1449,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, return E_FAIL; } - read_dword(&ptr, &typeinfo); + typeinfo = read_dword(&ptr); t->member_count = 0; t->column_count = (typeinfo & D3D10_FX10_TYPE_COLUMN_MASK) >> D3D10_FX10_TYPE_COLUMN_SHIFT; t->row_count = (typeinfo & D3D10_FX10_TYPE_ROW_MASK) >> D3D10_FX10_TYPE_ROW_SHIFT; @@ -1470,7 +1474,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, return E_FAIL; } - read_dword(&ptr, &typeinfo); + typeinfo = read_dword(&ptr); t->member_count = 0; t->column_count = 0; t->row_count = 0; @@ -1493,7 +1497,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, return E_FAIL; } - read_dword(&ptr, &t->member_count); + t->member_count = read_dword(&ptr); TRACE("Member count: %u.\n", t->member_count); t->column_count = 0; @@ -1518,7 +1522,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, { struct d3d10_effect_type_member *typem = &t->members[i]; - read_dword(&ptr, &offset); + offset = read_dword(&ptr); TRACE("Member name at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &typem->name)) @@ -1528,7 +1532,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, } TRACE("Member name: %s.\n", debugstr_a(typem->name)); - read_dword(&ptr, &offset); + offset = read_dword(&ptr); TRACE("Member semantic at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &typem->semantic)) @@ -1538,10 +1542,10 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, } TRACE("Member semantic: %s.\n", debugstr_a(typem->semantic)); - read_dword(&ptr, &typem->buffer_offset); + typem->buffer_offset = read_dword(&ptr); TRACE("Member offset in struct: %#x.\n", typem->buffer_offset); - read_dword(&ptr, &offset); + offset = read_dword(&ptr); TRACE("Member type info at offset %#x.\n", offset); if (!(typem->type = get_fx10_type(t->effect, data, data_size, offset))) @@ -1841,7 +1845,7 @@ static HRESULT parse_fx10_variable_head(const char *data, size_t data_size, { DWORD offset; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Variable name at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &v->name)) @@ -1851,7 +1855,7 @@ static HRESULT parse_fx10_variable_head(const char *data, size_t data_size, } TRACE("Variable name: %s.\n", debugstr_a(v->name)); - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Variable type info at offset %#x.\n", offset); if (!(v->type = get_fx10_type(v->effect, data, data_size, offset))) @@ -1878,7 +1882,7 @@ static HRESULT parse_fx10_annotation(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_variable_head(data, data_size, ptr, a))) return hr; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Annotation value is at offset %#x.\n", offset); switch (a->type->basetype) @@ -2009,7 +2013,7 @@ static BOOL read_value_list(const char *data, size_t data_size, uint32_t offset, } ptr = data + offset; - read_dword(&ptr, &count); + count = read_dword(&ptr); if (count != out_size) return FALSE; @@ -2024,8 +2028,8 @@ static BOOL read_value_list(const char *data, size_t data_size, uint32_t offset, { unsigned int out_idx = out_base * out_size + i; - read_dword(&ptr, &t); - read_dword(&ptr, &value); + t = read_dword(&ptr); + value = read_dword(&ptr); in_type = d3d10_variable_type(t, FALSE, &type_flags); TRACE("\t%s: %#x.\n", debug_d3d10_shader_variable_type(in_type), value); @@ -2129,8 +2133,8 @@ static HRESULT parse_fx10_preshader_instr(struct d3d10_preshader_parse_context * return E_FAIL; } - read_dword(ptr, (uint32_t *)&ins); - read_dword(ptr, &input_count); + *(uint32_t *)&ins = read_dword(ptr); + input_count = read_dword(ptr); *offset += 2 * sizeof(uint32_t); if (!(op_info = d3d10_effect_get_op_info(ins.opcode))) @@ -2155,15 +2159,15 @@ static HRESULT parse_fx10_preshader_instr(struct d3d10_preshader_parse_context * { uint32_t flags, regt, param_offset; - read_dword(ptr, &flags); + flags = read_dword(ptr); if (flags) { FIXME("Arguments flags are not supported %#x.\n", flags); return E_UNEXPECTED; } - read_dword(ptr, &regt); - read_dword(ptr, &param_offset); + regt = read_dword(ptr); + param_offset = read_dword(ptr); switch (regt) { @@ -2203,7 +2207,7 @@ static HRESULT parse_fx10_fxlc(void *ctx, const char *data, unsigned int data_si memcpy(ID3D10Blob_GetBufferPointer(p->code), data, data_size); ptr = data; - read_dword(&ptr, &ins_count); + ins_count = read_dword(&ptr); TRACE("%u instructions.\n", ins_count); for (i = 0; i < ins_count; ++i) @@ -2238,7 +2242,7 @@ static HRESULT parse_fx10_cli4(void *ctx, const char *data, unsigned int data_si return E_FAIL; } - read_dword(&ptr, &count); + count = read_dword(&ptr); TRACE("%u literal constants.\n", count); @@ -2292,13 +2296,13 @@ static HRESULT parse_fx10_ctab(void *ctx, const char *data, unsigned int data_si return E_FAIL; } - read_dword(&ptr, &header.size); - read_dword(&ptr, &header.creator); - read_dword(&ptr, &header.version); - read_dword(&ptr, &header.constants); - read_dword(&ptr, &header.constantinfo); - read_dword(&ptr, &header.flags); - read_dword(&ptr, &header.target); + header.size = read_dword(&ptr); + header.creator = read_dword(&ptr); + header.version = read_dword(&ptr); + header.constants = read_dword(&ptr); + header.constantinfo = read_dword(&ptr); + header.flags = read_dword(&ptr); + header.target = read_dword(&ptr); if (!require_space(header.constantinfo, header.constants, sizeof(*info), data_size)) { @@ -2421,10 +2425,10 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size HRESULT hr; void *dst; - read_dword(ptr, &id); - read_dword(ptr, &idx); - read_dword(ptr, &operation); - read_dword(ptr, &value_offset); + id = read_dword(ptr); + idx = read_dword(ptr); + operation = read_dword(ptr); + value_offset = read_dword(ptr); if (id >= ARRAY_SIZE(property_infos)) { @@ -2531,8 +2535,8 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size return E_FAIL; } data_ptr = data + value_offset; - read_dword(&data_ptr, &value_offset); - read_dword(&data_ptr, &variable_idx); + value_offset = read_dword(&data_ptr); + variable_idx = read_dword(&data_ptr); if (!fx10_get_string(data, data_size, value_offset, &name, &name_len)) { @@ -2609,8 +2613,8 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size } data_ptr = data + value_offset; - read_dword(&data_ptr, &value_offset); - read_dword(&data_ptr, &code_offset); + value_offset = read_dword(&data_ptr); + code_offset = read_dword(&data_ptr); if (!fx10_get_string(data, data_size, value_offset, &name, &name_len)) { @@ -2645,7 +2649,7 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size } data_ptr = data + code_offset; - read_dword(&data_ptr, &blob_size); + blob_size = read_dword(&data_ptr); if (!require_space(code_offset, 1, sizeof(uint32_t) + blob_size, data_size)) { @@ -2674,7 +2678,7 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size } data_ptr = data + value_offset; - read_dword(&data_ptr, &blob_size); + blob_size = read_dword(&data_ptr); if (!require_space(value_offset, 1, sizeof(uint32_t) + blob_size, data_size)) { @@ -2708,8 +2712,8 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size return E_FAIL; } data_ptr = data + value_offset; - read_dword(&data_ptr, &value_offset); - read_dword(&data_ptr, &sodecl_offset); + value_offset = read_dword(&data_ptr); + sodecl_offset = read_dword(&data_ptr); TRACE("Effect object starts at offset %#x.\n", value_offset); @@ -2766,7 +2770,7 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, unsigned int i; HRESULT hr; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Pass name at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &p->name)) @@ -2776,10 +2780,10 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, } TRACE("Pass name: %s.\n", debugstr_a(p->name)); - read_dword(ptr, &object_count); + object_count = read_dword(ptr); TRACE("Pass has %u effect objects.\n", object_count); - read_dword(ptr, &p->annotations.count); + p->annotations.count = read_dword(ptr); TRACE("Pass has %u annotations.\n", p->annotations.count); if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, p->technique->effect, @@ -2813,7 +2817,7 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, DWORD offset; HRESULT hr; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Technique name at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &t->name)) @@ -2823,10 +2827,10 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, } TRACE("Technique name: %s.\n", debugstr_a(t->name)); - read_dword(ptr, &t->pass_count); + t->pass_count = read_dword(ptr); TRACE("Technique has %u passes\n", t->pass_count); - read_dword(ptr, &t->annotations.count); + t->annotations.count = read_dword(ptr); TRACE("Technique has %u annotations.\n", t->annotations.count); if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, t->effect, @@ -2939,7 +2943,7 @@ static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_variable_head(data, data_size, ptr, v))) return hr; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Variable semantic at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &v->semantic)) @@ -2949,13 +2953,13 @@ static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, } TRACE("Variable semantic: %s.\n", debugstr_a(v->semantic)); - read_dword(ptr, &buffer_offset); + buffer_offset = read_dword(ptr); TRACE("Variable offset in buffer: %#x.\n", buffer_offset); - read_dword(ptr, &default_value_offset); + default_value_offset = read_dword(ptr); TRACE("Variable default value offset: %#x.\n", default_value_offset); - read_dword(ptr, &flags); + flags = read_dword(ptr); TRACE("Variable flags: %#x.\n", flags); v->flag |= flags; @@ -2979,7 +2983,7 @@ static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, parse_fx10_default_value(&data_ptr, v); } - read_dword(ptr, &v->annotations.count); + v->annotations.count = read_dword(ptr); TRACE("Variable has %u annotations.\n", v->annotations.count); if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, v->effect, @@ -3047,7 +3051,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_variable_head(data, data_size, ptr, v))) return hr; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Variable semantic at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &v->semantic)) @@ -3057,7 +3061,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, } TRACE("Variable semantic: %s.\n", debugstr_a(v->semantic)); - read_dword(ptr, &v->explicit_bind_point); + v->explicit_bind_point = read_dword(ptr); TRACE("Variable explicit bind point %#x.\n", v->explicit_bind_point); /* Shared variable description contains only type information. */ @@ -3109,12 +3113,12 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, var = d3d10_array_get_element(v, i); - read_dword(ptr, &shader_offset); + shader_offset = read_dword(ptr); TRACE("Shader offset: %#x.\n", shader_offset); if (v->type->flags & D3D10_EOT_FLAG_GS_SO) { - read_dword(ptr, &sodecl_offset); + sodecl_offset = read_dword(ptr); TRACE("Stream output declaration at offset %#x.\n", sodecl_offset); if (!fx10_copy_string(data, data_size, sodecl_offset, @@ -3184,7 +3188,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, var->u.state.index = vars->current; vars->v[vars->current++] = var; - read_dword(ptr, &prop_count); + prop_count = read_dword(ptr); TRACE("State object property count: %#x.\n", prop_count); memcpy(&var->u.state.desc, storage_info->default_state, storage_info->size); @@ -3211,7 +3215,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, return E_FAIL; } - read_dword(ptr, &v->annotations.count); + v->annotations.count = read_dword(ptr); TRACE("Variable has %u annotations.\n", v->annotations.count); if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, v->effect, @@ -3287,7 +3291,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char l->type->type_class = D3D10_SVC_OBJECT; l->type->effect = l->effect; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("%s buffer name at offset %#x.\n", prefix, offset); if (!fx10_copy_string(data, data_size, offset, &l->name)) @@ -3297,10 +3301,10 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char } TRACE("%s buffer name: %s.\n", prefix, debugstr_a(l->name)); - read_dword(ptr, &l->data_size); + l->data_size = read_dword(ptr); TRACE("%s buffer data size: %#x.\n", prefix, l->data_size); - read_dword(ptr, &d3d10_cbuffer_type); + d3d10_cbuffer_type = read_dword(ptr); TRACE("%s buffer type: %#x.\n", prefix, d3d10_cbuffer_type); switch(d3d10_cbuffer_type) @@ -3328,10 +3332,10 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char return E_FAIL; } - read_dword(ptr, &l->type->member_count); + l->type->member_count = read_dword(ptr); TRACE("%s buffer member count: %#x.\n", prefix, l->type->member_count); - read_dword(ptr, &l->explicit_bind_point); + l->explicit_bind_point = read_dword(ptr); TRACE("%s buffer explicit bind point: %#x.\n", prefix, l->explicit_bind_point); if (l->effect->flags & D3D10_EFFECT_IS_POOL) @@ -3339,7 +3343,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char if (local) { - read_dword(ptr, &l->annotations.count); + l->annotations.count = read_dword(ptr); TRACE("Local buffer has %u annotations.\n", l->annotations.count); if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, l->effect, @@ -3712,61 +3716,61 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s } /* Compiled target version (e.g. fx_4_0=0xfeff1001, fx_4_1=0xfeff1011). */ - read_dword(&ptr, &e->version); + e->version = read_dword(&ptr); TRACE("Target: %#x\n", e->version); - read_dword(&ptr, &e->local_buffer_count); + e->local_buffer_count = read_dword(&ptr); TRACE("Local buffer count: %u.\n", e->local_buffer_count); - read_dword(&ptr, &e->variable_count); + e->variable_count = read_dword(&ptr); TRACE("Variable count: %u\n", e->variable_count); - read_dword(&ptr, &e->local_variable_count); + e->local_variable_count = read_dword(&ptr); TRACE("Object count: %u\n", e->local_variable_count); - read_dword(&ptr, &e->shared_buffer_count); + e->shared_buffer_count = read_dword(&ptr); TRACE("Pool buffer count: %u\n", e->shared_buffer_count); - read_dword(&ptr, &unused); + unused = read_dword(&ptr); TRACE("Pool variable count: %u\n", unused); - read_dword(&ptr, &e->shared_object_count); + e->shared_object_count = read_dword(&ptr); TRACE("Pool objects count: %u\n", e->shared_object_count); - read_dword(&ptr, &e->technique_count); + e->technique_count = read_dword(&ptr); TRACE("Technique count: %u\n", e->technique_count); - read_dword(&ptr, &e->index_offset); + e->index_offset = read_dword(&ptr); TRACE("Index offset: %#x\n", e->index_offset); - read_dword(&ptr, &unused); + unused = read_dword(&ptr); TRACE("String count: %u\n", unused); - read_dword(&ptr, &e->texture_count); + e->texture_count = read_dword(&ptr); TRACE("Texture count: %u\n", e->texture_count); - read_dword(&ptr, &e->ds_states.count); + e->ds_states.count = read_dword(&ptr); TRACE("Depthstencilstate count: %u\n", e->ds_states.count); - read_dword(&ptr, &e->blend_states.count); + e->blend_states.count = read_dword(&ptr); TRACE("Blendstate count: %u\n", e->blend_states.count); - read_dword(&ptr, &e->rs_states.count); + e->rs_states.count = read_dword(&ptr); TRACE("Rasterizerstate count: %u\n", e->rs_states.count); - read_dword(&ptr, &e->samplers.count); + e->samplers.count = read_dword(&ptr); TRACE("Samplerstate count: %u\n", e->samplers.count); - read_dword(&ptr, &e->rtvs.count); + e->rtvs.count = read_dword(&ptr); TRACE("Rendertargetview count: %u\n", e->rtvs.count); - read_dword(&ptr, &e->dsvs.count); + e->dsvs.count = read_dword(&ptr); TRACE("Depthstencilview count: %u\n", e->dsvs.count); - read_dword(&ptr, &e->shaders.count); + e->shaders.count = read_dword(&ptr); TRACE("Used shader count: %u\n", e->shaders.count); - read_dword(&ptr, &e->anonymous_shader_count); + e->anonymous_shader_count = read_dword(&ptr); TRACE("Anonymous shader count: %u\n", e->anonymous_shader_count); if (!e->pool && (e->shared_object_count || e->shared_buffer_count)) -- 2.30.2

1 0

[PATCH 2/6] d3dcompiler/tests: Build without -DWINE_NO_LONG_TYPES.
by Henri Verbeet Feb. 8, 2022

Feb. 8, 2022

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3dcompiler_43/tests/Makefile.in | 2 +- dlls/d3dcompiler_43/tests/asm.c | 58 ++--- dlls/d3dcompiler_43/tests/blob.c | 290 ++++++++++++------------- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 68 +++--- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 126 +++++------ dlls/d3dcompiler_43/tests/reflection.c | 205 +++++++++-------- dlls/d3dcompiler_46/tests/Makefile.in | 2 +- dlls/d3dcompiler_47/tests/Makefile.in | 2 +- 8 files changed, 378 insertions(+), 375 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/Makefile.in b/dlls/d3dcompiler_43/tests/Makefile.in index 1d59b23cbdb..6584ae92bea 100644 --- a/dlls/d3dcompiler_43/tests/Makefile.in +++ b/dlls/d3dcompiler_43/tests/Makefile.in @@ -1,6 +1,6 @@ TESTDLL = d3dcompiler_43.dll IMPORTS = d3d9 user32 d3dcompiler_43 -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=43 +EXTRADEFS = -DD3D_COMPILER_VERSION=43 C_SRCS = \ asm.c \ diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 27f2c5b063d..61a6f3e2bc3 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -39,7 +39,7 @@ struct shader_test { static void dump_shader(DWORD *shader) { unsigned int i = 0, j = 0; do { - trace("0x%08x ", shader[i]); + trace("0x%08lx ", shader[i]); j++; i++; if(j == 6) trace("\n"); @@ -59,7 +59,7 @@ static void exec_tests(const char *name, struct shader_test tests[], unsigned in messages = NULL; hr = D3DAssemble(tests[i].text, strlen(tests[i].text), NULL, NULL, NULL, D3DCOMPILE_SKIP_VALIDATION, &shader, &messages); - ok(hr == S_OK, "Test %s, shader %d: D3DAssemble failed with error 0x%x - %d\n", name, i, hr, hr & 0x0000FFFF); + ok(hr == S_OK, "Test %s, shader %u: D3DAssemble failed with error %#lx - %ld.\n", name, i, hr, hr & 0xffff); if(messages) { trace("D3DAssemble messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); ID3D10Blob_Release(messages); @@ -1413,10 +1413,9 @@ static void failure_test(void) { shader = NULL; messages = NULL; hr = D3DAssemble(tests[i], strlen(tests[i]), NULL, NULL, NULL, D3DCOMPILE_SKIP_VALIDATION, &shader, &messages); - ok(hr == D3DXERR_INVALIDDATA, "Failure test, shader %d: " - "expected D3DAssemble failure with D3DXERR_INVALIDDATA, " - "got 0x%x - %d\n", i, hr, hr & 0x0000FFFF); - if(messages) { + ok(hr == D3DXERR_INVALIDDATA, "Test %u: Got unexpected hr %#lx.\n", i, hr); + if (messages) + { trace("D3DAssemble messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); ID3D10Blob_Release(messages); } @@ -1539,8 +1538,9 @@ static void assembleshader_test(void) { shader = NULL; messages = NULL; hr = D3DAssemble(test1, strlen(test1), NULL, defines, NULL, D3DCOMPILE_SKIP_VALIDATION, &shader, &messages); - ok(hr == S_OK, "defines test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if(messages) { + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (messages) + { trace("D3DAssemble messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); ID3D10Blob_Release(messages); } @@ -1549,14 +1549,16 @@ static void assembleshader_test(void) { /* NULL messages test */ shader = NULL; hr = D3DAssemble(test1, strlen(test1), NULL, defines, NULL, D3DCOMPILE_SKIP_VALIDATION, &shader, NULL); - ok(hr == S_OK, "NULL messages test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if(shader) ID3D10Blob_Release(shader); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (shader) + ID3D10Blob_Release(shader); /* NULL shader test */ messages = NULL; hr = D3DAssemble(test1, strlen(test1), NULL, defines, NULL, D3DCOMPILE_SKIP_VALIDATION, NULL, &messages); - ok(hr == S_OK, "NULL shader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if(messages) { + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (messages) + { trace("D3DAssemble messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); ID3D10Blob_Release(messages); } @@ -1567,8 +1569,9 @@ static void assembleshader_test(void) { include.ID3DInclude_iface.lpVtbl = &D3DInclude_Vtbl; hr = D3DAssemble(testshader, strlen(testshader), NULL, NULL, &include.ID3DInclude_iface, D3DCOMPILE_SKIP_VALIDATION, &shader, &messages); - ok(hr == S_OK, "D3DInclude test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if(messages) { + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (messages) + { trace("D3DAssemble messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); ID3D10Blob_Release(messages); } @@ -1578,8 +1581,9 @@ static void assembleshader_test(void) { shader = NULL; messages = NULL; hr = D3DAssemble(NULL, 0, NULL, NULL, NULL, D3DCOMPILE_SKIP_VALIDATION, &shader, &messages); - ok(hr == D3DXERR_INVALIDDATA, "NULL shader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if(messages) { + ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#lx.\n", hr); + if (messages) + { trace("D3DAssemble messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); ID3D10Blob_Release(messages); } @@ -1638,7 +1642,7 @@ static void d3dpreprocess_test(void) shader = NULL; messages = NULL; hr = D3DPreprocess(test1, strlen(test1), NULL, defines, NULL, &shader, &messages); - ok(hr == S_OK, "pDefines test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); if (messages) { trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); @@ -1649,13 +1653,14 @@ static void d3dpreprocess_test(void) /* NULL messages test */ shader = NULL; hr = D3DPreprocess(test1, strlen(test1), NULL, defines, NULL, &shader, NULL); - ok(hr == S_OK, "NULL messages test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if (shader) ID3D10Blob_Release(shader); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (shader) + ID3D10Blob_Release(shader); /* NULL shader test */ messages = NULL; hr = D3DPreprocess(test1, strlen(test1), NULL, defines, NULL, NULL, &messages); - ok(hr == E_INVALIDARG, "NULL shader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); if (messages) { trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); @@ -1666,7 +1671,7 @@ static void d3dpreprocess_test(void) shader = NULL; messages = NULL; hr = D3DPreprocess(quotation_marks_test, strlen(quotation_marks_test), NULL, NULL, NULL, &shader, &messages); - todo_wine ok(hr == S_OK, "quotation marks test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); if (messages) { trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); @@ -1682,7 +1687,7 @@ static void d3dpreprocess_test(void) messages = NULL; hr = D3DPreprocess(include_test_shaders[i], strlen(include_test_shaders[i]), NULL, NULL, &include.ID3DInclude_iface, &shader, &messages); - ok(hr == S_OK, "pInclude test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); if (messages) { trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); @@ -1695,7 +1700,7 @@ static void d3dpreprocess_test(void) shader = NULL; messages = NULL; hr = D3DPreprocess(NULL, 0, NULL, NULL, NULL, &shader, &messages); - ok(hr == E_INVALIDARG, "NULL shader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); if (messages) { trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); @@ -1727,14 +1732,13 @@ static void test_disassemble_shader(void) hr = D3DDisassemble(vs_2_0, 0, 0, NULL, &blob); todo_wine #if D3D_COMPILER_VERSION >= 46 - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); #else - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); #endif hr = D3DDisassemble(vs_2_0, sizeof(vs_2_0), 0, NULL, &blob); - todo_wine - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) ID3D10Blob_Release(blob); } diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index 400d5940bf7..90e4ef3d7da 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -57,16 +57,16 @@ static void test_create_blob(void) ULONG refcount; hr = D3DCreateBlob(1, NULL); - ok(hr == D3DERR_INVALIDCALL, "D3DCreateBlob failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DCreateBlob(0, NULL); - ok(hr == D3DERR_INVALIDCALL, "D3DCreateBlob failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DCreateBlob(0, &blob); - ok(hr == S_OK, "D3DCreateBlob failed with %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } static const D3D_BLOB_PART parts[] = @@ -128,55 +128,55 @@ static void test_get_blob_part(void) #endif hr = D3DCreateBlob(1, &blob2); - ok(hr == S_OK, "D3DCreateBlob failed with %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); blob = blob2; /* invalid cases */ hr = D3DGetBlobPart(NULL, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, &blob); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); hr = D3DGetBlobPart(NULL, 0, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, &blob); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); hr = D3DGetBlobPart(NULL, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, NULL); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DGetBlobPart(NULL, 0, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, NULL); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DGetBlobPart(test_blob_part, 0, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, &blob); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, NULL); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DGetBlobPart(test_blob_part, 0, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, NULL); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 1, &blob); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], 0xffffffff, 0, &blob); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); refcount = ID3D10Blob_Release(blob2); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_INPUT_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 124, "GetBufferSize failed, got %lu, expected %u\n", size, 124); + ok(size == 124, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_ISGN == *(dword+9), "ISGN got %#x, expected %#x.\n", *(dword+9), TAG_ISGN); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_ISGN == *(dword + 9), "ISGN got %#lx, expected %#lx.\n", *(dword + 9), TAG_ISGN); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -184,30 +184,30 @@ static void test_get_blob_part(void) if (parts[i] == D3D_BLOB_INPUT_SIGNATURE_BLOB) { - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob2); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } else { - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); } } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_OUTPUT_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_OUTPUT_SIGNATURE_BLOB, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 88, "GetBufferSize failed, got %lu, expected %u\n", size, 88); + ok(size == 88, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_OSGN == *(dword+9), "OSGN got %#x, expected %#x.\n", *(dword+9), TAG_OSGN); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_OSGN == *(dword + 9), "OSGN got %#lx, expected %#lx.\n", *(dword + 9), TAG_OSGN); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -215,31 +215,31 @@ static void test_get_blob_part(void) if (parts[i] == D3D_BLOB_OUTPUT_SIGNATURE_BLOB) { - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob2); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } else { - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); } } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 180, "GetBufferSize failed, got %lu, expected %u\n", size, 180); + ok(size == 180, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_ISGN == *(dword+10), "ISGN got %#x, expected %#x.\n", *(dword+10), TAG_ISGN); - ok(TAG_OSGN == *(dword+32), "OSGN got %#x, expected %#x.\n", *(dword+32), TAG_OSGN); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_ISGN == *(dword + 10), "ISGN got %#lx, expected %#lx.\n", *(dword + 10), TAG_ISGN); + ok(TAG_OSGN == *(dword + 32), "OSGN got %#lx, expected %#lx.\n", *(dword + 32), TAG_OSGN); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -249,41 +249,41 @@ static void test_get_blob_part(void) || parts[i] == D3D_BLOB_INPUT_SIGNATURE_BLOB || parts[i] == D3D_BLOB_OUTPUT_SIGNATURE_BLOB) { - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob2); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } else { - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); } } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB, 0, &blob); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* D3D_BLOB_ALL_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_ALL_SIGNATURE_BLOB, 0, &blob); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* D3D_BLOB_DEBUG_INFO */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_DEBUG_INFO, 0, &blob); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* D3D_BLOB_LEGACY_SHADER */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_LEGACY_SHADER, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 92, "GetBufferSize failed, got %lu, expected %u\n", size, 92); + ok(size == 92, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(test_blob_part[0] != *dword, "DXBC failed got %#x.\n", *dword); + ok(test_blob_part[0] != *dword, "DXBC failed got %#lx.\n", *dword); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -292,21 +292,21 @@ static void test_get_blob_part(void) #if D3D_COMPILER_VERSION >= 46 todo_wine #endif - ok(hr == expected, "D3DGetBlobPart failed, got %x, expected %x\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_XNA_PREPASS_SHADER */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_XNA_PREPASS_SHADER, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 68, "GetBufferSize failed, got %lu, expected %u\n", size, 68); + ok(size == 68, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(test_blob_part[0] != *dword, "DXBC failed got %#x.\n", *dword); + ok(test_blob_part[0] != *dword, "DXBC failed got %#lx.\n", *dword); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -315,21 +315,21 @@ static void test_get_blob_part(void) #if D3D_COMPILER_VERSION >= 46 todo_wine #endif - ok(hr == expected, "D3DGetBlobPart failed, got %x, expected %x\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_XNA_SHADER */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_XNA_SHADER, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 68, "GetBufferSize failed, got %lu, expected %u\n", size, 68); + ok(size == 68, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(test_blob_part[0] != *dword, "DXBC failed got %#x.\n", *dword); + ok(test_blob_part[0] != *dword, "DXBC failed got %#lx.\n", *dword); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -338,82 +338,82 @@ static void test_get_blob_part(void) #if D3D_COMPILER_VERSION >= 46 todo_wine #endif - ok(hr == expected, "D3DGetBlobPart failed, got %x, expected %x\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* check corner cases for D3DStripShader */ hr = D3DStripShader(test_blob_part, test_blob_part[6], 0xffffffff, &blob); - ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); hr = D3DStripShader(test_blob_part, test_blob_part[6], 0, &blob); - ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); hr = D3DStripShader(NULL, test_blob_part[6], 0, &blob); - ok(hr == D3DERR_INVALIDCALL, "D3DStripShader failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DStripShader(test_blob_part, 2, 0, &blob); - ok(hr == D3DERR_INVALIDCALL, "D3DStripShader failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DStripShader(test_blob_part, test_blob_part[6], 0, NULL); - ok(hr == E_FAIL, "D3DStripShader failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = D3DStripShader(NULL, test_blob_part[6], 0, NULL); - ok(hr == E_FAIL, "D3DStripShader failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = D3DStripShader(test_blob_part, 0, 0, NULL); - ok(hr == E_FAIL, "D3DStripShader failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* D3DCOMPILER_STRIP_DEBUG_INFO */ hr = D3DStripShader(test_blob_part, test_blob_part[6], D3DCOMPILER_STRIP_DEBUG_INFO, &blob); - ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 736, "GetBufferSize failed, got %lu, expected %u\n", size, 736); + ok(size == 736, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_XNAS == *(dword+16), "XNAS got %#x, expected %#x.\n", *(dword+16), TAG_XNAS); - ok(TAG_XNAP == *(dword+35), "XNAP got %#x, expected %#x.\n", *(dword+35), TAG_XNAP); - ok(TAG_Aon9 == *(dword+54), "Aon9 got %#x, expected %#x.\n", *(dword+54), TAG_Aon9); - ok(TAG_SHDR == *(dword+79), "SHDR got %#x, expected %#x.\n", *(dword+79), TAG_SHDR); - ok(TAG_STAT == *(dword+96), "STAT got %#x, expected %#x.\n", *(dword+96), TAG_STAT); - ok(TAG_RDEF == *(dword+127), "RDEF got %#x, expected %#x.\n", *(dword+127), TAG_RDEF); - ok(TAG_ISGN == *(dword+149), "ISGN got %#x, expected %#x.\n", *(dword+149), TAG_ISGN); - ok(TAG_OSGN == *(dword+171), "OSGN got %#x, expected %#x.\n", *(dword+171), TAG_OSGN); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_XNAS == *(dword + 16), "XNAS got %#lx, expected %#lx.\n", *(dword + 16), TAG_XNAS); + ok(TAG_XNAP == *(dword + 35), "XNAP got %#lx, expected %#lx.\n", *(dword + 35), TAG_XNAP); + ok(TAG_Aon9 == *(dword + 54), "Aon9 got %#lx, expected %#lx.\n", *(dword + 54), TAG_Aon9); + ok(TAG_SHDR == *(dword + 79), "SHDR got %#lx, expected %#lx.\n", *(dword + 79), TAG_SHDR); + ok(TAG_STAT == *(dword + 96), "STAT got %#lx, expected %#lx.\n", *(dword + 96), TAG_STAT); + ok(TAG_RDEF == *(dword + 127), "RDEF got %#lx, expected %#lx.\n", *(dword + 127), TAG_RDEF); + ok(TAG_ISGN == *(dword + 149), "ISGN got %#lx, expected %#lx.\n", *(dword + 149), TAG_ISGN); + ok(TAG_OSGN == *(dword + 171), "OSGN got %#lx, expected %#lx.\n", *(dword + 171), TAG_OSGN); hr = D3DGetBlobPart(dword, size, D3D_BLOB_DEBUG_INFO, 0, &blob2); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3DCOMPILER_STRIP_REFLECTION_DATA */ hr = D3DStripShader(test_blob_part, test_blob_part[6], D3DCOMPILER_STRIP_REFLECTION_DATA, &blob); - ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 516, "GetBufferSize failed, got %lu, expected %u\n", size, 516); + ok(size == 516, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_XNAS == *(dword+14), "XNAS got %#x, expected %#x.\n", *(dword+14), TAG_XNAS); - ok(TAG_XNAP == *(dword+33), "XNAP got %#x, expected %#x.\n", *(dword+33), TAG_XNAP); - ok(TAG_Aon9 == *(dword+52), "Aon9 got %#x, expected %#x.\n", *(dword+52), TAG_Aon9); - ok(TAG_SHDR == *(dword+77), "SHDR got %#x, expected %#x.\n", *(dword+77), TAG_SHDR); - ok(TAG_ISGN == *(dword+94), "ISGN got %#x, expected %#x.\n", *(dword+94), TAG_ISGN); - ok(TAG_OSGN == *(dword+116), "OSGN got %#x, expected %#x.\n", *(dword+116), TAG_OSGN); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_XNAS == *(dword + 14), "XNAS got %#lx, expected %#lx.\n", *(dword + 14), TAG_XNAS); + ok(TAG_XNAP == *(dword + 33), "XNAP got %#lx, expected %#lx.\n", *(dword + 33), TAG_XNAP); + ok(TAG_Aon9 == *(dword + 52), "Aon9 got %#lx, expected %#lx.\n", *(dword + 52), TAG_Aon9); + ok(TAG_SHDR == *(dword + 77), "SHDR got %#lx, expected %#lx.\n", *(dword + 77), TAG_SHDR); + ok(TAG_ISGN == *(dword + 94), "ISGN got %#lx, expected %#lx.\n", *(dword + 94), TAG_ISGN); + ok(TAG_OSGN == *(dword + 116), "OSGN got %#lx, expected %#lx.\n", *(dword + 116), TAG_OSGN); refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } /* @@ -619,14 +619,14 @@ static void test_get_blob_part2(void) /* D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 232, "GetBufferSize failed, got %lu, expected %u\n", size, 232); + ok(size == 232, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_PCSG == *(dword+9), "PCSG got %#x, expected %#x.\n", *(dword+9), TAG_PCSG); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_PCSG == *(dword + 9), "PCSG got %#lx, expected %#lx.\n", *(dword + 9), TAG_PCSG); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -634,32 +634,32 @@ static void test_get_blob_part2(void) if (parts[i] == D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB) { - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob2); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } else { - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); } } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_ALL_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_ALL_SIGNATURE_BLOB, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 344, "GetBufferSize failed, got %lu, expected %u\n", size, 344); + ok(size == 344, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_ISGN == *(dword+11), "ISGN got %#x, expected %#x.\n", *(dword+11), TAG_ISGN); - ok(TAG_OSGN == *(dword+24), "OSGN got %#x, expected %#x.\n", *(dword+24), TAG_OSGN); - ok(TAG_PCSG == *(dword+37), "PCSG got %#x, expected %#x.\n", *(dword+37), TAG_PCSG); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_ISGN == *(dword + 11), "ISGN got %#lx, expected %#lx.\n", *(dword + 11), TAG_ISGN); + ok(TAG_OSGN == *(dword + 24), "OSGN got %#lx, expected %#lx.\n", *(dword + 24), TAG_OSGN); + ok(TAG_PCSG == *(dword + 37), "PCSG got %#lx, expected %#lx.\n", *(dword + 37), TAG_PCSG); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -671,29 +671,29 @@ static void test_get_blob_part2(void) || parts[i] == D3D_BLOB_INPUT_SIGNATURE_BLOB || parts[i] == D3D_BLOB_OUTPUT_SIGNATURE_BLOB) { - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob2); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } else { - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); } } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_DEBUG_INFO */ hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_DEBUG_INFO, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 4055, "GetBufferSize failed, got %lu, expected %u\n", size, 4055); + ok(size == 4055, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC != *dword, "DXBC failed got %#x.\n", *dword); + ok(TAG_DXBC != *dword, "DXBC failed got %#lx.\n", *dword); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -702,63 +702,63 @@ static void test_get_blob_part2(void) #if D3D_COMPILER_VERSION >= 46 todo_wine #endif - ok(hr == expected, "D3DGetBlobPart failed, got %x, expected %x\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_LEGACY_SHADER */ hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_LEGACY_SHADER, 0, &blob); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* D3D_BLOB_XNA_PREPASS_SHADER */ hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_XNA_PREPASS_SHADER, 0, &blob); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* D3D_BLOB_XNA_SHADER */ hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_XNA_SHADER, 0, &blob); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* D3DCOMPILER_STRIP_DEBUG_INFO */ hr = D3DStripShader(test_blob_part2, test_blob_part2[6], D3DCOMPILER_STRIP_DEBUG_INFO, &blob); - ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 952, "GetBufferSize failed, got %lu, expected %u\n", size, 952); + ok(size == 952, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_RDEF == *(dword+14), "RDEF got %#x, expected %#x.\n", *(dword+14), TAG_RDEF); - ok(TAG_ISGN == *(dword+44), "ISGN got %#x, expected %#x.\n", *(dword+44), TAG_ISGN); - ok(TAG_OSGN == *(dword+57), "OSGN got %#x, expected %#x.\n", *(dword+57), TAG_OSGN); - ok(TAG_PCSG == *(dword+70), "PCSG got %#x, expected %#x.\n", *(dword+70), TAG_PCSG); - ok(TAG_SHEX == *(dword+119), "SHEX got %#x, expected %#x.\n", *(dword+119), TAG_SHEX); - ok(TAG_STAT == *(dword+199), "STAT got %#x, expected %#x.\n", *(dword+199), TAG_STAT); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_RDEF == *(dword + 14), "RDEF got %#lx, expected %#lx.\n", *(dword + 14), TAG_RDEF); + ok(TAG_ISGN == *(dword + 44), "ISGN got %#lx, expected %#lx.\n", *(dword + 44), TAG_ISGN); + ok(TAG_OSGN == *(dword + 57), "OSGN got %#lx, expected %#lx.\n", *(dword + 57), TAG_OSGN); + ok(TAG_PCSG == *(dword + 70), "PCSG got %#lx, expected %#lx.\n", *(dword + 70), TAG_PCSG); + ok(TAG_SHEX == *(dword + 119), "SHEX got %#lx, expected %#lx.\n", *(dword + 119), TAG_SHEX); + ok(TAG_STAT == *(dword + 199), "STAT got %#lx, expected %#lx.\n", *(dword + 199), TAG_STAT); hr = D3DGetBlobPart(dword, size, D3D_BLOB_DEBUG_INFO, 0, &blob2); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3DCOMPILER_STRIP_REFLECTION_DATA */ hr = D3DStripShader(test_blob_part2, test_blob_part2[6], D3DCOMPILER_STRIP_REFLECTION_DATA, &blob); - ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 4735, "GetBufferSize failed, got %lu, expected %u\n", size, 4735); + ok(size == 4735, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_ISGN == *(dword+13), "ISGN got %#x, expected %#x.\n", *(dword+13), TAG_ISGN); - ok(TAG_OSGN == *(dword+26), "OSGN got %#x, expected %#x.\n", *(dword+26), TAG_OSGN); - ok(TAG_PCSG == *(dword+39), "PCSG got %#x, expected %#x.\n", *(dword+39), TAG_PCSG); - ok(TAG_SHEX == *(dword+88), "SHEX got %#x, expected %#x.\n", *(dword+88), TAG_SHEX); - ok(TAG_SDBG == *(dword+168), "SDBG got %#x, expected %#x.\n", *(dword+168), TAG_SDBG); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_ISGN == *(dword + 13), "ISGN got %#lx, expected %#lx.\n", *(dword + 13), TAG_ISGN); + ok(TAG_OSGN == *(dword + 26), "OSGN got %#lx, expected %#lx.\n", *(dword + 26), TAG_OSGN); + ok(TAG_PCSG == *(dword + 39), "PCSG got %#lx, expected %#lx.\n", *(dword + 39), TAG_PCSG); + ok(TAG_SHEX == *(dword + 88), "SHEX got %#lx, expected %#lx.\n", *(dword + 88), TAG_SHEX); + ok(TAG_SDBG == *(dword + 168), "SDBG got %#lx, expected %#lx.\n", *(dword + 168), TAG_SDBG); refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } #if D3D_COMPILER_VERSION >= 46 @@ -820,10 +820,10 @@ static void test_D3DReadFileToBlob(void) HRESULT hr; hr = D3DReadFileToBlob(filename, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got unexpected hr %#x.\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); hr = D3DReadFileToBlob(filename, &blob); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got unexpected hr %#x.\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); if (0) { @@ -839,7 +839,7 @@ static void test_D3DReadFileToBlob(void) return; } hr = D3DReadFileToBlob(filename, &blob); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); data_size = ID3D10Blob_GetBufferSize(blob); ok(!data_size, "Got unexpected data size.\n"); DeleteFileW(filename); @@ -851,7 +851,7 @@ static void test_D3DReadFileToBlob(void) return; } hr = D3DReadFileToBlob(filename, &blob); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); data_size = ID3D10Blob_GetBufferSize(blob); ok(data_size == ARRAY_SIZE(test_cso_data), "Got unexpected data size.\n"); data = ID3D10Blob_GetBufferPointer(blob); @@ -870,21 +870,21 @@ static void test_D3DWriteBlobToFile(void) GetTempFileNameW(temp_dir, NULL, 0, filename); hr = D3DCreateBlob(16, &blob); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = D3DWriteBlobToFile(blob, filename, FALSE); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "Unexpected hr %#x.\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "Got unexpected hr %#lx.\n", hr); hr = D3DWriteBlobToFile(blob, filename, TRUE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); DeleteFileW(filename); hr = D3DWriteBlobToFile(blob, filename, FALSE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = D3DWriteBlobToFile(blob, filename, FALSE); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "Unexpected hr %#x.\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "Got unexpected hr %#lx.\n", hr); DeleteFileW(filename); diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c index 8e19d4d5aa3..5f7846a479b 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c @@ -47,7 +47,7 @@ static ID3D10Blob *compile_shader_(unsigned int line, const char *source, const HRESULT hr; hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", target, flags, 0, &blob, &errors); - ok_(__FILE__, line)(hr == S_OK, "Failed to compile shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to compile shader, hr %#lx.\n", hr); if (errors) { if (winetest_debug > 1) @@ -128,12 +128,12 @@ static IDXGISwapChain *create_swapchain(ID3D11Device *device, HWND window) HRESULT hr; hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); - ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); - ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); IDXGIDevice_Release(dxgi_device); hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "Failed to get factory, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); IDXGIAdapter_Release(adapter); dxgi_desc.BufferDesc.Width = 640; @@ -153,7 +153,7 @@ static IDXGISwapChain *create_swapchain(ID3D11Device *device, HWND window) dxgi_desc.Flags = 0; hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &dxgi_desc, &swapchain); - ok(SUCCEEDED(hr), "Failed to create swapchain, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); IDXGIFactory_Release(factory); return swapchain; @@ -195,10 +195,10 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context) context->swapchain = create_swapchain(context->device, context->window); hr = ID3D11Device_CreateTexture2D(context->device, &texture_desc, NULL, &context->rt); - ok_(__FILE__, line)(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create texture, hr %#lx.\n", hr); hr = ID3D11Device_CreateRenderTargetView(context->device, (ID3D11Resource *)context->rt, NULL, &context->rtv); - ok_(__FILE__, line)(hr == S_OK, "Failed to create rendertarget view, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create rendertarget view, hr %#lx.\n", hr); ID3D11Device_GetImmediateContext(context->device, &context->immediate_context); @@ -234,7 +234,7 @@ static void release_test_context_(unsigned int line, struct test_context *contex DestroyWindow(context->window); ref = ID3D11Device_Release(context->device); - ok_(__FILE__, line)(!ref, "Device has %u references left.\n", ref); + ok_(__FILE__, line)(!ref, "Device has %lu references left.\n", ref); } #define create_buffer(a, b, c, d) create_buffer_(__LINE__, a, b, c, d) @@ -252,7 +252,7 @@ static ID3D11Buffer *create_buffer_(unsigned int line, ID3D11Device *device, HRESULT hr; hr = ID3D11Device_CreateBuffer(device, &buffer_desc, data ? &resource_data : NULL, &buffer); - ok_(__FILE__, line)(hr == S_OK, "Failed to create buffer, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create buffer, hr %#lx.\n", hr); return buffer; } @@ -289,11 +289,11 @@ static void draw_quad_(unsigned int line, struct test_context *context, ID3D10Bl hr = ID3D11Device_CreateInputLayout(device, default_layout_desc, ARRAY_SIZE(default_layout_desc), ID3D10Blob_GetBufferPointer(vs_code), ID3D10Blob_GetBufferSize(vs_code), &context->input_layout); - ok_(__FILE__, line)(hr == S_OK, "Failed to create input layout, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create input layout, hr %#lx.\n", hr); hr = ID3D11Device_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), ID3D10Blob_GetBufferSize(vs_code), NULL, &context->vs); - ok_(__FILE__, line)(hr == S_OK, "Failed to create vertex shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create vertex shader, hr %#lx.\n", hr); } if (!context->vb) @@ -301,7 +301,7 @@ static void draw_quad_(unsigned int line, struct test_context *context, ID3D10Bl hr = ID3D11Device_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(ps_code), ID3D10Blob_GetBufferSize(ps_code), NULL, &ps); - ok_(__FILE__, line)(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create pixel shader, hr %#lx.\n", hr); ID3D11DeviceContext_IASetInputLayout(context->immediate_context, context->input_layout); ID3D11DeviceContext_IASetPrimitiveTopology(context->immediate_context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); @@ -333,11 +333,11 @@ static void init_readback(struct test_context *context, struct readback *rb) texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; texture_desc.MiscFlags = 0; hr = ID3D11Device_CreateTexture2D(context->device, &texture_desc, NULL, (ID3D11Texture2D **)&rb->resource); - ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D11DeviceContext_CopyResource(context->immediate_context, rb->resource, (ID3D11Resource *)context->rt); hr = ID3D11DeviceContext_Map(context->immediate_context, rb->resource, 0, D3D11_MAP_READ, 0, &rb->map_desc); - ok(hr == S_OK, "Failed to map texture, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); } static void release_readback(struct test_context *context, struct readback *rb) @@ -604,16 +604,16 @@ static void test_sampling(void) return; hr = ID3D11Device_CreateTexture2D(test_context.device, &texture_desc, &resource_data, &texture); - ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; srv_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; srv_desc.Texture2D.MipLevels = 1; hr = ID3D11Device_CreateShaderResourceView(test_context.device, (ID3D11Resource *)texture, &srv_desc, &srv); - ok(hr == S_OK, "Failed to create SRV, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D11DeviceContext_PSSetShaderResources(test_context.immediate_context, 0, 1, &srv); hr = ID3D11Device_CreateSamplerState(test_context.device, &sampler_desc, &sampler); - ok(hr == S_OK, "Failed to create sampler, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D11DeviceContext_PSSetSamplers(test_context.immediate_context, 0, 1, &sampler); for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -831,10 +831,10 @@ static void test_reflection(void) hr = D3DReflect(ID3D10Blob_GetBufferPointer(code), ID3D10Blob_GetBufferSize(code), &IID_ID3D11ShaderReflection, (void **)&reflection); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = reflection->lpVtbl->GetDesc(reflection, &shader_desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shader_desc.ConstantBuffers == ARRAY_SIZE(vs_buffers), "Got %u buffers.\n", shader_desc.ConstantBuffers); ok(shader_desc.BoundResources == ARRAY_SIZE(vs_bindings), "Got %u resources.\n", shader_desc.BoundResources); @@ -844,7 +844,7 @@ static void test_reflection(void) cbuffer = reflection->lpVtbl->GetConstantBufferByIndex(reflection, i); hr = cbuffer->lpVtbl->GetDesc(cbuffer, &buffer_desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(buffer_desc.Name, vs_buffers[i].desc.Name), "Got name %s.\n", debugstr_a(buffer_desc.Name)); ok(buffer_desc.Type == vs_buffers[i].desc.Type, "Got type %#x.\n", buffer_desc.Type); ok(buffer_desc.Variables == vs_buffers[i].desc.Variables, "Got %u variables.\n", buffer_desc.Variables); @@ -859,7 +859,7 @@ static void test_reflection(void) var = cbuffer->lpVtbl->GetVariableByIndex(cbuffer, j); hr = var->lpVtbl->GetDesc(var, &var_desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, expect->var_desc.Name), "Got name %s.\n", debugstr_a(var_desc.Name)); ok(var_desc.StartOffset == expect->var_desc.StartOffset, "Got offset %u.\n", var_desc.StartOffset); ok(var_desc.Size == expect->var_desc.Size, "Got size %u.\n", var_desc.Size); @@ -868,7 +868,7 @@ static void test_reflection(void) type = var->lpVtbl->GetType(var); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_type_desc(&type_desc, &expect->type_desc); for (k = 0; k < type_desc.Members; ++k) @@ -877,7 +877,7 @@ static void test_reflection(void) field = type->lpVtbl->GetMemberTypeByIndex(type, k); hr = field->lpVtbl->GetDesc(field, &type_desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_type_desc(&type_desc, &vs_buffers[i].vars[j].field_types[k]); winetest_pop_context(); @@ -896,7 +896,7 @@ static void test_reflection(void) winetest_push_context("Binding %u", i); hr = reflection->lpVtbl->GetResourceBindingDesc(reflection, i, &desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_resource_binding(&desc, &vs_bindings[i]); winetest_pop_context(); @@ -904,15 +904,15 @@ static void test_reflection(void) ID3D10Blob_Release(code); refcount = reflection->lpVtbl->Release(reflection); - ok(!refcount, "Got unexpected refcount %u.\n", refcount); + ok(!refcount, "Got unexpected refcount %lu.\n", refcount); code = compile_shader_flags(ps_source, "ps_4_0", D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY); hr = D3DReflect(ID3D10Blob_GetBufferPointer(code), ID3D10Blob_GetBufferSize(code), &IID_ID3D11ShaderReflection, (void **)&reflection); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = reflection->lpVtbl->GetDesc(reflection, &shader_desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ConstantBuffers, "Got %u buffers.\n", shader_desc.ConstantBuffers); ok(shader_desc.BoundResources == ARRAY_SIZE(ps_bindings), "Got %u resources.\n", shader_desc.BoundResources); @@ -923,7 +923,7 @@ static void test_reflection(void) winetest_push_context("Binding %u", i); hr = reflection->lpVtbl->GetResourceBindingDesc(reflection, i, &desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_resource_binding(&desc, &ps_bindings[i]); winetest_pop_context(); @@ -931,7 +931,7 @@ static void test_reflection(void) ID3D10Blob_Release(code); refcount = reflection->lpVtbl->Release(reflection); - ok(!refcount, "Got unexpected refcount %u.\n", refcount); + ok(!refcount, "Got unexpected refcount %lu.\n", refcount); } static void check_parameter_desc(const D3D11_SIGNATURE_PARAMETER_DESC *desc, @@ -1139,10 +1139,10 @@ static void test_semantic_reflection(void) hr = D3DReflect(ID3D10Blob_GetBufferPointer(code), ID3D10Blob_GetBufferSize(code), &IID_ID3D11ShaderReflection, (void **)&reflection); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = reflection->lpVtbl->GetDesc(reflection, &shader_desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine ok(shader_desc.InputParameters == tests[i].input_count, "Got %u input parameters.\n", shader_desc.InputParameters); todo_wine ok(shader_desc.OutputParameters == tests[i].output_count, @@ -1152,7 +1152,7 @@ static void test_semantic_reflection(void) { winetest_push_context("Input %u", j); hr = reflection->lpVtbl->GetInputParameterDesc(reflection, j, &desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_parameter_desc(&desc, &tests[i].inputs[j]); winetest_pop_context(); } @@ -1161,14 +1161,14 @@ static void test_semantic_reflection(void) { winetest_push_context("Output %u", j); hr = reflection->lpVtbl->GetOutputParameterDesc(reflection, j, &desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_parameter_desc(&desc, &tests[i].outputs[j]); winetest_pop_context(); } ID3D10Blob_Release(code); refcount = reflection->lpVtbl->Release(reflection); - ok(!refcount, "Got unexpected refcount %u.\n", refcount); + ok(!refcount, "Got unexpected refcount %lu.\n", refcount); winetest_pop_context(); } diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index febfa5a7d4f..4461a3f869f 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -106,7 +106,7 @@ static ID3D10Blob *compile_shader_(unsigned int line, const char *source, const HRESULT hr; hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", target, 0, 0, &blob, &errors); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to compile shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to compile shader, hr %#lx.\n", hr); if (errors) { if (winetest_debug > 1) @@ -141,12 +141,12 @@ static IDirect3DDevice9 *create_device(HWND window) IDirect3D9_Release(d3d); if (FAILED(hr)) { - skip("Failed to create a 3D device, hr %#x.\n", hr); + skip("Failed to create a 3D device, hr %#lx.\n", hr); return NULL; } hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); - ok(hr == D3D_OK, "Failed to get device caps, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); if (caps.PixelShaderVersion < D3DPS_VERSION(2, 0) || caps.VertexShaderVersion < D3DVS_VERSION(2, 0)) { skip("No shader model 2 support.\n"); @@ -157,13 +157,13 @@ static IDirect3DDevice9 *create_device(HWND window) if (FAILED(hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, D3DFMT_A32B32G32R32F, D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL))) { - skip("Failed to create an A32B32G32R32F surface, hr %#x.\n", hr); + skip("Failed to create an A32B32G32R32F surface, hr %#lx.\n", hr); IDirect3DDevice9_Release(device); return NULL; } - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); - ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); IDirect3DSurface9_Release(rt); return device; @@ -198,7 +198,7 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context) static void release_test_context_(unsigned int line, struct test_context *context) { ULONG ref = IDirect3DDevice9_Release(context->device); - ok_(__FILE__, line)(!ref, "Device has %u references left.\n", ref); + ok_(__FILE__, line)(!ref, "Device has %lu references left.\n", ref); DestroyWindow(context->window); } @@ -238,33 +238,33 @@ static void draw_quad_(unsigned int line, IDirect3DDevice9 *device, ID3D10Blob * "}"; hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to create vertex declaration, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create vertex declaration, hr %#lx.\n", hr); hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to set vertex declaration, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set vertex declaration, hr %#lx.\n", hr); vs_code = compile_shader(vs_source, "vs_2_0"); hr = IDirect3DDevice9_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), &vs); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to create vertex shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create vertex shader, hr %#lx.\n", hr); hr = IDirect3DDevice9_SetVertexShader(device, vs); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to set vertex shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set vertex shader, hr %#lx.\n", hr); hr = IDirect3DDevice9_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(ps_code), &ps); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to create pixel shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create pixel shader, hr %#lx.\n", hr); hr = IDirect3DDevice9_SetPixelShader(device, ps); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to set pixel shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set pixel shader, hr %#lx.\n", hr); hr = IDirect3DDevice9_BeginScene(device); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#lx.\n", hr); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#lx.\n", hr); hr = IDirect3DDevice9_EndScene(device); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#lx.\n", hr); IDirect3DVertexDeclaration9_Release(vertex_declaration); IDirect3DVertexShader9_Release(vs); @@ -285,19 +285,19 @@ static void init_readback(IDirect3DDevice9 *device, struct readback *rb) HRESULT hr; hr = IDirect3DDevice9Ex_GetRenderTarget(device, 0, &rt); - ok(hr == D3D_OK, "Failed to get render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DSurface9_GetDesc(rt, &desc); - ok(hr == D3D_OK, "Failed to get surface desc, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, desc.Width, desc.Height, desc.Format, D3DPOOL_SYSTEMMEM, &rb->surface, NULL); - ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9Ex_GetRenderTargetData(device, rt, rb->surface); - ok(hr == D3D_OK, "Failed to get render target data, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DSurface9_LockRect(rb->surface, &rb->rect, NULL, D3DLOCK_READONLY); - ok(hr == D3D_OK, "Failed to lock surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); IDirect3DSurface9_Release(rt); } @@ -460,9 +460,9 @@ static void test_swizzle(void) if (i == 0) { hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetVector(constants, device, "color", &color); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ID3DXConstantTable_Release(constants); } draw_quad(device, ps_code); @@ -505,19 +505,19 @@ static void test_math(void) if (ps_code) { hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetFloat(constants, device, "$u", 2.5f); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetFloat(constants, device, "$v", 0.3f); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetFloat(constants, device, "$w", 0.2f); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetFloat(constants, device, "$x", 0.7f); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetFloat(constants, device, "$y", 0.1f); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetFloat(constants, device, "$z", 1.5f); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ID3DXConstantTable_Release(constants); draw_quad(device, ps_code); @@ -661,9 +661,9 @@ static void test_float_vectors(void) if (ps_code) { hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Failed to get constants, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetInt(constants, device, "i", 2); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ID3DXConstantTable_Release(constants); draw_quad(device, ps_code); @@ -882,11 +882,11 @@ static void test_majority(void) if (ps_code) { hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetMatrix(constants, device, "r", &matrix); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetMatrix(constants, device, "c", &matrix); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ID3DXConstantTable_Release(constants); draw_quad(test_context.device, ps_code); @@ -902,11 +902,11 @@ static void test_majority(void) if (ps_code) { hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetMatrix(constants, device, "r", &matrix); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetMatrix(constants, device, "c", &matrix); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ID3DXConstantTable_Release(constants); draw_quad(test_context.device, ps_code); @@ -1039,9 +1039,9 @@ static void test_global_initializer(void) if (ps_code) { hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetDefaults(constants, test_context.device); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ID3DXConstantTable_Release(constants); draw_quad(test_context.device, ps_code); @@ -1104,24 +1104,24 @@ static void test_samplers(void) hr = IDirect3DDevice9_CreateTexture(test_context.device, 2, 2, 1, D3DUSAGE_DYNAMIC, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture, NULL); - ok(hr == D3D_OK, "Failed to create texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DTexture9_LockRect(texture, 0, &map_desc, NULL, D3DLOCK_DISCARD); - ok(hr == D3D_OK, "Failed to map texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); memset(map_desc.pBits, 0, 2 * map_desc.Pitch); ((DWORD *)map_desc.pBits)[1] = 0x00ff00ff; hr = IDirect3DTexture9_UnlockRect(texture, 0); - ok(hr == D3D_OK, "Failed to unmap texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_SetTexture(test_context.device, 0, (IDirect3DBaseTexture9 *)texture); - ok(hr == D3D_OK, "Failed to set texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_SetSamplerState(test_context.device, 0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR); - ok(hr == D3D_OK, "Failed to set sampler state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice9_Clear(test_context.device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(255, 0, 0), 1.0f, 0); - ok(hr == D3D_OK, "Test %u: Failed to clear, hr %#x.\n", i, hr); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); todo_wine ps_code = compile_shader(tests[i], "ps_2_0"); if (ps_code) { @@ -1253,11 +1253,11 @@ static void test_constant_table(void) return; hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_GetDesc(constants, &table_desc); - ok(hr == D3D_OK, "Got hr %#x.\n", hr); - ok(table_desc.Version == D3DPS_VERSION(2, 0), "Got Version %#x.\n", table_desc.Version); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + ok(table_desc.Version == D3DPS_VERSION(2, 0), "Got unexpected version %#lx.\n", table_desc.Version); ok(table_desc.Constants == ARRAY_SIZE(expect_constants), "Got %u constants.\n", table_desc.Constants); for (i = 0; i < table_desc.Constants; ++i) @@ -1269,7 +1269,7 @@ static void test_constant_table(void) memset(&desc, 0xcc, sizeof(desc)); count = 1; hr = ID3DXConstantTable_GetConstantDesc(constants, handle, &desc, &count); - ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ok(count == 1, "Got count %u.\n", count); sprintf(prefix, "Test %u", i); check_constant_desc(prefix, &desc, &expect_constants[i], FALSE); @@ -1283,7 +1283,7 @@ static void test_constant_table(void) memset(&desc, 0xcc, sizeof(desc)); count = 1; hr = ID3DXConstantTable_GetConstantDesc(constants, field, &desc, &count); - ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ok(count == 1, "Got count %u.\n", count); sprintf(prefix, "Test %u, %u", i, j); check_constant_desc(prefix, &desc, &expect_fields_f[j], !!j); @@ -1296,7 +1296,7 @@ static void test_constant_table(void) memset(&desc, 0xcc, sizeof(desc)); count = 1; hr = ID3DXConstantTable_GetConstantDesc(constants, field, &desc, &count); - ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ok(count == 1, "Got count %u.\n", count); sprintf(prefix, "Test %u", i); check_constant_desc(prefix, &desc, &expect_fields_j, FALSE); @@ -1434,7 +1434,7 @@ static void test_fail(void) { compiled = errors = NULL; hr = D3DCompile(tests[i], strlen(tests[i]), NULL, NULL, NULL, "test", targets[j], 0, 0, &compiled, &errors); - todo_wine ok(hr == E_FAIL, "Test %u, target %s, got unexpected hr %#x.\n", i, targets[j], hr); + todo_wine ok(hr == E_FAIL, "Test %u, target %s: Got unexpected hr %#lx.\n", i, targets[j], hr); if (hr == E_FAIL) { ok(!!errors, "Test %u, target %s, expected non-NULL error blob.\n", i, targets[j]); @@ -1631,7 +1631,7 @@ static void test_include(void) hr = tests[i](filename_a, &include.ID3DInclude_iface, &blob, &errors); todo_wine_if (i != 0) { - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!blob, "Got unexpected blob.\n"); } todo_wine_if (i == 1) @@ -1644,7 +1644,7 @@ static void test_include(void) #if D3D_COMPILER_VERSION >= 46 hr = tests[i](NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, &blob, &errors); - todo_wine_if (i == 0) ok(hr == (i == 0 ? D3DXERR_INVALIDDATA : E_FAIL), "Got hr %#x.\n", hr); + todo_wine_if (i == 0) ok(hr == (i == 0 ? D3DXERR_INVALIDDATA : E_FAIL), "Got unexpected hr %#lx.\n", hr); ok(!blob, "Got unexpected blob.\n"); ok(!!errors, "Got unexpected errors.\n"); ID3D10Blob_Release(errors); @@ -1656,7 +1656,7 @@ static void test_include(void) hr = tests[i](filename_a, D3D_COMPILE_STANDARD_FILE_INCLUDE, &blob, &errors); todo_wine_if (i != 0) { - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!blob, "Got unexpected blob.\n"); } todo_wine_if (i == 1) @@ -1674,12 +1674,12 @@ static void test_include(void) #if D3D_COMPILER_VERSION >= 46 hr = D3DCompileFromFile(L"nonexistent", NULL, NULL, "main", "vs_2_0", 0, 0, &blob, &errors); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got hr %#x.\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); ok(!blob, "Got unexpected blob.\n"); ok(!errors, "Got unexpected errors.\n"); hr = D3DCompileFromFile(filename, NULL, NULL, "main", "ps_2_0", 0, 0, &blob, &errors); - ok(hr == E_FAIL, "Got hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); ok(!blob, "Got unexpected blob.\n"); ok(!!errors, "Got unexpected errors.\n"); trace("%s.\n", (char *)ID3D10Blob_GetBufferPointer(errors)); @@ -1687,7 +1687,7 @@ static void test_include(void) errors = NULL; hr = D3DCompileFromFile(filename, NULL, &include.ID3DInclude_iface, "main", "ps_2_0", 0, 0, &blob, &errors); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine ok(!!blob, "Got unexpected blob.\n"); ok(!errors, "Got unexpected errors.\n"); if (blob) @@ -1700,7 +1700,7 @@ static void test_include(void) * instead of using the immediate parent, as it would be the case for * standard C preprocessor includes. */ hr = D3DCompileFromFile(filename, NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, "main", "ps_2_0", 0, 0, &blob, &errors); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine ok(!!blob, "Got unexpected blob.\n"); ok(!errors, "Got unexpected errors.\n"); if (blob) @@ -1712,7 +1712,7 @@ static void test_include(void) sprintf(ps_absolute_buffer, ps_absolute_template, include_filename); hr = D3DCompile(ps_absolute_buffer, sizeof(ps_absolute_buffer), filename_a, NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, "main", "ps_2_0", 0, 0, &blob, &errors); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine ok(!!blob, "Got unexpected blob.\n"); todo_wine ok(!errors, "Got unexpected errors.\n"); if (blob) @@ -1731,7 +1731,7 @@ static void test_include(void) hr = tests[i](NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, &blob, &errors); todo_wine_if (i != 0) { - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!blob, "Got unexpected blob.\n"); } todo_wine_if (i == 1) @@ -1746,7 +1746,7 @@ static void test_include(void) } hr = D3DCompileFromFile(L"source.ps", NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, "main", "ps_2_0", 0, 0, &blob, &errors); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine ok(!!blob, "Got unexpected blob.\n"); ok(!errors, "Got unexpected errors.\n"); if (blob) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 13769d57e34..9c8247790c5 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -22,9 +22,6 @@ * The functions are e.g.: D3DGet*SignatureBlob, D3DReflect */ -#ifndef WINE_NO_LONG_TYPES -#define WINE_NO_LONG_TYPES -#endif #define COBJMACROS #include "initguid.h" #include "d3dcompiler.h" @@ -93,22 +90,22 @@ static void test_reflection_references(void) ULONG count; hr = D3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == S_OK, "D3DReflect failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D11ShaderReflection, (void **)&ref11_test); - ok(hr == S_OK, "QueryInterface failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); count = ref11_test->lpVtbl->Release(ref11_test); - ok(count == 1, "Release failed %u\n", count); + ok(count == 1, "Release failed %lu\n", count); hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D10ShaderReflection, (void **)&ref10); - ok(hr == E_NOINTERFACE, "QueryInterface failed, got %x, expected %x\n", hr, E_NOINTERFACE); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); - ok(hr == E_NOINTERFACE, "QueryInterface failed, got %x, expected %x\n", hr, E_NOINTERFACE); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); count = ref11->lpVtbl->Release(ref11); - ok(count == 0, "Release failed %u\n", count); + ok(!count, "Got unexpected count %lu.\n", count); /* check invalid cases */ #if D3D_COMPILER_VERSION >= 46 @@ -118,21 +115,21 @@ static void test_reflection_references(void) #endif hr = D3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D10ShaderReflection, (void **)&ref10); ok(hr == expected || broken(hr == E_NOINTERFACE) /* Windows 8 */, - "D3DReflect failed, got %x, expected %x\n", hr, expected); + "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); hr = D3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D10ShaderReflection1, (void **)&ref10_1); ok(hr == expected || broken(hr == E_NOINTERFACE) /* Windows 8 */, - "D3DReflect failed, got %x, expected %x\n", hr, expected); + "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); hr = D3DReflect(NULL, test_reflection_blob[6], &IID_ID3D10ShaderReflection1, (void **)&ref10_1); - ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DReflect(NULL, test_reflection_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); /* returns different errors with different sizes */ hr = D3DReflect(test_reflection_blob, 31, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); - ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); #if D3D_COMPILER_VERSION >= 46 expected = D3DERR_INVALIDCALL; @@ -140,19 +137,19 @@ static void test_reflection_references(void) expected = E_FAIL; #endif hr = D3DReflect(test_reflection_blob, 32, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); - ok(hr == expected, "Got %x, expected %x.\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); hr = D3DReflect(test_reflection_blob, test_reflection_blob[6]-1, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); - ok(hr == expected, "Got %x, expected %x.\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); hr = D3DReflect(test_reflection_blob, 31, &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == D3DERR_INVALIDCALL, "Got %x, expected %x.\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DReflect(test_reflection_blob, 32, &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == expected, "Got %x, expected %x.\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); hr = D3DReflect(test_reflection_blob, test_reflection_blob[6]-1, &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == expected, "Got %x, expected %x.\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); } #endif @@ -168,51 +165,52 @@ static void test_reflection_interfaces(void) expected_hr = D3D_COMPILER_VERSION < 46 ? E_NOINTERFACE : D3D_COMPILER_VERSION == 46 ? E_INVALIDARG : S_OK; hr = call_reflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D12ShaderReflection, (void **)&ref12); /* Broken with older d3dcompiler_46, d3dcompiler_47. */ - ok(hr == expected_hr || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + ok(hr == expected_hr || broken(hr == E_NOINTERFACE), + "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr); if (hr != S_OK) return; hr = call_reflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ref12->lpVtbl->QueryInterface(ref12, &IID_ID3D11ShaderReflection, (void **)&iface); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(iface == (void *)ref12, "Got unexpected interfaces %p, %p.\n", iface, ref12); hr = iface->lpVtbl->QueryInterface(iface, &IID_IUnknown, (void **)&iunk); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(iface == iunk, "Got unexpected iface %p.\n", iface); iface->lpVtbl->Release(iunk); iface->lpVtbl->Release(iface); hr = ref12->lpVtbl->QueryInterface(ref12, &IID_IUnknown, (void **)&iface); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(iface == (IUnknown *)ref12, "Got unexpected iface %p.\n", iface); iface->lpVtbl->Release(iface); hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D12ShaderReflection, (void **)&iface); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(iface == (void *)ref11, "Got unexpected interfaces %p, %p.\n", iface, ref11); hr = iface->lpVtbl->QueryInterface(iface, &IID_IUnknown, (void **)&iunk); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(iface == iunk, "Got unexpected iface %p.\n", iface); iface->lpVtbl->Release(iunk); iface->lpVtbl->Release(iface); hr = ref11->lpVtbl->QueryInterface(ref11, &IID_IUnknown, (void **)&iface); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(iface == (IUnknown *)ref11, "Got unexpected iface %p.\n", iface); iface->lpVtbl->Release(iface); hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D10ShaderReflection, (void **)&iface); - ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); hr = ref12->lpVtbl->QueryInterface(ref12, &IID_ID3D10ShaderReflection, (void **)&iface); - ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); count = ref12->lpVtbl->Release(ref12); - ok(!count, "Got unexpected ref count %u.\n", count); + ok(!count, "Got unexpected ref count %lu.\n", count); count = ref11->lpVtbl->Release(ref11); - ok(!count, "Got unexpected ref count %u.\n", count); + ok(!count, "Got unexpected ref count %lu.\n", count); } #endif @@ -402,15 +400,15 @@ static void test_reflection_desc_vs(void) #endif hr = call_reflect(test_reflection_desc_vs_blob, test_reflection_desc_vs_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == S_OK, "D3DReflect failed %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D12ShaderReflection, (void **)&ref12); hr = ref11->lpVtbl->GetDesc(ref11, NULL); - ok(hr == E_FAIL, "GetDesc failed %x\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetDesc(ref11, &sdesc11); - ok(hr == S_OK, "GetDesc failed %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(sdesc11.Version == 65601, "GetDesc failed, got %u, expected %u\n", sdesc11.Version, 65601); ok(strcmp(sdesc11.Creator, (char*) shader_creator) == 0, "GetDesc failed, got \"%s\", expected \"%s\"\n", sdesc11.Creator, (char*)shader_creator); @@ -454,7 +452,7 @@ static void test_reflection_desc_vs(void) if (ref12) { hr = ref12->lpVtbl->GetDesc(ref12, &sdesc12); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!memcmp(&sdesc11, &sdesc12, sizeof(sdesc12)), "D3D11 and D3D12 descs do not match.\n"); } @@ -503,7 +501,7 @@ static void test_reflection_desc_vs(void) pdesc = &test_reflection_desc_vs_resultin[i]; hr = ref11->lpVtbl->GetInputParameterDesc(ref11, i, &desc11); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "Got unexpected hr %#lx, i %u.\n", hr, i); ok(!strcmp(desc11.SemanticName, pdesc->SemanticName), "Got unexpected SemanticName \"%s\", i %u.\n", desc11.SemanticName, i); @@ -529,7 +527,7 @@ static void test_reflection_desc_vs(void) if (ref12) { hr = ref12->lpVtbl->GetInputParameterDesc(ref12, i, &desc12); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "Got unexpected hr %#lx, i %u.\n", hr, i); ok(!memcmp(&desc12, &desc11, sizeof(desc11)), "D3D11 and D3D12 descs do not match.\n"); } @@ -540,7 +538,7 @@ static void test_reflection_desc_vs(void) pdesc = &test_reflection_desc_vs_resultout[i]; hr = ref11->lpVtbl->GetOutputParameterDesc(ref11, i, &desc11); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "Got unexpected hr %#lx, i %u.\n", hr, i); ok(!strcmp(desc11.SemanticName, pdesc->SemanticName), "Got unexpected SemanticName \"%s\", i %u.\n", desc11.SemanticName, i); @@ -566,7 +564,7 @@ static void test_reflection_desc_vs(void) if (ref12) { hr = ref12->lpVtbl->GetOutputParameterDesc(ref12, i, &desc12); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "Got unexpected hr %#lx, i %u.\n", hr, i); ok(!memcmp(&desc12, &desc11, sizeof(desc11)), "D3D11 and D3D12 descs do not match.\n"); } @@ -575,11 +573,11 @@ static void test_reflection_desc_vs(void) if (ref12) { count = ref12->lpVtbl->Release(ref12); - ok(count == 1, "Got unexpected ref count %u.\n", count); + ok(count == 1, "Got unexpected ref count %lu.\n", count); } count = ref11->lpVtbl->Release(ref11); - ok(count == 0, "Got unexpected ref count %u.\n", count); + ok(count == 0, "Got unexpected ref count %lu.\n", count); } /* @@ -758,10 +756,10 @@ static void test_reflection_desc_ps(void) #endif hr = call_reflect(test_reflection_desc_ps_blob, test_reflection_desc_ps_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == S_OK, "D3DReflect failed %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetDesc(ref11, &sdesc11); - ok(hr == S_OK, "GetDesc failed %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(sdesc11.Version == 65, "GetDesc failed, got %u, expected %u\n", sdesc11.Version, 65); ok(strcmp(sdesc11.Creator, (char*) shader_creator) == 0, "GetDesc failed, got \"%s\", expected \"%s\"\n", sdesc11.Creator, (char*)shader_creator); @@ -818,20 +816,20 @@ static void test_reflection_desc_ps(void) /* check invalid Get*ParameterDesc cases*/ hr = ref11->lpVtbl->GetInputParameterDesc(ref11, 0, NULL); - ok(hr == E_INVALIDARG, "GetInputParameterDesc failed, got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetInputParameterDesc(ref11, 0xffffffff, &desc); - ok(hr == E_INVALIDARG, "GetInputParameterDesc failed, got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetOutputParameterDesc(ref11, 0, NULL); - ok(hr == E_INVALIDARG, "GetOutputParameterDesc failed, got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetOutputParameterDesc(ref11, 0xffffffff, &desc); - ok(hr == E_INVALIDARG, "GetOutputParameterDesc failed, got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); #if D3D_COMPILER_VERSION hr = ref11->lpVtbl->GetPatchConstantParameterDesc(ref11, 0, &desc); - ok(hr == E_INVALIDARG, "GetPatchConstantParameterDesc failed, got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); #endif /* GetIn/OutputParameterDesc */ @@ -840,7 +838,7 @@ static void test_reflection_desc_ps(void) pdesc = &test_reflection_desc_ps_resultin[i]; hr = ref11->lpVtbl->GetInputParameterDesc(ref11, i, &desc); - ok(hr == S_OK, "GetInputParameterDesc(%u) failed, got %x, expected %x\n", i, hr, S_OK); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc.SemanticName, pdesc->SemanticName), "GetInputParameterDesc(%u) SemanticName failed, got \"%s\", expected \"%s\"\n", i, desc.SemanticName, pdesc->SemanticName); @@ -868,7 +866,7 @@ static void test_reflection_desc_ps(void) pdesc = &test_reflection_desc_ps_resultout[i]; hr = ref11->lpVtbl->GetOutputParameterDesc(ref11, i, &desc); - ok(hr == S_OK, "GetOutputParameterDesc(%u) failed, got %x, expected %x\n", i, hr, S_OK); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc.SemanticName, pdesc->SemanticName), "GetOutputParameterDesc(%u) SemanticName failed, got \"%s\", expected \"%s\"\n", i, desc.SemanticName, pdesc->SemanticName); @@ -898,7 +896,7 @@ static void test_reflection_desc_ps(void) } count = ref11->lpVtbl->Release(ref11); - ok(count == 0, "Release failed %u\n", count); + ok(!count, "Got unexpected count %lu.\n", count); } /* The following shaders are stripped, in order to show that the correct @@ -1038,17 +1036,17 @@ static void test_reflection_desc_ps_output(void) hr = call_reflect(tests[i].blob, tests[i].blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); if (!D3D_COMPILER_VERSION) { - todo_wine ok(hr == E_INVALIDARG, "(%u): got unexpected hr %x.\n", i, hr); + todo_wine ok(hr == E_INVALIDARG, "%u: Got unexpected hr %#lx.\n", i, hr); if (SUCCEEDED(hr)) ref11->lpVtbl->Release(ref11); continue; } - ok(hr == S_OK, "(%u): got unexpected hr %x.\n", i, hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); pdesc = &tests[i].desc; hr = ref11->lpVtbl->GetOutputParameterDesc(ref11, 0, &desc); - ok(hr == S_OK, "(%u): GetOutputParameterDesc failed, got %x, expected %x\n", i, hr, S_OK); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc.SemanticName, pdesc->SemanticName), "(%u): GetOutputParameterDesc SemanticName failed, got \"%s\", expected \"%s\"\n", i, desc.SemanticName, pdesc->SemanticName); @@ -1077,7 +1075,7 @@ static void test_reflection_desc_ps_output(void) ok(!desc.Stream, "(%u): got unexpected Stream %u.\n", i, desc.Stream); count = ref11->lpVtbl->Release(ref11); - ok(count == 0, "(%u): Release failed %u\n", i, count); + ok(!count, "%u: Got unexpected count %lu.\n", i, count); } } @@ -1181,7 +1179,8 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE expected_hr = D3D_COMPILER_VERSION < 47 && target_version >= 0x501 ? E_INVALIDARG : S_OK; /* Older d3dcompiler_47 does not support sm5.1. */ - ok(hr == expected_hr || broken(hr == E_INVALIDARG && target_version >= 0x501), "Got unexpected hr %x.\n", hr); + ok(hr == expected_hr || broken(hr == E_INVALIDARG && target_version >= 0x501), + "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr); if (hr == E_INVALIDARG) return; @@ -1204,23 +1203,23 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE /* check invalid cases */ hr = ref11->lpVtbl->GetResourceBindingDesc(ref11, 0, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetResourceBindingDesc(ref11, 0xffffffff, &desc11); - ok(hr == E_INVALIDARG, "Got unexpected hr %x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); #if D3D_COMPILER_VERSION hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, NULL, &desc11); - ok(hr == E_INVALIDARG, "Got unexpected hr %x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, "sam", NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, "invalid", NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, "invalid", &desc11); - ok(hr == E_INVALIDARG, "Got unexpected hr %x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); #endif /* GetResourceBindingDesc */ @@ -1229,7 +1228,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE pdesc = &result[i]; hr = ref11->lpVtbl->GetResourceBindingDesc(ref11, i, &desc11); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc11.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc11.Name, i); ok(desc11.Type == pdesc->Type, "Got unexpected Type %#x, i %u.\n", desc11.Type, i); @@ -1253,7 +1252,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE desc12.uID = 0xdeadbeef; hr = ref12->lpVtbl->GetResourceBindingDesc(ref12, i, &desc12); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc12.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc12.Name, i); ok(!memcmp(&desc12.Type, &desc11.Type, sizeof(desc11) - offsetof(D3D11_SHADER_INPUT_BIND_DESC, Type)), @@ -1265,7 +1264,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE desc12.Space = 0xdeadbeef; desc12.uID = 0xdeadbeef; hr = ref12_from_d3d11->lpVtbl->GetResourceBindingDesc(ref12_from_d3d11, i, &desc12); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc12.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc12.Name, i); ok(!memcmp(&desc12.Type, &desc11.Type, sizeof(desc11) - offsetof(D3D11_SHADER_INPUT_BIND_DESC, Type)), @@ -1283,7 +1282,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE desc12.Space = 0xdeadbeef; desc12.uID = 0xdeadbeef; hr = ref11_from_d3d12->lpVtbl->GetResourceBindingDesc(ref11_from_d3d12, i, &desc12); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc12.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc12.Name, i); ok(!memcmp(&desc12.Type, &desc11.Type, sizeof(desc11) - offsetof(D3D11_SHADER_INPUT_BIND_DESC, Type)), "D3D11 and D3D12 descs do not match.\n"); @@ -1299,7 +1298,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE pdesc = &result[i]; hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, pdesc->Name, &desc11); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc11.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc11.Name, i); ok(desc11.Type == pdesc->Type, "Got unexpected Type %#x, i %u.\n", desc11.Type, i); @@ -1317,7 +1316,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE desc12.uID = 0xdeadbeef; hr = ref12->lpVtbl->GetResourceBindingDescByName(ref12, pdesc->Name, &desc12); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc12.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc12.Name, i); ok(!memcmp(&desc12.Type, &desc11.Type, sizeof(desc11) - offsetof(D3D11_SHADER_INPUT_BIND_DESC, Type)), @@ -1329,7 +1328,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE desc12.Space = 0xdeadbeef; desc12.uID = 0xdeadbeef; hr = ref12_from_d3d11->lpVtbl->GetResourceBindingDescByName(ref12_from_d3d11, pdesc->Name, &desc12); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc12.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc12.Name, i); ok(!memcmp(&desc12.Type, &desc11.Type, sizeof(desc11) - offsetof(D3D11_SHADER_INPUT_BIND_DESC, Type)), @@ -1344,7 +1343,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE desc12.Space = 0xdeadbeef; desc12.uID = 0xdeadbeef; hr = ref11_from_d3d12->lpVtbl->GetResourceBindingDescByName(ref11_from_d3d12, pdesc->Name, &desc12); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc12.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc12.Name, i); ok(!memcmp(&desc12.Type, &desc11.Type, sizeof(desc11) - offsetof(D3D11_SHADER_INPUT_BIND_DESC, Type)), "D3D11 and D3D12 descs do not match.\n"); @@ -1357,17 +1356,17 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE if (ref12) { count = ref11_from_d3d12->lpVtbl->Release(ref11_from_d3d12); - ok(count == 1, "Got unexpected ref count %u.\n", count); + ok(count == 1, "Got unexpected ref count %lu.\n", count); count = ref12->lpVtbl->Release(ref12); - ok(!count, "Got unexpected ref count %u.\n", count); + ok(!count, "Got unexpected ref count %lu.\n", count); count = ref12_from_d3d11->lpVtbl->Release(ref12_from_d3d11); - ok(count == 1, "Got unexpected ref count %u.\n", count); + ok(count == 1, "Got unexpected ref count %lu.\n", count); } count = ref11->lpVtbl->Release(ref11); - ok(!count, "Got unexpected ref count %u.\n", count); + ok(!count, "Got unexpected ref count %lu.\n", count); } #if D3D_COMPILER_VERSION @@ -1618,7 +1617,7 @@ static void test_reflection_constant_buffer(void) hr = call_reflect(test_reflection_constant_buffer_blob, test_reflection_constant_buffer_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == S_OK, "D3DReflect failed %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); #if D3D_COMPILER_VERSION call_reflect(test_reflection_constant_buffer_blob, test_reflection_constant_buffer_blob[6], @@ -1626,7 +1625,7 @@ static void test_reflection_constant_buffer(void) #endif hr = ref11->lpVtbl->GetDesc(ref11, &sdesc); - ok(hr == S_OK, "GetDesc failed %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); expected = D3D_COMPILER_VERSION ? 80 : 64; ok(sdesc.Version == expected, "Got unexpected version %u.\n", sdesc.Version); @@ -1758,33 +1757,33 @@ static void test_reflection_constant_buffer(void) } hr = cb11_dummy->lpVtbl->GetDesc(cb11_dummy, NULL); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = cb11_dummy->lpVtbl->GetDesc(cb11_dummy, &cbdesc); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = cb11_valid->lpVtbl->GetDesc(cb11_valid, NULL); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* variable calls */ hr = v11_dummy->lpVtbl->GetDesc(v11_dummy, NULL); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = v11_dummy->lpVtbl->GetDesc(v11_dummy, &vdesc); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = v11_valid->lpVtbl->GetDesc(v11_valid, NULL); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* type calls */ hr = t11_dummy->lpVtbl->GetDesc(t11_dummy, NULL); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = t11_dummy->lpVtbl->GetDesc(t11_dummy, &tdesc); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = t11_valid->lpVtbl->GetDesc(t11_valid, NULL); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); string = t11_dummy->lpVtbl->GetMemberTypeName(t11_dummy, 0xffffffff); ok(!strcmp(string, "$Invalid"), "GetMemberTypeName failed, got \"%s\", expected \"%s\"\n", string, "$Invalid"); @@ -1812,16 +1811,16 @@ static void test_reflection_constant_buffer(void) #if D3D_COMPILER_VERSION hr = t11_dummy->lpVtbl->IsEqual(t11_dummy, t11_dummy); - ok(hr == E_FAIL, "IsEqual failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = t11_valid->lpVtbl->IsEqual(t11_valid, t11_dummy); - ok(hr == S_FALSE, "IsEqual failed, got %x, expected %x\n", hr, S_FALSE); + ok(hr == S_FALSE, "Got unexpected hr %#lx.\n", hr); hr = t11_dummy->lpVtbl->IsEqual(t11_dummy, t11_valid); - ok(hr == E_FAIL, "IsEqual failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = t11_valid->lpVtbl->IsEqual(t11_valid, t11_valid); - ok(hr == S_OK, "IsEqual failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); #endif /* constant buffers */ @@ -1833,7 +1832,7 @@ static void test_reflection_constant_buffer(void) ok(cb11_dummy != cb11, "Got dummy constant buffer, i %u.\n", i); hr = cb11->lpVtbl->GetDesc(cb11, &cbdesc); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(cbdesc.Name, pcbdesc->Name), "Got unexpected name \"%s\", i %u.\n", cbdesc.Name, i); ok(cbdesc.Type == pcbdesc->Type, "Got unexpected Type %#x, i %u.\n", cbdesc.Type, i); @@ -1847,7 +1846,7 @@ static void test_reflection_constant_buffer(void) ok(cb12_dummy != cb12, "Got dummy constant buffer, i %u.\n", i); hr = cb12->lpVtbl->GetDesc(cb12, &cbdesc12); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(cbdesc12.Name, pcbdesc->Name), "Got unexpected name \"%s\", i %u.\n", cbdesc.Name, i); ok(cbdesc.Type == pcbdesc->Type, "Got unexpected Type %#x, i %u.\n", cbdesc.Type, i); @@ -1881,7 +1880,7 @@ static void test_reflection_constant_buffer(void) } hr = v11->lpVtbl->GetDesc(v11, &vdesc); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(vdesc.Name, pvdesc->Name), "Got unexpected name \"%s\", i %u", vdesc.Name, i); ok(vdesc.StartOffset == pvdesc->StartOffset, "Got unexpected StartOffset %u, i %u.\n", @@ -1900,7 +1899,7 @@ static void test_reflection_constant_buffer(void) v12 = ref12->lpVtbl->GetVariableByName(ref12, pvdesc->Name); ok(v12_dummy != v12, "Test %u, got unexpected variable %p.\n", i, v12); hr = v12->lpVtbl->GetDesc(v12, &vdesc12); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(vdesc12.Name, pvdesc->Name), "Got unexpected name \"%s\", i %u", vdesc12.Name, i); ok(!memcmp(&vdesc12.StartOffset, &vdesc.StartOffset, sizeof(vdesc) - offsetof(D3D11_SHADER_VARIABLE_DESC, StartOffset)), @@ -1919,7 +1918,7 @@ static void test_reflection_constant_buffer(void) ok(t11_dummy != t11, "Got unexpected type %p, i %u.\n", t11, i); hr = t11->lpVtbl->GetDesc(t11, &tdesc); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(tdesc.Class == ptdesc->Class, "Got unexpected Class %u, i %u.\n", tdesc.Class, i); ok(tdesc.Type == ptdesc->Type, "Got unexpected Type %u, i %u.\n", tdesc.Type, i); @@ -1936,7 +1935,7 @@ static void test_reflection_constant_buffer(void) ok(t12_dummy != t12, "Got unexpected type %p, i %u.\n", t12, i); hr = t12->lpVtbl->GetDesc(t12, &tdesc12); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!memcmp(&tdesc12, &tdesc, offsetof(D3D11_SHADER_TYPE_DESC, Name)), "D3D11 and D3D12 descs do not match.\n"); ok(!strcmp(tdesc12.Name, ptdesc->Name), "Got unexpected Name %s, i %u.\n", debugstr_a(tdesc12.Name), i); @@ -1974,10 +1973,10 @@ static void test_reflection_constant_buffer(void) #if D3D_COMPILER_VERSION /* float vs float (in struct) */ hr = t11->lpVtbl->IsEqual(t11, t11_valid); - ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#lx.\n", hr); hr = t11_valid->lpVtbl->IsEqual(t11_valid, t11); - ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#lx.\n", hr); /* float vs float */ t = t11->lpVtbl->GetMemberTypeByIndex(t11, 0); @@ -1987,7 +1986,7 @@ static void test_reflection_constant_buffer(void) ok(t2 != t11_dummy, "Got unexpected type %p.\n", t2); hr = t->lpVtbl->IsEqual(t, t2); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); #endif if (ref12) @@ -2017,10 +2016,10 @@ static void test_reflection_constant_buffer(void) ok(!strcmp(string, "b"), "Got unexpected string \"%s\".\n", string); hr = t12->lpVtbl->IsEqual(t12, t12_valid); - ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#lx.\n", hr); hr = t12_valid->lpVtbl->IsEqual(t12_valid, t12); - ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#lx.\n", hr); mt12 = t12->lpVtbl->GetMemberTypeByIndex(t12, 0); ok(mt12 != t12_dummy, "Got unexpected type %p.\n", mt12); @@ -2029,13 +2028,13 @@ static void test_reflection_constant_buffer(void) ok(mt12_2 != t12_dummy, "Got unexpected type %p.\n", mt12_2); hr = mt12->lpVtbl->IsEqual(mt12, mt12_2); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); count = ref12->lpVtbl->Release(ref12); - ok(!count, "Got unexpected ref count %u.\n", count); + ok(!count, "Got unexpected ref count %lu.\n", count); } count = ref11->lpVtbl->Release(ref11); - ok(!count, "Got unexpected ref count %u.\n", count); + ok(!count, "Got unexpected ref count %lu.\n", count); } /* diff --git a/dlls/d3dcompiler_46/tests/Makefile.in b/dlls/d3dcompiler_46/tests/Makefile.in index c2effd862cf..7d2b899c0eb 100644 --- a/dlls/d3dcompiler_46/tests/Makefile.in +++ b/dlls/d3dcompiler_46/tests/Makefile.in @@ -1,6 +1,6 @@ TESTDLL = d3dcompiler_46.dll IMPORTS = d3d9 user32 d3dcompiler_46 -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=46 +EXTRADEFS = -DD3D_COMPILER_VERSION=46 PARENTSRC = ../../d3dcompiler_43/tests C_SRCS = \ diff --git a/dlls/d3dcompiler_47/tests/Makefile.in b/dlls/d3dcompiler_47/tests/Makefile.in index 14732c65fd7..6e40550e777 100644 --- a/dlls/d3dcompiler_47/tests/Makefile.in +++ b/dlls/d3dcompiler_47/tests/Makefile.in @@ -1,6 +1,6 @@ TESTDLL = d3dcompiler_47.dll IMPORTS = d3d9 user32 d3dcompiler -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=47 +EXTRADEFS = -DD3D_COMPILER_VERSION=47 PARENTSRC = ../../d3dcompiler_43/tests C_SRCS = \ -- 2.30.2

1 0

[PATCH 1/6] d3d10/tests: Build without -DWINE_NO_LONG_TYPES.
by Henri Verbeet Feb. 8, 2022

Feb. 8, 2022

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10/tests/Makefile.in | 2 +- dlls/d3d10/tests/device.c | 54 +- dlls/d3d10/tests/effect.c | 1168 ++++++++++++------------ dlls/d3dcompiler_43/tests/reflection.c | 3 + 4 files changed, 614 insertions(+), 613 deletions(-) diff --git a/dlls/d3d10/tests/Makefile.in b/dlls/d3d10/tests/Makefile.in index ed342153184..e3849ec634b 100644 --- a/dlls/d3d10/tests/Makefile.in +++ b/dlls/d3d10/tests/Makefile.in @@ -1,6 +1,6 @@ TESTDLL = d3d10.dll IMPORTS = d3d10 -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=0 +EXTRADEFS = -DD3D_COMPILER_VERSION=0 PARENTSRC = ../../d3dcompiler_43/tests C_SRCS = \ diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index bb4bff51bdb..9307cc4713d 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -38,7 +38,7 @@ static void test_create_device(void) if (i == D3D10_SDK_VERSION) continue; hr = D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, i, &device); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x for SDK version %#x.\n", hr, i); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx for SDK version %#x.\n", hr, i); } } @@ -85,80 +85,80 @@ static void test_stateblock_mask(void) mask_y.Predication = 0xaa; hr = D3D10StateBlockMaskDifference(&mask_x, &mask_y, &result); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskDifference failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0x66, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0x33, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskDifference(NULL, &mask_y, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskDifference(&mask_x, NULL, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskDifference(&mask_x, &mask_y, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskIntersect(&mask_x, &mask_y, &result); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskIntersect failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0x11, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0x88, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskIntersect(NULL, &mask_y, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskIntersect(&mask_x, NULL, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskIntersect(&mask_x, &mask_y, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskUnion(&mask_x, &mask_y, &result); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskUnion failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0x77, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0xbb, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskUnion(NULL, &mask_y, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskUnion(&mask_x, NULL, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskUnion(&mask_x, &mask_y, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); memset(&result, 0xff, sizeof(result)); hr = D3D10StateBlockMaskDisableAll(&result); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableAll failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!result.VS, "Got unexpected result.VS %#x.\n", result.VS); ok(!result.Predication, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskDisableAll(NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); memset(&result, 0, sizeof(result)); hr = D3D10StateBlockMaskEnableAll(&result); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskEnableAll failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0xff, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0xff, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskEnableAll(NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); result.VS = 0xff; hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 0, 1); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableCapture failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0xfe, "Got unexpected result.VS %#x.\n", result.VS); hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 0, 4); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 1, 1); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskDisableCapture(NULL, D3D10_DST_VS, 0, 1); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); result.VS = 0; hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS, 0, 1); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskEnableCapture failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0x01, "Got unexpected result.VS %#x.\n", result.VS); hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS, 0, 4); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS, 1, 1); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskEnableCapture(NULL, D3D10_DST_VS, 0, 1); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); for (i = 0; i < ARRAY_SIZE(capture_test); ++i) { memset(&result, 0xff, sizeof(result)); hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS_SHADER_RESOURCES, capture_test[i].start_idx, capture_test[i].count); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableCapture failed, hr %#x.\n", hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); ok(!memcmp(result.VSShaderResources, capture_test[i].expected_disable, 5), "Got unexpected result.VSShaderResources[0..4] {%#x, %#x, %#x, %#x, %#x} for test %u.\n", @@ -169,7 +169,7 @@ static void test_stateblock_mask(void) memset(&result, 0, sizeof(result)); hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS_SHADER_RESOURCES, capture_test[i].start_idx, capture_test[i].count); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskEnableCapture failed, hr %#x.\n", hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); ok(!memcmp(result.VSShaderResources, capture_test[i].expected_enable, 5), "Got unexpected result.VSShaderResources[0..4] {%#x, %#x, %#x, %#x, %#x} for test %u.\n", diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index b5df2fd8538..3bd6d6d0ecc 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -119,13 +119,13 @@ static void test_effect_constant_buffer_type(void) } hr = create_effect(fx_test_ecbt, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, NULL); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(desc.ConstantBuffers == 2, "Unexpected constant buffers count %u.\n", desc.ConstantBuffers); ok(desc.SharedConstantBuffers == 0, "Unexpected shared constant buffers count %u.\n", @@ -138,14 +138,14 @@ static void test_effect_constant_buffer_type(void) constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = constantbuffer->lpVtbl->GetDesc(constantbuffer, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT, "Unexpected variable flags %#x.\n", var_desc.Flags); ok(var_desc.ExplicitBindPoint == 1, "Unexpected bind point %#x.\n", var_desc.ExplicitBindPoint); type = constantbuffer->lpVtbl->GetType(constantbuffer); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "cbuffer") == 0, "TypeName is \"%s\", expected \"cbuffer\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_OBJECT); @@ -159,7 +159,7 @@ static void test_effect_constant_buffer_type(void) ok(type_desc.Stride == 0x10, "Stride is %#x, expected 0x10\n", type_desc.Stride); hr = constantbuffer->lpVtbl->GetConstantBuffer(constantbuffer, &buffer); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Buffer_GetDesc(buffer, &buffer_desc); ok(buffer_desc.ByteWidth == type_desc.UnpackedSize, "Unexpected buffer size %u.\n", buffer_desc.ByteWidth); ok(!buffer_desc.Usage, "Unexpected buffer usage %u.\n", buffer_desc.Usage); @@ -170,7 +170,7 @@ static void test_effect_constant_buffer_type(void) ID3D10Buffer_Release(buffer); hr = constantbuffer->lpVtbl->GetTextureBuffer(constantbuffer, &srv); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); string = type->lpVtbl->GetMemberName(type, 0); ok(strcmp(string, "f1") == 0, "GetMemberName is \"%s\", expected \"f1\"\n", string); @@ -191,7 +191,7 @@ static void test_effect_constant_buffer_type(void) else type2 = type->lpVtbl->GetMemberTypeBySemantic(type, "SV_POSITION"); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -209,7 +209,7 @@ static void test_effect_constant_buffer_type(void) else type2 = type->lpVtbl->GetMemberTypeBySemantic(type, "COLOR0"); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -225,14 +225,14 @@ static void test_effect_constant_buffer_type(void) type2 = type->lpVtbl->GetMemberTypeByIndex(type, 0); hr = type2->lpVtbl->GetDesc(type2, NULL); - ok(hr == E_INVALIDARG, "GetDesc got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); null_type = type->lpVtbl->GetMemberTypeByIndex(type, 3); hr = null_type->lpVtbl->GetDesc(null_type, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_type->lpVtbl->GetDesc(null_type, NULL); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeByName(type, "invalid"); ok(type2 == null_type, "GetMemberTypeByName got wrong type %p, expected %p\n", type2, null_type); @@ -255,7 +255,7 @@ static void test_effect_constant_buffer_type(void) constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 1); v = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, 0); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f3"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT, "Unexpected variable flags %#x.\n", var_desc.Flags); ok(var_desc.BufferOffset == 0x20, "Unexpected buffer offset %#x.\n", var_desc.BufferOffset); @@ -264,14 +264,14 @@ static void test_effect_constant_buffer_type(void) /* Invalid buffer variable */ constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 100); hr = constantbuffer->lpVtbl->GetConstantBuffer(constantbuffer, &buffer); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = constantbuffer->lpVtbl->GetTextureBuffer(constantbuffer, &srv); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -343,10 +343,10 @@ static void test_effect_variable_type(void) } hr = create_effect(fx_test_evt, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", desc.ConstantBuffers); ok(desc.SharedConstantBuffers == 0, "Unexpected shared constant buffers count %u.\n", @@ -359,7 +359,7 @@ static void test_effect_variable_type(void) constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); type = constantbuffer->lpVtbl->GetType(constantbuffer); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "cbuffer") == 0, "TypeName is \"%s\", expected \"cbuffer\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_OBJECT); @@ -376,7 +376,7 @@ static void test_effect_variable_type(void) variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, 0); type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "test1") == 0, "TypeName is \"%s\", expected \"test1\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_STRUCT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_STRUCT); @@ -400,7 +400,7 @@ static void test_effect_variable_type(void) type2 = type->lpVtbl->GetMemberTypeByIndex(type, 0); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -415,7 +415,7 @@ static void test_effect_variable_type(void) type2 = type->lpVtbl->GetMemberTypeByIndex(type, 1); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -430,7 +430,7 @@ static void test_effect_variable_type(void) type2 = type->lpVtbl->GetMemberTypeByIndex(type, 2); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "test") == 0, "TypeName is \"%s\", expected \"test\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_STRUCT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_STRUCT); @@ -451,7 +451,7 @@ static void test_effect_variable_type(void) else type3 = type2->lpVtbl->GetMemberTypeBySemantic(type2, "sv_POSITION"); hr = type3->lpVtbl->GetDesc(type3, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); @@ -471,7 +471,7 @@ static void test_effect_variable_type(void) else type3 = type2->lpVtbl->GetMemberTypeBySemantic(type2, "color0"); hr = type3->lpVtbl->GetDesc(type3, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); @@ -488,27 +488,27 @@ static void test_effect_variable_type(void) type2 = type->lpVtbl->GetMemberTypeByIndex(type, 0); hr = type2->lpVtbl->GetDesc(type2, NULL); - ok(hr == E_INVALIDARG, "GetDesc got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeByIndex(type, 4); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeByName(type, "invalid"); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeByName(type, NULL); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeBySemantic(type, "invalid"); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeBySemantic(type, NULL); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); string = type->lpVtbl->GetMemberName(type, 4); ok(string == NULL, "GetMemberName is \"%s\", expected NULL\n", string); @@ -519,7 +519,7 @@ static void test_effect_variable_type(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -588,10 +588,10 @@ static void test_effect_variable_member(void) } hr = create_effect(fx_test_evm, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -605,7 +605,7 @@ static void test_effect_variable_member(void) constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = constantbuffer->lpVtbl->GetDesc(constantbuffer, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "cb") == 0, "Name is \"%s\", expected \"cb\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -616,16 +616,16 @@ static void test_effect_variable_member(void) null_variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, 1); hr = null_variable->lpVtbl->GetDesc(null_variable, &desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, 0); hr = variable->lpVtbl->GetDesc(variable, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); variable2 = constantbuffer->lpVtbl->GetMemberByName(constantbuffer, "t1"); ok(variable == variable2, "GetMemberByName got %p, expected %p\n", variable2, variable); hr = variable2->lpVtbl->GetDesc(variable2, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "t1") == 0, "Name is \"%s\", expected \"t1\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -649,7 +649,7 @@ static void test_effect_variable_member(void) /* check members of "t1" */ variable2 = variable->lpVtbl->GetMemberByName(variable, "f1"); hr = variable2->lpVtbl->GetDesc(variable2, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f1") == 0, "Name is \"%s\", expected \"f1\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -663,7 +663,7 @@ static void test_effect_variable_member(void) variable2 = variable->lpVtbl->GetMemberByName(variable, "f2"); hr = variable2->lpVtbl->GetDesc(variable2, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f2") == 0, "Name is \"%s\", expected \"f2\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -677,7 +677,7 @@ static void test_effect_variable_member(void) variable2 = variable->lpVtbl->GetMemberByName(variable, "t"); hr = variable2->lpVtbl->GetDesc(variable2, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "t") == 0, "Name is \"%s\", expected \"t\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -692,7 +692,7 @@ static void test_effect_variable_member(void) /* check members of "t" */ variable3 = variable2->lpVtbl->GetMemberByName(variable2, "f3"); hr = variable3->lpVtbl->GetDesc(variable3, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f3") == 0, "Name is \"%s\", expected \"f3\"\n", desc.Name); ok(strcmp(desc.Semantic, "SV_POSITION") == 0, "Semantic is \"%s\", expected \"SV_POSITION\"\n", desc.Semantic); @@ -712,7 +712,7 @@ static void test_effect_variable_member(void) variable3 = variable2->lpVtbl->GetMemberByName(variable2, "f4"); hr = variable3->lpVtbl->GetDesc(variable3, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f4") == 0, "Name is \"%s\", expected \"f4\"\n", desc.Name); ok(strcmp(desc.Semantic, "COLOR0") == 0, "Semantic is \"%s\", expected \"COLOR0\"\n", desc.Semantic); @@ -733,7 +733,7 @@ static void test_effect_variable_member(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -809,10 +809,10 @@ static void test_effect_variable_element(void) } hr = create_effect(fx_test_eve, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -826,7 +826,7 @@ static void test_effect_variable_element(void) constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = constantbuffer->lpVtbl->GetDesc(constantbuffer, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "cb") == 0, "Name is \"%s\", expected \"cb\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -837,7 +837,7 @@ static void test_effect_variable_element(void) variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, 0); hr = variable->lpVtbl->GetDesc(variable, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(parent == constantbuffer, "GetParentConstantBuffer got %p, expected %p\n", @@ -845,7 +845,7 @@ static void test_effect_variable_element(void) variable2 = constantbuffer->lpVtbl->GetMemberByName(constantbuffer, "t1"); hr = variable2->lpVtbl->GetDesc(variable2, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); parent = variable2->lpVtbl->GetParentConstantBuffer(variable2); ok(parent == constantbuffer, "GetParentConstantBuffer got %p, expected %p\n", parent, constantbuffer); @@ -853,7 +853,7 @@ static void test_effect_variable_element(void) /* check variable f1 */ variable3 = variable2->lpVtbl->GetMemberByName(variable2, "f1"); hr = variable3->lpVtbl->GetDesc(variable3, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f1") == 0, "Name is \"%s\", expected \"f1\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -868,7 +868,7 @@ static void test_effect_variable_element(void) type = variable3->lpVtbl->GetType(variable3); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -884,7 +884,7 @@ static void test_effect_variable_element(void) /* check variable f2 */ variable3 = variable2->lpVtbl->GetMemberByName(variable2, "f2"); hr = variable3->lpVtbl->GetDesc(variable3, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)!\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f2") == 0, "Name is \"%s\", expected \"f2\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -899,7 +899,7 @@ static void test_effect_variable_element(void) type = variable3->lpVtbl->GetType(variable3); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -914,7 +914,7 @@ static void test_effect_variable_element(void) variable4 = variable3->lpVtbl->GetElement(variable3, 0); hr = variable4->lpVtbl->GetDesc(variable4, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f2") == 0, "Name is \"%s\", expected \"f2\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -929,7 +929,7 @@ static void test_effect_variable_element(void) type = variable4->lpVtbl->GetType(variable4); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -944,7 +944,7 @@ static void test_effect_variable_element(void) variable4 = variable3->lpVtbl->GetElement(variable3, 1); hr = variable4->lpVtbl->GetDesc(variable4, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f2") == 0, "Name is \"%s\", expected \"f2\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -959,7 +959,7 @@ static void test_effect_variable_element(void) type2 = variable4->lpVtbl->GetType(variable4); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(type == type2, "type(%p) != type2(%p)\n", type, type2); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); @@ -975,7 +975,7 @@ static void test_effect_variable_element(void) variable4 = variable3->lpVtbl->GetElement(variable3, 2); hr = variable4->lpVtbl->GetDesc(variable4, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f2") == 0, "Name is \"%s\", expected \"f2\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -990,7 +990,7 @@ static void test_effect_variable_element(void) type2 = variable4->lpVtbl->GetType(variable4); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(type == type2, "type(%p) != type2(%p)\n", type, type2); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); @@ -1007,7 +1007,7 @@ static void test_effect_variable_element(void) /* check variable t */ variable3 = variable2->lpVtbl->GetMemberByName(variable2, "t"); hr = variable3->lpVtbl->GetDesc(variable3, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)!\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "t") == 0, "Name is \"%s\", expected \"t\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -1022,7 +1022,7 @@ static void test_effect_variable_element(void) type = variable3->lpVtbl->GetType(variable3); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "test") == 0, "TypeName is \"%s\", expected \"test\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_STRUCT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_STRUCT); @@ -1037,7 +1037,7 @@ static void test_effect_variable_element(void) variable4 = variable3->lpVtbl->GetElement(variable3, 0); hr = variable4->lpVtbl->GetDesc(variable4, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "t") == 0, "Name is \"%s\", expected \"t\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -1052,7 +1052,7 @@ static void test_effect_variable_element(void) type = variable4->lpVtbl->GetType(variable4); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "test") == 0, "TypeName is \"%s\", expected \"test\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_STRUCT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_STRUCT); @@ -1067,7 +1067,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 0); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f3") == 0, "Name is \"%s\", expected \"f3\"\n", desc.Name); ok(strcmp(desc.Semantic, "SV_POSITION") == 0, "Semantic is \"%s\", expected \"SV_POSITION\"\n", desc.Semantic); @@ -1081,7 +1081,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1096,7 +1096,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 1); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f4") == 0, "Name is \"%s\", expected \"f4\"\n", desc.Name); ok(strcmp(desc.Semantic, "COLOR0") == 0, "Semantic is \"%s\", expected \"COLOR0\"\n", desc.Semantic); @@ -1110,7 +1110,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1125,7 +1125,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 2); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f5") == 0, "Name is \"%s\", expected \"f5\"\n", desc.Name); ok(strcmp(desc.Semantic, "COLOR1") == 0, "Semantic is \"%s\", expected \"COLOR1\"\n", desc.Semantic); @@ -1139,7 +1139,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1154,7 +1154,7 @@ static void test_effect_variable_element(void) variable4 = variable3->lpVtbl->GetElement(variable3, 1); hr = variable4->lpVtbl->GetDesc(variable4, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "t") == 0, "Name is \"%s\", expected \"t\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -1169,7 +1169,7 @@ static void test_effect_variable_element(void) type = variable4->lpVtbl->GetType(variable4); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "test") == 0, "TypeName is \"%s\", expected \"test\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_STRUCT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_STRUCT); @@ -1184,7 +1184,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 0); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f3") == 0, "Name is \"%s\", expected \"f3\"\n", desc.Name); ok(strcmp(desc.Semantic, "SV_POSITION") == 0, "Semantic is \"%s\", expected \"SV_POSITION\"\n", desc.Semantic); @@ -1198,7 +1198,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1213,7 +1213,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 1); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f4") == 0, "Name is \"%s\", expected \"f4\"\n", desc.Name); ok(strcmp(desc.Semantic, "COLOR0") == 0, "Semantic is \"%s\", expected \"COLOR0\"\n", desc.Semantic); @@ -1227,7 +1227,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1242,7 +1242,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 2); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f5") == 0, "Name is \"%s\", expected \"f5\"\n", desc.Name); ok(strcmp(desc.Semantic, "COLOR1") == 0, "Semantic is \"%s\", expected \"COLOR1\"\n", desc.Semantic); @@ -1256,7 +1256,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1272,7 +1272,7 @@ static void test_effect_variable_element(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -1390,7 +1390,7 @@ static void check_as(ID3D10EffectVariable *variable) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); variable2 = (ID3D10EffectVariable *)variable->lpVtbl->AsConstantBuffer(variable); is_valid = variable2->lpVtbl->IsValid(variable2); @@ -1487,10 +1487,10 @@ static void test_effect_variable_type_class(void) } hr = create_effect(fx_test_evtc, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -1508,7 +1508,7 @@ static void test_effect_variable_type_class(void) /* check constantbuffer cb */ constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = constantbuffer->lpVtbl->GetDesc(constantbuffer, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "cb") == 0, "Name is \"%s\", expected \"cb\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1524,7 +1524,7 @@ static void test_effect_variable_type_class(void) type = constantbuffer->lpVtbl->GetType(constantbuffer); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "cbuffer") == 0, "TypeName is \"%s\", expected \"cbuffer\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1539,7 +1539,7 @@ static void test_effect_variable_type_class(void) variable = constantbuffer->lpVtbl->GetAnnotationByIndex(constantbuffer, 0); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "s") == 0, "Name is \"%s\", expected \"s\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1555,7 +1555,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "String") == 0, "TypeName is \"%s\", expected \"String\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1570,15 +1570,15 @@ static void test_effect_variable_type_class(void) string_var = variable->lpVtbl->AsString(variable); hr = string_var->lpVtbl->GetString(string_var, NULL); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = string_var->lpVtbl->GetString(string_var, &str1); - ok(SUCCEEDED(hr), "GetString failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(str1, "STRING"), "Unexpected value %s.\n", str1); variable = constantbuffer->lpVtbl->GetAnnotationByIndex(constantbuffer, 1); string_var = variable->lpVtbl->AsString(variable); hr = string_var->lpVtbl->GetString(string_var, &str2); - ok(SUCCEEDED(hr), "GetString failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(str2 != str1, "Unexpected string pointer.\n"); ok(!strcmp(str2, "STRING"), "Unexpected value %s.\n", str1); @@ -1586,16 +1586,16 @@ static void test_effect_variable_type_class(void) variable = constantbuffer->lpVtbl->GetAnnotationByIndex(constantbuffer, 2); string_var = variable->lpVtbl->AsString(variable); hr = string_var->lpVtbl->GetString(string_var, NULL); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); str1 = (void *)0xdeadbeef; hr = string_var->lpVtbl->GetString(string_var, &str1); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); ok(str1 == (void *)0xdeadbeef, "Unexpected pointer.\n"); /* check float f */ variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "f") == 0, "Name is \"%s\", expected \"f\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1611,7 +1611,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", td.TypeName); ok(td.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", td.Class, D3D10_SVC_SCALAR); @@ -1627,7 +1627,7 @@ static void test_effect_variable_type_class(void) /* check int2 i */ variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "i") == 0, "Name is \"%s\", expected \"i\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1643,7 +1643,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "int2") == 0, "TypeName is \"%s\", expected \"int2\"\n", td.TypeName); ok(td.Class == D3D10_SVC_VECTOR, "Class is %x, expected %x\n", td.Class, D3D10_SVC_VECTOR); @@ -1659,7 +1659,7 @@ static void test_effect_variable_type_class(void) /* check uint2x3 u */ variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "u") == 0, "Name is \"%s\", expected \"u\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1675,7 +1675,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "uint2x3") == 0, "TypeName is \"%s\", expected \"uint2x3\"\n", td.TypeName); ok(td.Class == D3D10_SVC_MATRIX_COLUMNS, "Class is %x, expected %x\n", td.Class, D3D10_SVC_MATRIX_COLUMNS); @@ -1691,7 +1691,7 @@ static void test_effect_variable_type_class(void) /* check bool2x3 b */ variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "b") == 0, "Name is \"%s\", expected \"b\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1707,7 +1707,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "bool2x3") == 0, "TypeName is \"%s\", expected \"bool2x3\"\n", td.TypeName); ok(td.Class == D3D10_SVC_MATRIX_ROWS, "Class is %x, expected %x\n", td.Class, D3D10_SVC_MATRIX_ROWS); @@ -1723,7 +1723,7 @@ static void test_effect_variable_type_class(void) /* check BlendState blend */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "blend") == 0, "Name is \"%s\", expected \"blend\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1739,7 +1739,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "BlendState") == 0, "TypeName is \"%s\", expected \"BlendState\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1755,7 +1755,7 @@ static void test_effect_variable_type_class(void) /* check DepthStencilState depthstencil */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "depthstencil") == 0, "Name is \"%s\", expected \"depthstencil\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1771,7 +1771,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "DepthStencilState") == 0, "TypeName is \"%s\", expected \"DepthStencilState\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1787,7 +1787,7 @@ static void test_effect_variable_type_class(void) /* check RasterizerState rast */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "rast") == 0, "Name is \"%s\", expected \"rast\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1803,7 +1803,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "RasterizerState") == 0, "TypeName is \"%s\", expected \"RasterizerState\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1819,7 +1819,7 @@ static void test_effect_variable_type_class(void) /* check SamplerState sam */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "sam") == 0, "Name is \"%s\", expected \"sam\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1835,7 +1835,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "SamplerState") == 0, "TypeName is \"%s\", expected \"SamplerState\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1851,7 +1851,7 @@ static void test_effect_variable_type_class(void) /* check RenderTargetView rtv */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "rtv") == 0, "Name is \"%s\", expected \"rtv\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1867,7 +1867,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "RenderTargetView") == 0, "TypeName is \"%s\", expected \"RenderTargetView\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1883,7 +1883,7 @@ static void test_effect_variable_type_class(void) /* check DepthStencilView dsv */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "dsv") == 0, "Name is \"%s\", expected \"dsv\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1899,7 +1899,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "DepthStencilView") == 0, "TypeName is \"%s\", expected \"DepthStencilView\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1915,7 +1915,7 @@ static void test_effect_variable_type_class(void) /* check Texture t0 */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(vd.Name, "t0"), "Unexpected Name \"%s\".\n", vd.Name); ok(!vd.Semantic, "Unexpected Semantic \"%s\".\n", vd.Semantic); @@ -1931,7 +1931,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(td.TypeName, "texture"), "Unexpected TypeName \"%s\".\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Unexpected Class %x.\n", td.Class); @@ -1947,7 +1947,7 @@ static void test_effect_variable_type_class(void) /* check Texture1D t1 */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t1") == 0, "Name is \"%s\", expected \"t1\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1963,7 +1963,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture1D") == 0, "TypeName is \"%s\", expected \"Texture1D\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1979,7 +1979,7 @@ static void test_effect_variable_type_class(void) /* check Texture1DArray t1a */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t1a") == 0, "Name is \"%s\", expected \"t1a\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1995,7 +1995,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture1DArray") == 0, "TypeName is \"%s\", expected \"Texture1DArray\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2011,7 +2011,7 @@ static void test_effect_variable_type_class(void) /* check Texture2D t2 */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t2") == 0, "Name is \"%s\", expected \"t2\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2027,7 +2027,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture2D") == 0, "TypeName is \"%s\", expected \"Texture2D\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2043,7 +2043,7 @@ static void test_effect_variable_type_class(void) /* check Texture2DMS t2dms */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t2dms") == 0, "Name is \"%s\", expected \"t2dms\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2059,7 +2059,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture2DMS") == 0, "TypeName is \"%s\", expected \"Texture2DMS\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2075,7 +2075,7 @@ static void test_effect_variable_type_class(void) /* check Texture2DArray t2a */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t2a") == 0, "Name is \"%s\", expected \"t2a\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2091,7 +2091,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture2DArray") == 0, "TypeName is \"%s\", expected \"Texture2DArray\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2107,7 +2107,7 @@ static void test_effect_variable_type_class(void) /* check Texture2DMSArray t2dmsa */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t2dmsa") == 0, "Name is \"%s\", expected \"t2dmsa\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2123,7 +2123,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture2DMSArray") == 0, "TypeName is \"%s\", expected \"TTexture2DMSArray\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2139,7 +2139,7 @@ static void test_effect_variable_type_class(void) /* check Texture3D t3 */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t3") == 0, "Name is \"%s\", expected \"t3\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2155,7 +2155,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture3D") == 0, "TypeName is \"%s\", expected \"Texture3D\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2171,7 +2171,7 @@ static void test_effect_variable_type_class(void) /* check TextureCube tq */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "tq") == 0, "Name is \"%s\", expected \"tq\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2187,7 +2187,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "TextureCube") == 0, "TypeName is \"%s\", expected \"TextureCube\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2203,7 +2203,7 @@ static void test_effect_variable_type_class(void) /* check GeometryShader gs[2] */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "gs") == 0, "Name is \"%s\", expected \"gs\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2219,7 +2219,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "GeometryShader") == 0, "TypeName is \"%s\", expected \"GeometryShader\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2235,7 +2235,7 @@ static void test_effect_variable_type_class(void) /* check PixelShader ps */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "ps") == 0, "Name is \"%s\", expected \"ps\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2251,7 +2251,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "PixelShader") == 0, "TypeName is \"%s\", expected \"PixelShader\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2267,7 +2267,7 @@ static void test_effect_variable_type_class(void) /* check VertexShader vs[1] */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "vs") == 0, "Name is \"%s\", expected \"vs\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2283,7 +2283,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "VertexShader") == 0, "TypeName is \"%s\", expected \"VertexShader\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2299,7 +2299,7 @@ static void test_effect_variable_type_class(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -2579,10 +2579,10 @@ static void test_effect_constant_buffer_stride(void) } hr = create_effect(fx_test_ecbs, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 15, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -2600,7 +2600,7 @@ static void test_effect_constant_buffer_stride(void) type = constantbuffer->lpVtbl->GetType(constantbuffer); hr = type->lpVtbl->GetDesc(type, &tdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(strcmp(tdesc.TypeName, "cbuffer") == 0, "TypeName is \"%s\", expected \"cbuffer\"\n", tdesc.TypeName); ok(tdesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", tdesc.Class, D3D10_SVC_OBJECT); @@ -2617,7 +2617,7 @@ static void test_effect_constant_buffer_stride(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -2948,10 +2948,10 @@ static void test_effect_local_shader(void) } hr = create_effect(fx_local_shader, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed!\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 0, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -2998,22 +2998,22 @@ if (0) /* check for invalid arguments */ hr = null_pass->lpVtbl->GetVertexShaderDesc(null_pass, NULL); - ok(hr == E_FAIL, "GetVertexShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_pass->lpVtbl->GetVertexShaderDesc(null_pass, &pdesc); - ok(hr == E_FAIL, "GetVertexShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_pass->lpVtbl->GetPixelShaderDesc(null_pass, NULL); - ok(hr == E_FAIL, "GetPixelShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_pass->lpVtbl->GetPixelShaderDesc(null_pass, &pdesc); - ok(hr == E_FAIL, "GetPixelShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_pass->lpVtbl->GetGeometryShaderDesc(null_pass, NULL); - ok(hr == E_FAIL, "GetGeometryShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_pass->lpVtbl->GetGeometryShaderDesc(null_pass, &pdesc); - ok(hr == E_FAIL, "GetGeometryShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* check valid pass arguments */ t = effect->lpVtbl->GetTechniqueByIndex(effect, 0); @@ -3023,19 +3023,19 @@ if (0) ok(p2 == p, "GetPassByName got %p, expected %p\n", p2, p); hr = p->lpVtbl->GetVertexShaderDesc(p, NULL); - ok(hr == E_INVALIDARG, "GetVertexShaderDesc got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->GetPixelShaderDesc(p, NULL); - ok(hr == E_INVALIDARG, "GetPixelShaderDesc got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->GetGeometryShaderDesc(p, NULL); - ok(hr == E_INVALIDARG, "GetGeometryShaderDesc got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); v = effect->lpVtbl->GetVariableByName(effect, "p"); ps = v->lpVtbl->AsShader(v); hr = ps->lpVtbl->GetPixelShader(ps, 0, &ps_d3d); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* get the null_shader_variable */ v = effect->lpVtbl->GetVariableByIndex(effect, 10000); @@ -3046,9 +3046,9 @@ if (0) /* Pass without Set*Shader() instructions */ hr = D3D10StateBlockMaskDisableAll(&mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->ComputeStateBlockMask(p, &mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_VS, 0); ok(!ret, "Unexpected mask.\n"); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_PS, 0); @@ -3058,52 +3058,52 @@ if (0) ID3D10Device_PSSetShader(device, ps_d3d); hr = p->lpVtbl->Apply(p, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShader(device, &ps_d3d_2); ok(ps_d3d_2 == ps_d3d, "Unexpected shader object.\n"); ID3D10PixelShader_Release(ps_d3d_2); hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_shader, "Got %p, expected %p\n", pdesc.pShaderVariable, null_shader); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(hr == E_FAIL, "GetDesc failed (%x)\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_shader, "Got %p, expected %p\n", pdesc.pShaderVariable, null_shader); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(hr == E_FAIL, "GetDesc failed (%x)\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_shader, "Got %p, expected %p\n", pdesc.pShaderVariable, null_shader); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(hr == E_FAIL, "GetDesc failed (%x)\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* pass 1 */ p = t->lpVtbl->GetPassByIndex(t, 1); ID3D10Device_PSSetShader(device, ps_d3d); hr = p->lpVtbl->Apply(p, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShader(device, &ps_d3d_2); ok(!ps_d3d_2, "Unexpected shader object.\n"); /* pass 1 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); null_anon_vs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3120,7 +3120,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "vertexshader") == 0, "TypeName is \"%s\", expected \"vertexhader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3134,12 +3134,12 @@ if (0) /* pass 1 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); null_anon_ps = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3156,7 +3156,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "pixelshader") == 0, "TypeName is \"%s\", expected \"pixelshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3170,12 +3170,12 @@ if (0) /* pass 1 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); null_anon_gs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(hr == S_OK, "GetDesc failed (%x) expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3192,7 +3192,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "geometryshader") == 0, "TypeName is \"%s\", expected \"geometryshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3206,9 +3206,9 @@ if (0) /* Pass is using Set*Shader(NULL) */ hr = D3D10StateBlockMaskDisableAll(&mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->ComputeStateBlockMask(p, &mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_VS, 0); ok(ret, "Unexpected mask.\n"); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_PS, 0); @@ -3221,12 +3221,12 @@ if (0) /* pass 2 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_anon_vs, "Got %p, expected %p\n", pdesc.pShaderVariable, null_anon_vs); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3237,12 +3237,12 @@ if (0) /* pass 2 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_anon_ps, "Got %p, expected %p\n", pdesc.pShaderVariable, null_anon_ps); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3253,12 +3253,12 @@ if (0) /* pass 2 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_anon_gs, "Got %p, expected %p\n", pdesc.pShaderVariable, null_anon_gs); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(hr == S_OK, "GetDesc failed (%x) expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3272,12 +3272,12 @@ if (0) /* pass 3 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p3_anon_vs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3294,7 +3294,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "vertexshader") == 0, "TypeName is \"%s\", expected \"vertexshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3308,12 +3308,12 @@ if (0) /* pass 3 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p3_anon_ps = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3330,7 +3330,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "pixelshader") == 0, "TypeName is \"%s\", expected \"pixelshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3344,12 +3344,12 @@ if (0) /* pass 3 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p3_anon_gs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3366,7 +3366,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "geometryshader") == 0, "TypeName is \"%s\", expected \"geometryshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3383,12 +3383,12 @@ if (0) /* pass 4 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable != p3_anon_vs, "Got %p, expected %p\n", pdesc.pShaderVariable, p3_anon_vs); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3405,7 +3405,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "vertexshader") == 0, "TypeName is \"%s\", expected \"vertexshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3419,12 +3419,12 @@ if (0) /* pass 4 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable != p3_anon_ps, "Got %p, expected %p\n", pdesc.pShaderVariable, p3_anon_ps); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3441,7 +3441,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "pixelshader") == 0, "TypeName is \"%s\", expected \"pixelshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3455,12 +3455,12 @@ if (0) /* pass 4 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable != p3_anon_gs, "Got %p, expected %p\n", pdesc.pShaderVariable, p3_anon_gs); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %x\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3477,7 +3477,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "geometryshader") == 0, "TypeName is \"%s\", expected \"geometryshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3494,11 +3494,11 @@ if (0) /* pass 5 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "v0") == 0, "Name is \"%s\", expected \"v0\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3515,7 +3515,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "VertexShader") == 0, "TypeName is \"%s\", expected \"VertexShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3529,11 +3529,11 @@ if (0) /* pass 5 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "p0") == 0, "Name is \"%s\", expected \"p0\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3550,7 +3550,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "PixelShader") == 0, "TypeName is \"%s\", expected \"PixelShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3564,11 +3564,11 @@ if (0) /* pass 5 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "g0") == 0, "Name is \"%s\", expected \"g0\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3585,7 +3585,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "GeometryShader") == 0, "TypeName is \"%s\", expected \"GeometryShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3602,12 +3602,12 @@ if (0) /* pass 6 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p6_vs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "v") == 0, "Name is \"%s\", expected \"v\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3624,7 +3624,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "VertexShader") == 0, "TypeName is \"%s\", expected \"VertexShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3638,18 +3638,18 @@ if (0) /* Get input signature from vertex shader set from array element. */ hr = p->lpVtbl->GetDesc(p, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!pass_desc.pIAInputSignature, "Expected input signature.\n"); ok(pass_desc.IAInputSignatureSize == 88, "Unexpected input signature size.\n"); /* pass 6 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p6_ps = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "p") == 0, "Name is \"%s\", expected \"p\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3666,7 +3666,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "PixelShader") == 0, "TypeName is \"%s\", expected \"PixelShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3680,12 +3680,12 @@ if (0) /* pass 6 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p6_gs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "g") == 0, "Name is \"%s\", expected \"g\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3702,7 +3702,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "GeometryShader") == 0, "TypeName is \"%s\", expected \"GeometryShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3719,12 +3719,12 @@ if (0) /* pass 7 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == p6_vs, "Got %p, expected %p\n", pdesc.pShaderVariable, p6_vs); ok(pdesc.ShaderIndex == 1, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 1); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "v") == 0, "Name is \"%s\", expected \"v\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3741,7 +3741,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "VertexShader") == 0, "TypeName is \"%s\", expected \"VertexShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3755,12 +3755,12 @@ if (0) /* pass 7 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == p6_ps, "Got %p, expected %p\n", pdesc.pShaderVariable, p6_ps); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "p") == 0, "Name is \"%s\", expected \"p\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3777,7 +3777,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "PixelShader") == 0, "TypeName is \"%s\", expected \"PixelShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3791,12 +3791,12 @@ if (0) /* pass 7 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == p6_gs, "Got %p, expected %p\n", pdesc.pShaderVariable, p6_gs); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "g") == 0, "Name is \"%s\", expected \"g\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3813,7 +3813,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "GeometryShader") == 0, "TypeName is \"%s\", expected \"GeometryShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3830,9 +3830,9 @@ if (0) /* Inline variant */ p = t->lpVtbl->GetPassByName(t, "P8"); hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pdesc.pShaderVariable->lpVtbl->GetShaderDesc(pdesc.pShaderVariable, 0, &shaderdesc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.IsInline, "Unexpected inline flag.\n"); ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.y"), "Unexpected stream output declaration %s.\n", shaderdesc.SODecl); @@ -3840,7 +3840,7 @@ if (0) v = effect->lpVtbl->GetVariableByName(effect, "g_so"); gs = v->lpVtbl->AsShader(v); hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.x; $Skip.x; SV_POSITION.gb"), "Unexpected stream output declaration %s.\n", shaderdesc.SODecl); @@ -3850,25 +3850,25 @@ if (0) ps = v->lpVtbl->AsShader(v); hr = ps->lpVtbl->GetOutputSignatureElementDesc(ps, 0, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_Target"), "Unexpected semantic %s.\n", sign.SemanticName); todo_wine ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); hr = ps->lpVtbl->GetOutputSignatureElementDesc(ps, 4, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", sign.SystemValueType); hr = ps->lpVtbl->GetInputSignatureElementDesc(ps, 0, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", sign.SystemValueType); hr = ps->lpVtbl->GetInputSignatureElementDesc(ps, 4, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); @@ -3876,24 +3876,24 @@ if (0) vs = v->lpVtbl->AsShader(v); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 0, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", sign.SystemValueType); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 1, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", sign.SystemValueType); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 0, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 1, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); @@ -3902,31 +3902,31 @@ if (0) vs = v->lpVtbl->AsShader(v); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 0, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 1, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 2, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 3, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", sign.SystemValueType); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 0, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 1, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 2, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 3, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); @@ -3935,7 +3935,7 @@ if (0) ID3D10PixelShader_Release(ps_d3d); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -3989,10 +3989,10 @@ static void test_effect_get_variable_by(void) } hr = create_effect(fx_test_egvb, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 2, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -4091,7 +4091,7 @@ static void test_effect_get_variable_by(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -4423,9 +4423,9 @@ static void create_effect_texture_resource(ID3D10Device *device, ID3D10ShaderRes tex_desc.MiscFlags = 0; hr = ID3D10Device_CreateTexture2D(device, &tex_desc, NULL, tex); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)*tex, NULL, srv); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); } static void test_effect_state_groups(void) @@ -4465,10 +4465,10 @@ static void test_effect_state_groups(void) } hr = create_effect(fx_test_state_groups, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(!effect_desc.ConstantBuffers, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -4498,7 +4498,7 @@ static void test_effect_state_groups(void) ok(sampler_desc.MinLOD == 6.0f, "Got unexpected MinLOD %.8e.\n", sampler_desc.MinLOD); ok(sampler_desc.MaxLOD == 5.0f, "Got unexpected MaxLOD %.8e.\n", sampler_desc.MaxLOD); hr = s->lpVtbl->GetSampler(s, 0, &sampler); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10SamplerState_GetDesc(sampler, &sampler_desc); ok(sampler_desc.Filter == D3D10_FILTER_MIN_MAG_MIP_LINEAR, "Got unexpected Filter %#x.\n", sampler_desc.Filter); ID3D10SamplerState_Release(sampler); @@ -4506,7 +4506,7 @@ static void test_effect_state_groups(void) s->lpVtbl->GetBackingStore(s, 1, &sampler_desc); ok(sampler_desc.AddressU == D3D10_TEXTURE_ADDRESS_MIRROR, "Got unexpected AddressU %#x.\n", sampler_desc.AddressU); hr = s->lpVtbl->GetSampler(s, 1, &sampler); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10SamplerState_GetDesc(sampler, &sampler_desc); ok(sampler_desc.AddressU == D3D10_TEXTURE_ADDRESS_MIRROR, "Got unexpected AddressU %#x.\n", sampler_desc.AddressU); ID3D10SamplerState_Release(sampler); @@ -4531,14 +4531,14 @@ static void test_effect_state_groups(void) ok(blend_desc.RenderTargetWriteMask[7] == 0x7, "Got unexpected RenderTargetWriteMask[7] %#x.\n", blend_desc.RenderTargetWriteMask[7]); hr = b->lpVtbl->GetBlendState(b, 0, &blend_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10BlendState_GetDesc(blend_state, &blend_desc); ok(blend_desc.SrcBlend == D3D10_BLEND_ONE, "Got unexpected SrcBlend %#x.\n", blend_desc.SrcBlend); ID3D10BlendState_Release(blend_state); b->lpVtbl->GetBackingStore(b, 1, &blend_desc); ok(blend_desc.SrcBlend == D3D10_BLEND_SRC_COLOR, "Got unexpected SrcBlend %#x.\n", blend_desc.SrcBlend); hr = b->lpVtbl->GetBlendState(b, 1, &blend_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10BlendState_GetDesc(blend_state, &blend_desc); /* We can't check the SrcBlend value from the ID3D10BlendState object * descriptor because BlendEnable[0] is effectively false, which forces @@ -4574,14 +4574,14 @@ static void test_effect_state_groups(void) ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_GREATER_EQUAL, "Got unexpected BackFaceStencilFunc %#x.\n", ds_desc.BackFace.StencilFunc); hr = d->lpVtbl->GetDepthStencilState(d, 0, &ds_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10DepthStencilState_GetDesc(ds_state, &ds_desc); ok(ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); ID3D10DepthStencilState_Release(ds_state); d->lpVtbl->GetBackingStore(d, 1, &ds_desc); ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); hr = d->lpVtbl->GetDepthStencilState(d, 1, &ds_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10DepthStencilState_GetDesc(ds_state, &ds_desc); ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); ID3D10DepthStencilState_Release(ds_state); @@ -4603,7 +4603,7 @@ static void test_effect_state_groups(void) ok(rast_desc.AntialiasedLineEnable, "Got unexpected AntialiasedLineEnable %#x.\n", rast_desc.AntialiasedLineEnable); hr = r->lpVtbl->GetRasterizerState(r, 0, &rast_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10RasterizerState_GetDesc(rast_state, &rast_desc); ok(rast_desc.CullMode == D3D10_CULL_FRONT, "Got unexpected CullMode %#x.\n", rast_desc.CullMode); ID3D10RasterizerState_Release(rast_state); @@ -4611,7 +4611,7 @@ static void test_effect_state_groups(void) r->lpVtbl->GetBackingStore(r, 1, &rast_desc); ok(rast_desc.CullMode == D3D10_CULL_BACK, "Got unexpected CullMode %#x.\n", rast_desc.CullMode); hr = r->lpVtbl->GetRasterizerState(r, 1, &rast_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10RasterizerState_GetDesc(rast_state, &rast_desc); ok(rast_desc.CullMode == D3D10_CULL_BACK, "Got unexpected CullMode %#x.\n", rast_desc.CullMode); ID3D10RasterizerState_Release(rast_state); @@ -4621,7 +4621,7 @@ static void test_effect_state_groups(void) pass = technique->lpVtbl->GetPassByName(technique, "pass0"); ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(SUCCEEDED(hr), "Failed to get pass desc, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(pass_desc.Name, "pass0"), "Got unexpected Name \"%s\".\n", pass_desc.Name); ok(!pass_desc.Annotations, "Got unexpected Annotations %#x.\n", pass_desc.Annotations); ok(!pass_desc.pIAInputSignature, "Got unexpected pIAInputSignature %p.\n", pass_desc.pIAInputSignature); @@ -4633,9 +4633,9 @@ static void test_effect_state_groups(void) ok(pass_desc.BlendFactor[3] == 0.8f, "Got unexpected BlendFactor[3] %.8e.\n", pass_desc.BlendFactor[3]); hr = D3D10StateBlockMaskDisableAll(&mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->ComputeStateBlockMask(pass, &mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_RS_RASTERIZER_STATE, 0); ok(ret, "Unexpected mask.\n"); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_OM_DEPTH_STENCIL_STATE, 0); @@ -4644,7 +4644,7 @@ static void test_effect_state_groups(void) ok(ret, "Unexpected mask.\n"); hr = pass->lpVtbl->Apply(pass, 0); - ok(SUCCEEDED(hr), "Failed to apply pass, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); ID3D10BlendState_GetDesc(blend_state, &blend_desc); @@ -4722,15 +4722,15 @@ static void test_effect_state_groups(void) create_effect_texture_resource(device, &srv0, &tex0); hr = D3D10StateBlockMaskDisableAll(&mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->ComputeStateBlockMask(pass, &mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_VS_SHADER_RESOURCES, 0); ok(!ret, "Unexpected mask.\n"); ID3D10Device_PSSetShaderResources(device, 0, 1, &srv0); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShaderResources(device, 0, 1, &srv1); ok(!srv1, "Unexpected resource pointer.\n"); @@ -4744,7 +4744,7 @@ static void test_effect_state_groups(void) ID3D10Device_OMSetDepthStencilState(device, ds_state, 0); ID3D10Device_OMSetBlendState(device, blend_state, NULL, 0); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetDepthStencilState(device, &ds_state2, &stencil_ref); ok(!ds_state2, "Unexpected depth stencil state.\n"); ID3D10Device_OMGetBlendState(device, &blend_state2, blend_factor, &sample_mask); @@ -4755,7 +4755,7 @@ static void test_effect_state_groups(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -4820,10 +4820,10 @@ static void test_effect_state_group_defaults(void) } hr = create_effect(fx_test_state_group_defaults, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 0, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -4924,7 +4924,7 @@ static void test_effect_state_group_defaults(void) pass = technique->lpVtbl->GetPassByName(technique, "pass0"); ok(pass->lpVtbl->IsValid(pass), "Failed to get pass.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(SUCCEEDED(hr), "Failed to get pass desc, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(pass_desc.Name, "pass0"), "Got unexpected Name \"%s\".\n", pass_desc.Name); ok(pass_desc.Annotations == 1, "Got unexpected Annotations %u.\n", pass_desc.Annotations); ok(!pass_desc.pIAInputSignature, "Got unexpected pIAInputSignature %p.\n", pass_desc.pIAInputSignature); @@ -4938,7 +4938,7 @@ static void test_effect_state_group_defaults(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -4987,68 +4987,68 @@ static void test_scalar_methods(ID3D10EffectScalarVariable *var, D3D10_SHADER_VA HRESULT hr; hr = var->lpVtbl->SetFloat(var, 5.0f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloat(var, &ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_f = type == D3D10_SVT_BOOL ? -1.0f : 5.0f; ok(ret_f == expected_f, "Variable %s, got unexpected value %.8e.\n", name, ret_f); hr = var->lpVtbl->GetInt(var, &ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i = type == D3D10_SVT_BOOL ? -1 : 5; ok(ret_i == expected_i, "Variable %s, got unexpected value %#x.\n", name, ret_i); hr = var->lpVtbl->GetBool(var, &ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_b == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b); hr = var->lpVtbl->SetInt(var, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloat(var, &ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_f = type == D3D10_SVT_BOOL ? -1.0f : 2.0f; ok(ret_f == expected_f, "Variable %s, got unexpected value %.8e.\n", name, ret_f); hr = var->lpVtbl->GetInt(var, &ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i = type == D3D10_SVT_BOOL ? -1 : 2; ok(ret_i == expected_i, "Variable %s, got unexpected value %#x.\n", name, ret_i); hr = var->lpVtbl->GetBool(var, &ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_b == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b); hr = var->lpVtbl->SetBool(var, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloat(var, &ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_f == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f); hr = var->lpVtbl->GetInt(var, &ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_i == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i); hr = var->lpVtbl->GetBool(var, &ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_b = type == D3D10_SVT_BOOL ? 1 : -1; ok(ret_b == expected_b, "Variable %s, got unexpected value %#x.\n", name, ret_b); hr = var->lpVtbl->SetBool(var, 32); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloat(var, &ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_f == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f); hr = var->lpVtbl->GetInt(var, &ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_i == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i); hr = var->lpVtbl->GetBool(var, &ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_b = type == D3D10_SVT_BOOL ? 32 : -1; ok(ret_b == expected_b, "Variable %s, got unexpected value %#x.\n", name, ret_b); } @@ -5064,10 +5064,10 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA set_f[0] = 10.0f; set_f[1] = 20.0f; hr = var->lpVtbl->SetFloatArray(var, set_f, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatArray(var, ret_f, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : set_f[i]; @@ -5075,7 +5075,7 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA } hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : (int)set_f[i]; @@ -5083,16 +5083,16 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA } hr = var->lpVtbl->GetBoolArray(var, ret_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); set_i[0] = 5; set_i[1] = 6; hr = var->lpVtbl->SetIntArray(var, set_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatArray(var, ret_f, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : (float)set_i[i]; @@ -5100,7 +5100,7 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA } hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : set_i[i]; @@ -5108,26 +5108,26 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA } hr = var->lpVtbl->GetBoolArray(var, ret_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); set_b[0] = 1; set_b[1] = 1; hr = var->lpVtbl->SetBoolArray(var, set_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatArray(var, ret_f, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_f[i] == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_i[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolArray(var, ret_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_b = type == D3D10_SVT_BOOL ? 1 : -1; @@ -5136,20 +5136,20 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA set_b[0] = 10; set_b[1] = 20; hr = var->lpVtbl->SetBoolArray(var, set_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatArray(var, ret_f, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_f[i] == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_i[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolArray(var, ret_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_b = type == D3D10_SVT_BOOL ? set_b[i] : -1; @@ -5159,15 +5159,15 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA /* Array offset tests. Offset argument goes unused for scalar arrays. */ set_i[0] = 0; set_i[1] = 0; hr = var->lpVtbl->SetIntArray(var, set_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); /* After this, if offset is in use, return should be { 0, 5 }. */ set_i[0] = 5; hr = var->lpVtbl->SetIntArray(var, set_i, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_b_a[0] = -1; expected_b_a[1] = 0; expected_i_a[0] = 5; expected_i_a[1] = 0; for (i = 0; i < 2; ++i) @@ -5179,29 +5179,29 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA /* Test the offset on GetArray methods. If offset was in use, we'd get * back 5 given that the variable was previously set to { 0, 5 }. */ hr = var->lpVtbl->GetIntArray(var, ret_i, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i = type == D3D10_SVT_BOOL ? -1 : 5; ok(ret_i[0] == expected_i, "Variable %s, got unexpected value %#x.\n", name, ret_i[0]); /* Try setting offset larger than number of elements. */ set_i[0] = 0; set_i[1] = 0; hr = var->lpVtbl->SetIntArray(var, set_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); set_i[0] = 1; hr = var->lpVtbl->SetIntArray(var, set_i, 6, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); /* Since offset goes unused, a larger offset than the number of elements * in the array should have no effect. */ hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i = type == D3D10_SVT_BOOL ? -1 : 1; ok(ret_i[0] == expected_i, "Variable %s, got unexpected value %#x.\n", name, ret_i[0]); memset(ret_i, 0, sizeof(ret_i)); hr = var->lpVtbl->GetIntArray(var, ret_i, 6, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i = type == D3D10_SVT_BOOL ? -1 : 1; ok(ret_i[0] == expected_i, "Variable %s, got unexpected value %#x.\n", name, ret_i[0]); @@ -5211,11 +5211,11 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA * ends up writing over into the adjacent variables in the local buffer. */ set_i[0] = 1; set_i[1] = 2; set_i[2] = 3; set_i[3] = 4; set_i[4] = 5; set_i[5] = 6; hr = var->lpVtbl->SetIntArray(var, set_i, 0, 6); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(ret_i, 0, sizeof(ret_i)); hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 6); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i_a[0] = 1; expected_i_a[1] = 2; expected_i_a[2] = 0; expected_i_a[3] = 0; expected_i_a[4] = 0; expected_i_a[5] = 0; @@ -5267,10 +5267,10 @@ static void test_effect_scalar_variable(void) } hr = create_effect(fx_test_scalar_variable, 0, device, NULL, &effect); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -5290,7 +5290,7 @@ static void test_effect_scalar_variable(void) var = effect->lpVtbl->GetVariableByName(effect, tests[i].name); type = var->lpVtbl->GetType(var); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", tests[i].name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", tests[i].name, hr); ok(type_desc.Type == tests[i].type, "Variable %s, got unexpected type %#x.\n", tests[i].name, type_desc.Type); s_v = var->lpVtbl->AsScalar(var); @@ -5303,22 +5303,22 @@ static void test_effect_scalar_variable(void) var = effect->lpVtbl->GetVariableByName(effect, "f0"); s_v = var->lpVtbl->AsScalar(var); hr = s_v->lpVtbl->SetFloat(s_v, 1.0f); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); var2 = effect->lpVtbl->GetVariableByName(effect, "f_a"); var2 = var2->lpVtbl->GetElement(var2, 0); s_v2 = var->lpVtbl->AsScalar(var2); hr = s_v2->lpVtbl->SetFloat(s_v2, 2.0f); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = s_v->lpVtbl->GetFloat(s_v, &f); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 1.0f, "Unexpected value %f.\n", f); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -5381,10 +5381,10 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA set_f[0] = 1.0f; set_f[1] = 2.0f; set_f[2] = 3.0f; set_f[3] = 4.0f; hr = var->lpVtbl->SetFloatVector(var, set_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVector(var, ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : set_f[i]; @@ -5392,7 +5392,7 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA } hr = var->lpVtbl->GetIntVector(var, ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : (int)set_f[i]; @@ -5400,16 +5400,16 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA } hr = var->lpVtbl->GetBoolVector(var, ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); set_i[0] = 5; set_i[1] = 6; set_i[2] = 7; set_i[3] = 8; hr = var->lpVtbl->SetIntVector(var, set_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVector(var, ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : (float)set_i[i]; @@ -5417,7 +5417,7 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA } hr = var->lpVtbl->GetIntVector(var, ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : set_i[i]; @@ -5425,28 +5425,28 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA } hr = var->lpVtbl->GetBoolVector(var, ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); set_b[0] = 1; set_b[1] = 0; set_b[2] = 1; set_b[3] = 0; hr = var->lpVtbl->SetBoolVector(var, set_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVector(var, ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_f_v[0] = -1.0f; expected_f_v[1] = 0.0f; expected_f_v[2] = -1.0f; expected_f_v[3] = 0.0f; for (i = 0; i < components; ++i) ok(ret_f[i] == expected_f_v[i], "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVector(var, ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i_v[0] = -1; expected_i_v[1] = 0; expected_i_v[2] = -1; expected_i_v[3] = 0; for (i = 0; i < components; ++i) ok(ret_i[i] == expected_i_v[i], "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVector(var, ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_b = type == D3D10_SVT_BOOL ? set_b[i] : expected_i_v[i]; @@ -5455,20 +5455,20 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA set_b[0] = 5; set_b[1] = 10; set_b[2] = 15; set_b[3] = 20; hr = var->lpVtbl->SetBoolVector(var, set_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVector(var, ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_f[i] == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVector(var, ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_i[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVector(var, ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_b = type == D3D10_SVT_BOOL ? set_b[i] : -1; @@ -5489,10 +5489,10 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA set_f[4] = 5.0f; set_f[5] = 6.0f; set_f[6] = 7.0f; set_f[7] = 8.0f; set_f[8] = 9.0f; hr = var->lpVtbl->SetFloatVectorArray(var, set_f, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : set_f[i]; @@ -5500,7 +5500,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA } hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : (int)set_f[i]; @@ -5508,7 +5508,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA } hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); @@ -5516,10 +5516,10 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA set_i[4] = 14; set_i[5] = 15; set_i[6] = 16; set_i[7] = 17; set_i[8] = 18; hr = var->lpVtbl->SetIntVectorArray(var, set_i, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : (float)set_i[i]; @@ -5527,7 +5527,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA } hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : set_i[i]; @@ -5535,7 +5535,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA } hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); @@ -5543,10 +5543,10 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA set_b[4] = 1; set_b[5] = 0; set_b[6] = 0; set_b[7] = 1; set_b[8] = 1; hr = var->lpVtbl->SetBoolVectorArray(var, set_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_f_a[0] = -1.0f; expected_f_a[1] = 0.0f; expected_f_a[2] = -1.0f; expected_f_a[3] = -1.0f; expected_f_a[4] = -1.0f; expected_f_a[5] = 0.0f; expected_f_a[6] = 0.0f; expected_f_a[7] = -1.0f; expected_f_a[8] = -1.0f; @@ -5554,7 +5554,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA ok(ret_f[i] == expected_f_a[i], "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i_a[0] = -1; expected_i_a[1] = 0; expected_i_a[2] = -1; expected_i_a[3] = -1; expected_i_a[4] = -1; expected_i_a[5] = 0; expected_i_a[6] = 0; expected_i_a[7] = -1; expected_i_a[8] = -1; @@ -5562,7 +5562,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA ok(ret_i[i] == expected_i_a[i], "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_b = type == D3D10_SVT_BOOL ? set_b[i] : expected_i_a[i]; @@ -5573,20 +5573,20 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA set_b[4] = 25; set_b[5] = 30; set_b[6] = 35; set_b[7] = 40; set_b[8] = 45; hr = var->lpVtbl->SetBoolVectorArray(var, set_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) ok(ret_f[i] == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) ok(ret_i[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_b = type == D3D10_SVT_BOOL ? set_b[i] : -1; @@ -5600,43 +5600,43 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA set_b[4] = 0; set_b[5] = 0; set_b[6] = 0; set_b[7] = 0; set_b[8] = 0; hr = var->lpVtbl->SetBoolVectorArray(var, set_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); set_b[0] = 1; set_b[1] = 1; set_b[2] = 1; set_b[3] = 1; hr = var->lpVtbl->SetBoolVectorArray(var, set_b, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); /* If the previous offset of 1 worked, then the first vector value of the * array should still be false. */ hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 0, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_f[i] == 0, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 0, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_i[i] == 0, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 0, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(!ret_b[i], "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); /* Test the GetFloatVectorArray offset argument. If it works, we should * get a vector with all values set to true. */ hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_f[i] == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_i[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_b = type == D3D10_SVT_BOOL ? 1 : -1; @@ -5648,10 +5648,10 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA /* Windows array setting function has no bounds checking on offset values * either, so this ends up writing into adjacent variables. */ hr = var->lpVtbl->SetBoolVectorArray(var, set_b, elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_b = type == D3D10_SVT_BOOL ? 1 : -1; @@ -5696,10 +5696,10 @@ static void test_effect_vector_variable(void) } hr = create_effect(fx_test_vector_variable, 0, device, NULL, &effect); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -5716,7 +5716,7 @@ static void test_effect_vector_variable(void) var = effect->lpVtbl->GetVariableByName(effect, tests[i].name); type = var->lpVtbl->GetType(var); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", tests[i].name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", tests[i].name, hr); ok(type_desc.Type == tests[i].type, "Variable %s, got unexpected type %#x.\n", tests[i].name, type_desc.Type); v_var = var->lpVtbl->AsVector(var); @@ -5728,7 +5728,7 @@ static void test_effect_vector_variable(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -5888,31 +5888,31 @@ static void test_matrix_methods(ID3D10EffectMatrixVariable *var, D3D10_SHADER_VA set_test_matrix(&m_set, type, row_count, col_count, 1); hr = var->lpVtbl->SetMatrix(var, &m_set.m[0][0]); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(&m_ret.m[0][0], 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrix(var, &m_ret.m[0][0]); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_set, &m_ret, row_count, col_count, FALSE); memset(&m_ret.m[0][0], 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrixTranspose(var, &m_ret.m[0][0]); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_set, &m_ret, row_count, col_count, TRUE); hr = var->lpVtbl->SetMatrixTranspose(var, &m_set.m[0][0]); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(&m_ret.m[0][0], 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrix(var, &m_ret.m[0][0]); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_ret, &m_set, row_count, col_count, TRUE); memset(&m_ret.m[0][0], 0, sizeof(m_ret)); memset(&m_expected.m[0][0], 0, sizeof(m_expected)); hr = var->lpVtbl->GetMatrixTranspose(var, &m_ret.m[0][0]); transpose_matrix(&m_set, &m_expected, row_count, col_count); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_expected, &m_ret, row_count, col_count, TRUE); } @@ -5926,33 +5926,33 @@ static void test_matrix_array_methods(ID3D10EffectMatrixVariable *var, D3D10_SHA set_test_matrix(&m_set[0], type, row_count, col_count, elements); hr = var->lpVtbl->SetMatrixArray(var, &m_set[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(m_ret, 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrixArray(var, &m_ret[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < elements; ++i) compare_matrix(name, __LINE__, &m_set[i], &m_ret[i], row_count, col_count, FALSE); memset(m_ret, 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrixTransposeArray(var, &m_ret[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < elements; ++i) compare_matrix(name, __LINE__, &m_set[i], &m_ret[i], row_count, col_count, TRUE); hr = var->lpVtbl->SetMatrixTransposeArray(var, &m_set[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(m_ret, 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrixArray(var, &m_ret[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < elements; ++i) compare_matrix(name, __LINE__, &m_ret[i], &m_set[i], row_count, col_count, TRUE); memset(m_ret, 0, sizeof(m_ret)); memset(&m_expected, 0, sizeof(m_expected)); hr = var->lpVtbl->GetMatrixTransposeArray(var, &m_ret[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < elements; ++i) { memset(&m_expected, 0, sizeof(m_expected)); @@ -5965,21 +5965,21 @@ static void test_matrix_array_methods(ID3D10EffectMatrixVariable *var, D3D10_SHA hr = var->lpVtbl->SetMatrixArray(var, &m_ret[0].m[0][0], 0, elements); hr = var->lpVtbl->SetMatrixArray(var, &m_set[0].m[0][0], 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetMatrixArray(var, &m_ret[0].m[0][0], 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_ret[0], &m_set[0], row_count, col_count, FALSE); memset(m_ret, 0, sizeof(m_ret)); hr = var->lpVtbl->SetMatrixArray(var, &m_ret[0].m[0][0], 0, elements); hr = var->lpVtbl->SetMatrixTransposeArray(var, &m_set[0].m[0][0], 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(&m_expected, 0, sizeof(m_expected)); hr = var->lpVtbl->GetMatrixTransposeArray(var, &m_ret[0].m[0][0], 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); transpose_matrix(&m_set[0], &m_expected, row_count, col_count); compare_matrix(name, __LINE__, &m_expected, &m_ret[0], row_count, col_count, TRUE); @@ -5988,19 +5988,19 @@ static void test_matrix_array_methods(ID3D10EffectMatrixVariable *var, D3D10_SHA /* Like vector array functions, matrix array functions will allow for * writing out of bounds into adjacent memory. */ hr = var->lpVtbl->SetMatrixArray(var, &m_set[0].m[0][0], elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(m_ret, 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrixArray(var, &m_ret[0].m[0][0], elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_expected, &m_ret[0], row_count, col_count, TRUE); hr = var->lpVtbl->SetMatrixTransposeArray(var, &m_set[0].m[0][0], elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(&m_expected, 0, sizeof(m_expected)); hr = var->lpVtbl->GetMatrixTransposeArray(var, &m_ret[0].m[0][0], elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); transpose_matrix(&m_set[0], &m_expected, row_count, col_count); compare_matrix(name, __LINE__, &m_expected, &m_ret[0], row_count, col_count, TRUE); } @@ -6042,10 +6042,10 @@ static void test_effect_matrix_variable(void) } hr = create_effect(fx_test_matrix_variable, 0, device, NULL, &effect); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -6062,7 +6062,7 @@ static void test_effect_matrix_variable(void) var = effect->lpVtbl->GetVariableByName(effect, tests[i].name); type = var->lpVtbl->GetType(var); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", tests[i].name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", tests[i].name, hr); ok(type_desc.Type == tests[i].type, "Variable %s, got unexpected type %#x.\n", tests[i].name, type_desc.Type); m_var = var->lpVtbl->AsMatrix(var); @@ -6075,7 +6075,7 @@ static void test_effect_matrix_variable(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -6225,7 +6225,7 @@ static ID3D10EffectShaderResourceVariable *get_effect_shader_resource_variable_( type = var->lpVtbl->GetType(var); ok_(__FILE__, line)(!!type, "Got unexpected type %p.\n", type); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok_(__FILE__, line)(type_desc.Type == D3D10_SVT_TEXTURE2D, "Type is %x, expected %x.\n", type_desc.Type, D3D10_SVT_TEXTURE2D); return var->lpVtbl->AsShaderResource(var); @@ -6257,10 +6257,10 @@ static void test_effect_resource_variable(void) } hr = create_effect(fx_test_resource_variable, 0, device, NULL, &effect); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 0, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -6278,19 +6278,19 @@ static void test_effect_resource_variable(void) var = effect->lpVtbl->GetVariableByName(effect, "dummy name"); t0 = var->lpVtbl->AsShaderResource(var); hr = t0->lpVtbl->SetResource(t0, srv0); - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); var = effect->lpVtbl->GetVariableByName(effect, "t0"); t0 = get_effect_shader_resource_variable(var); hr = t0->lpVtbl->SetResource(t0, srv0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); var = effect->lpVtbl->GetVariableByName(effect, "t_a"); t_a = get_effect_shader_resource_variable(var); for (i = 0; i < 2; ++i) create_effect_texture_resource(device, &srv_a[i], &tex_a[i]); hr = t_a->lpVtbl->SetResourceArray(t_a, srv_a, 0, 2); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Apply the pass to bind the resource to the shader. */ technique = effect->lpVtbl->GetTechniqueByName(effect, "rsrc_test"); @@ -6298,13 +6298,13 @@ static void test_effect_resource_variable(void) pass = technique->lpVtbl->GetPassByName(technique, "p0"); ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!pass_desc.pIAInputSignature, "Unexpected input signature.\n"); - ok(pass_desc.IAInputSignatureSize == 88, "Unexpected input signature size %lu.\n", + ok(pass_desc.IAInputSignatureSize == 88, "Got unexpected input signature size %Iu.\n", pass_desc.IAInputSignatureSize); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShaderResources(device, 0, 1, &srv_tmp[0]); ok(srv_tmp[0] == srv0, "Got unexpected shader resource view %p.\n", srv_tmp[0]); @@ -6321,10 +6321,10 @@ static void test_effect_resource_variable(void) var = t_a->lpVtbl->GetElement(t_a, 1); t_a_0 = get_effect_shader_resource_variable(var); hr = t_a_0->lpVtbl->SetResource(t_a_0, srv0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShaderResources(device, 1, 2, srv_tmp); ok(srv_tmp[0] == srv_a[0], "Got unexpected shader resource view %p.\n", srv_tmp[0]); @@ -6334,10 +6334,10 @@ static void test_effect_resource_variable(void) /* Test offset. */ hr = t_a->lpVtbl->SetResourceArray(t_a, srv_a, 1, 1); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShaderResources(device, 1, 2, srv_tmp); ok(srv_tmp[0] == srv_a[0], "Got unexpected shader resource view %p.\n", srv_tmp[0]); @@ -6349,7 +6349,7 @@ static void test_effect_resource_variable(void) { /* This crashes on Windows. */ hr = t_a->lpVtbl->SetResourceArray(t_a, srv_a, 2, 2); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); } ID3D10ShaderResourceView_Release(srv0); @@ -6363,7 +6363,7 @@ static void test_effect_resource_variable(void) effect->lpVtbl->Release(effect); hr = create_effect(fx_test_resource_variable2, 0, device, NULL, &effect); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); technique = effect->lpVtbl->GetTechniqueByName(effect, "rsrc_test"); ok(technique->lpVtbl->IsValid(technique), "Expected valid technique.\n"); @@ -6377,12 +6377,12 @@ static void test_effect_resource_variable(void) ok(s->lpVtbl->IsValid(s), "Expected valid sample variable.\n"); hr = s->lpVtbl->GetSampler(s, 0, &sampler[0]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = s->lpVtbl->GetSampler(s, 1, &sampler[1]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetSamplers(device, 0, ARRAY_SIZE(samplers), samplers); for (i = 0; i < ARRAY_SIZE(samplers); ++i) @@ -6402,7 +6402,7 @@ static void test_effect_resource_variable(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -6492,7 +6492,7 @@ static void test_effect_annotations(void) } hr = create_effect(fx_test_annotations, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); cb = effect->lpVtbl->GetConstantBufferByName(effect, "cb"); a = cb->lpVtbl->GetAnnotationByName(cb, "s"); @@ -6505,7 +6505,7 @@ static void test_effect_annotations(void) { v = effect->lpVtbl->GetVariableByIndex(effect, i); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.Annotations == 1, "Unexpected annotations count %u.\n", var_desc.Annotations); v = v->lpVtbl->GetAnnotationByName(v, "s"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); @@ -6530,7 +6530,7 @@ static void test_effect_annotations(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_effect_optimize(void) @@ -6558,23 +6558,23 @@ static void test_effect_optimize(void) } hr = create_effect(fx_local_shader, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); hr = tech->lpVtbl->GetDesc(tech, &tech_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(tech_desc.Name, "Render"), "Unexpected technique name %s.\n", tech_desc.Name); pass = tech->lpVtbl->GetPassByIndex(tech, 0); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(pass_desc.Name, "P0"), "Unexpected pass name %s.\n", pass_desc.Name); v = effect->lpVtbl->GetVariableByName(effect, "g_so"); gs = v->lpVtbl->AsShader(v); hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!shaderdesc.pInputSignature, "Expected input signature.\n"); ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); ok(!!shaderdesc.pBytecode, "Expected bytecode.\n"); @@ -6588,13 +6588,13 @@ static void test_effect_optimize(void) ok(!ret, "Unexpected return value.\n"); hr = effect->lpVtbl->Optimize(effect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ret = effect->lpVtbl->IsOptimized(effect); ok(ret, "Unexpected return value.\n"); hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!shaderdesc.pInputSignature, "Expected input signature.\n"); ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); ok(!shaderdesc.pBytecode, "Unexpected bytecode.\n"); @@ -6604,11 +6604,11 @@ static void test_effect_optimize(void) ok(!shaderdesc.NumOutputSignatureEntries, "Unexpected output signature count.\n"); hr = tech->lpVtbl->GetDesc(tech, &tech_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!tech_desc.Name, "Unexpected technique name %p.\n", tech_desc.Name); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!pass_desc.Name, "Unexpected pass name %p.\n", pass_desc.Name); pass = tech->lpVtbl->GetPassByName(tech, "P0"); @@ -6622,17 +6622,17 @@ static void test_effect_optimize(void) /* Already optimized */ hr = effect->lpVtbl->Optimize(effect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); effect->lpVtbl->Release(effect); /* Annotations are stripped. */ hr = create_effect(fx_test_annotations, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); cb = effect->lpVtbl->GetConstantBufferByName(effect, "cb"); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.Annotations == 1, "Unexpected annotations count %u.\n", var_desc.Annotations); v = cb->lpVtbl->GetAnnotationByName(cb, "s"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); @@ -6643,7 +6643,7 @@ static void test_effect_optimize(void) { v = effect->lpVtbl->GetVariableByIndex(effect, i); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.Annotations == 1, "Unexpected annotations count %u.\n", var_desc.Annotations); v = v->lpVtbl->GetAnnotationByName(v, "s"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); @@ -6651,7 +6651,7 @@ static void test_effect_optimize(void) tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); hr = tech->lpVtbl->GetDesc(tech, &tech_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(tech_desc.Annotations == 1, "Unexpected annotations count %u.\n", tech_desc.Annotations); v = tech->lpVtbl->GetAnnotationByName(tech, "s"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); @@ -6659,17 +6659,17 @@ static void test_effect_optimize(void) pass = tech->lpVtbl->GetPassByIndex(tech, 0); ok(pass->lpVtbl->IsValid(pass), "Expected valid technique.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pass_desc.Annotations == 1, "Unexpected annotations count %u.\n", pass_desc.Annotations); v = pass->lpVtbl->GetAnnotationByName(pass, "s"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); hr = effect->lpVtbl->Optimize(effect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); cb = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine { ok(!var_desc.Annotations, "Unexpected annotations count %u.\n", var_desc.Annotations); v = cb->lpVtbl->GetAnnotationByName(cb, "s"); @@ -6682,7 +6682,7 @@ todo_wine { { v = effect->lpVtbl->GetVariableByIndex(effect, i); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine { ok(!var_desc.Annotations, "Unexpected annotations count %u.\n", var_desc.Annotations); v = v->lpVtbl->GetAnnotationByName(v, "s"); @@ -6692,7 +6692,7 @@ todo_wine { tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); hr = tech->lpVtbl->GetDesc(tech, &tech_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine { ok(!tech_desc.Annotations, "Unexpected annotations count %u.\n", tech_desc.Annotations); v = tech->lpVtbl->GetAnnotationByName(tech, "s"); @@ -6702,7 +6702,7 @@ todo_wine { pass = tech->lpVtbl->GetPassByIndex(tech, 0); ok(pass->lpVtbl->IsValid(pass), "Expected valid technique.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine { ok(!pass_desc.Annotations, "Unexpected annotations count %u.\n", pass_desc.Annotations); v = pass->lpVtbl->GetAnnotationByName(pass, "s"); @@ -6712,7 +6712,7 @@ todo_wine { effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_effect_shader_description(void) @@ -6732,40 +6732,40 @@ static void test_effect_shader_description(void) } hr = create_effect(fx_local_shader, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); v = effect->lpVtbl->GetVariableByName(effect, "v0"); /* GetShaderDesc() is indexing through all shaders in the effect.*/ s = v->lpVtbl->AsShader(v); hr = s->lpVtbl->GetShaderDesc(s, 0, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shaderdesc.BytecodeLength, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 1, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shaderdesc.BytecodeLength, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 2, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shaderdesc.BytecodeLength, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 3, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.BytecodeLength == 424, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 4, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.BytecodeLength == 424, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 5, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.BytecodeLength == 420, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 6, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.BytecodeLength == 516, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); ok(!shaderdesc.SODecl, "Unexpected SO declaration %p.\n", shaderdesc.SODecl); hr = s->lpVtbl->GetShaderDesc(s, 7, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.BytecodeLength == 516, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.x; $Skip.x; SV_POSITION.gb"), @@ -6774,7 +6774,7 @@ static void test_effect_shader_description(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_effect_shader_object(void) @@ -6796,7 +6796,7 @@ static void test_effect_shader_object(void) } hr = create_effect(fx_local_shader, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect!\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); v = effect->lpVtbl->GetVariableByName(effect, "v0"); @@ -6804,108 +6804,108 @@ static void test_effect_shader_object(void) vs = (void *)0xdeadbeef; hr = s->lpVtbl->GetVertexShader(s, 0, &vs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!vs, "Unexpected shader object.\n"); vs = (void *)0xdeadbeef; hr = s->lpVtbl->GetVertexShader(s, 1, &vs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!vs, "Unexpected shader object.\n"); vs = (void *)0xdeadbeef; hr = s->lpVtbl->GetVertexShader(s, 2, &vs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!vs, "Unexpected shader object.\n"); vs = NULL; hr = s->lpVtbl->GetVertexShader(s, 3, &vs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!vs, "Unexpected shader object.\n"); ID3D10VertexShader_Release(vs); vs = NULL; hr = s->lpVtbl->GetVertexShader(s, 4, &vs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!vs, "Unexpected shader object.\n"); ID3D10VertexShader_Release(vs); ps = (void *)0xdeadbeef; hr = s->lpVtbl->GetPixelShader(s, 0, &ps); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!ps, "Unexpected shader object.\n"); ps = (void *)0xdeadbeef; hr = s->lpVtbl->GetPixelShader(s, 1, &ps); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!ps, "Unexpected shader object.\n"); ps = (void *)0xdeadbeef; hr = s->lpVtbl->GetPixelShader(s, 2, &ps); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!ps, "Unexpected shader object.\n"); ps = (void *)0xdeadbeef; hr = s->lpVtbl->GetPixelShader(s, 3, &ps); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!ps, "Unexpected shader object.\n"); ps = (void *)0xdeadbeef; hr = s->lpVtbl->GetPixelShader(s, 4, &ps); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!ps, "Unexpected shader object.\n"); ps = NULL; hr = s->lpVtbl->GetPixelShader(s, 5, &ps); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!ps, "Unexpected shader object.\n"); ID3D10PixelShader_Release(ps); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 0, &gs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 1, &gs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 2, &gs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 3, &gs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 4, &gs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 5, &gs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = NULL; hr = s->lpVtbl->GetGeometryShader(s, 6, &gs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!gs, "Unexpected shader object.\n"); ID3D10GeometryShader_Release(gs); gs = NULL; hr = s->lpVtbl->GetGeometryShader(s, 7, &gs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!gs, "Unexpected shader object.\n"); ID3D10GeometryShader_Release(gs); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -7115,44 +7115,44 @@ static void test_effect_pool(void) hr = D3D10CreateEffectPoolFromMemory(NULL, 0, 0, device, &pool); todo_wine - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = create_effect_pool(fx_test_pool, device, &pool); - ok(hr == S_OK, "Failed to create effect pool, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = get_refcount(pool); - ok(refcount == 1, "Unexpected refcount %u.\n", refcount); + ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount); effect = pool->lpVtbl->AsEffect(pool); ok(!!effect, "Expected effect pointer.\n"); effect->lpVtbl->AddRef(effect); refcount = get_refcount(pool); - ok(refcount == 2, "Unexpected refcount %u.\n", refcount); + ok(refcount == 2, "Got unexpected refcount %lu.\n", refcount); effect->lpVtbl->Release(effect); hr = pool->lpVtbl->QueryInterface(pool, &IID_IUnknown, (void **)&unk); todo_wine - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); hr = pool->lpVtbl->QueryInterface(pool, &IID_ID3D10Effect, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); hr = pool->lpVtbl->QueryInterface(pool, &IID_ID3D10EffectPool, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(unk == (IUnknown *)pool, "Unexpected pointer.\n"); IUnknown_Release(unk); hr = effect->lpVtbl->QueryInterface(effect, &IID_IUnknown, (void **)&unk); todo_wine - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); hr = effect->lpVtbl->QueryInterface(effect, &IID_ID3D10Effect, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->QueryInterface(effect, &IID_ID3D10EffectPool, (void **)&pool2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pool2 == pool, "Unexpected pool pointer.\n"); pool2->lpVtbl->Release(pool2); @@ -7160,7 +7160,7 @@ static void test_effect_pool(void) ok(ret, "Expected pool.\n"); hr = effect->lpVtbl->GetDesc(effect, &desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!desc.IsChildEffect, "Unexpected child flag.\n"); ok(desc.ConstantBuffers == 1, "Unexpected buffer count %u.\n", desc.ConstantBuffers); ok(!desc.SharedConstantBuffers, "Unexpected shared buffer count %u.\n", @@ -7171,13 +7171,13 @@ static void test_effect_pool(void) cb = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_cb"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); a = cb->lpVtbl->GetAnnotationByIndex(cb, 0); ok(a->lpVtbl->IsValid(a), "Expected valid annotation.\n"); hr = a->lpVtbl->GetDesc(a, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == (D3D10_EFFECT_VARIABLE_POOLED | D3D10_EFFECT_VARIABLE_ANNOTATION), "Unexpected flags %#x.\n", var_desc.Flags); @@ -7186,70 +7186,68 @@ static void test_effect_pool(void) pass = t->lpVtbl->GetPassByName(t, "P1"); ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n"); hr = pass->lpVtbl->GetVertexShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = shader_desc.pShaderVariable->lpVtbl->GetDesc(shader_desc.pShaderVariable, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "$Anonymous"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); v = effect->lpVtbl->GetVariableByName(effect, "s_blendstate"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_blendstate"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = effect->lpVtbl->GetVariableByName(effect, "s_texture"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_texture"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = effect->lpVtbl->GetVariableByName(effect, "ps"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "ps"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); t = effect->lpVtbl->GetTechniqueByIndex(effect, 0); pass = t->lpVtbl->GetPassByIndex(t, 0); hr = pass->lpVtbl->GetVertexShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); sv = shader_desc.pShaderVariable; hr = sv->lpVtbl->GetDesc(sv, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "$Anonymous"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); /* Create standalone effect from the same blob used for pool, */ hr = create_effect(fx_test_pool, D3D10_EFFECT_COMPILE_CHILD_EFFECT, device, NULL, &child_effect); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = create_effect(fx_test_pool, 0, device, NULL, &effect2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect2->lpVtbl->QueryInterface(effect2, &IID_IUnknown, (void **)&unk); todo_wine - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); hr = effect2->lpVtbl->QueryInterface(effect2, &IID_ID3D10Effect, (void **)&unk); todo_wine - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); /* For regular effects querying for ID3D10EffectPool is broken */ hr = effect2->lpVtbl->QueryInterface(effect2, &IID_ID3D10EffectPool, (void **)&unk); -todo_wine { - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(unk == (IUnknown *)effect2, "Unexpected pointer.\n"); -} + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + todo_wine ok(unk == (IUnknown *)effect2, "Got unexpected pointer %p.\n", unk); if (SUCCEEDED(hr)) IUnknown_Release(unk); ret = effect2->lpVtbl->IsPool(effect2); ok(!ret, "Unexpected pool.\n"); hr = effect2->lpVtbl->GetDesc(effect2, &desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!desc.IsChildEffect, "Unexpected child flag.\n"); ok(desc.ConstantBuffers == 1, "Unexpected buffer count %u.\n", desc.ConstantBuffers); ok(!desc.SharedConstantBuffers, "Unexpected shared buffer count %u.\n", @@ -7260,7 +7258,7 @@ todo_wine { cb = effect2->lpVtbl->GetConstantBufferByIndex(effect2, 0); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_cb"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); @@ -7268,13 +7266,13 @@ todo_wine { /* Pool and child that use different devices. */ hr = create_effect_pool(fx_test_pool, device2, &pool2); - ok(hr == S_OK, "Failed to create an effect pool, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = create_effect(fx_test_pool_child, D3D10_EFFECT_COMPILE_CHILD_EFFECT, device, pool2, &child_effect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = child_effect->lpVtbl->GetDevice(child_effect, &device3); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(device3 == device, "Unexpected device.\n"); ID3D10Device_Release(device3); @@ -7282,7 +7280,7 @@ todo_wine { ok(cb->lpVtbl->IsValid(cb), "Expected valid constant buffer.\n"); hr = cb->lpVtbl->GetConstantBuffer(cb, &buffer); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Buffer_GetDevice(buffer, &device3); ok(device3 == device2, "Unexpected device.\n"); ID3D10Device_Release(device3); @@ -7293,22 +7291,22 @@ todo_wine { /* When pool is specified, corresponding flag has to be set. */ hr = create_effect(fx_test_pool_child, 0, device, pool, &child_effect); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = create_effect(fx_test_pool_child, D3D10_EFFECT_COMPILE_CHILD_EFFECT, device, NULL, &child_effect); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); refcount = get_refcount(pool); - ok(refcount == 1, "Unexpected refcount %u.\n", refcount); + ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount); hr = create_effect(fx_test_pool_child, D3D10_EFFECT_COMPILE_CHILD_EFFECT, device, pool, &child_effect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = get_refcount(pool); - ok(refcount == 2, "Unexpected refcount %u.\n", refcount); + ok(refcount == 2, "Got unexpected refcount %lu.\n", refcount); hr = child_effect->lpVtbl->GetDesc(child_effect, &desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(desc.IsChildEffect, "Unexpected child flag.\n"); ok(desc.ConstantBuffers == 2, "Unexpected buffer count %u.\n", desc.ConstantBuffers); ok(desc.SharedConstantBuffers == 1, "Unexpected shared buffer count %u.\n", @@ -7323,7 +7321,7 @@ todo_wine { ok(ret, "Unexpected invalid variable.\n"); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "l_cb"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); @@ -7332,7 +7330,7 @@ todo_wine { ok(ret, "Unexpected invalid variable.\n"); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "l_cb2"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); @@ -7341,7 +7339,7 @@ todo_wine { ok(ret, "Unexpected invalid variable.\n"); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_cb"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); @@ -7355,49 +7353,49 @@ todo_wine { /* Local variables first */ v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 0); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f0"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 1); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f3"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 2); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "vs"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 3); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f1"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 4); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f2"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByName(child_effect, "s_texture"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_texture"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableBySemantic(child_effect, "COLOR0"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f0"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableBySemantic(child_effect, "COLOR1"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f2"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); @@ -7406,10 +7404,10 @@ todo_wine { pool->lpVtbl->Release(pool); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); refcount = ID3D10Device_Release(device2); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -7495,13 +7493,13 @@ static void test_effect_default_variable_value(void) } hr = create_effect(fx_test_default_variable_value, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); memset(float_v, 0, sizeof(float_v)); v = effect->lpVtbl->GetVariableByName(effect, "f4"); vector = v->lpVtbl->AsVector(v); hr = vector->lpVtbl->GetFloatVector(vector, float_v); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(float_v[0] == 1.0f && float_v[1] == 2.0f && float_v[2] == 3.0f && float_v[3] == 4.0f, "Unexpected vector {%.8e,%.8e,%.8e,%.8e}\n", float_v[0], float_v[1], float_v[2], float_v[3]); @@ -7510,7 +7508,7 @@ static void test_effect_default_variable_value(void) v = effect->lpVtbl->GetVariableByName(effect, "f2"); vector = v->lpVtbl->AsVector(v); hr = vector->lpVtbl->GetFloatVector(vector, float_v); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(float_v[0] == 1.0f && float_v[1] == 2.0f && float_v[2] == 5.0f && float_v[3] == 5.0f, "Unexpected vector {%.8e,%.8e,%.8e,%.8e}\n", float_v[0], float_v[1], float_v[2], float_v[3]); @@ -7519,7 +7517,7 @@ static void test_effect_default_variable_value(void) v = effect->lpVtbl->GetVariableByName(effect, "f1"); vector = v->lpVtbl->AsVector(v); hr = vector->lpVtbl->GetFloatVector(vector, float_v); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(float_v[0] == 1.0f && float_v[1] == 5.0f && float_v[2] == 5.0f && float_v[3] == 5.0f, "Unexpected vector {%.8e,%.8e,%.8e,%.8e}\n", float_v[0], float_v[1], float_v[2], float_v[3]); @@ -7527,32 +7525,32 @@ static void test_effect_default_variable_value(void) v = effect->lpVtbl->GetVariableByName(effect, "i"); scalar = v->lpVtbl->AsScalar(v); hr = scalar->lpVtbl->GetInt(scalar, &int_s); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(int_s == 10, "Unexpected value %d.\n", int_s); memset(int_v, 0, sizeof(int_v)); v = effect->lpVtbl->GetVariableByName(effect, "i2"); scalar = v->lpVtbl->AsScalar(v); hr = scalar->lpVtbl->GetIntArray(scalar, int_v, 0, 2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(int_v[0] == 9 && int_v[1] == 12, "Unexpected vector {%d,%d}\n", int_v[0], int_v[1]); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.BufferOffset == 32, "Unexpected offset %u.\n", var_desc.BufferOffset); v2 = v->lpVtbl->GetElement(v, 0); hr = v2->lpVtbl->GetDesc(v2, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.BufferOffset == 32, "Unexpected offset %u.\n", var_desc.BufferOffset); v2 = v->lpVtbl->GetElement(v, 1); hr = v2->lpVtbl->GetDesc(v2, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.BufferOffset == 48, "Unexpected offset %u.\n", var_desc.BufferOffset); float_s = 0.0f; v = effect->lpVtbl->GetVariableByName(effect, "f"); scalar = v->lpVtbl->AsScalar(v); hr = scalar->lpVtbl->GetFloat(scalar, &float_s); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(float_s == 0.2f, "Unexpected value %.8e.\n", float_s); /* Matrix */ @@ -7561,7 +7559,7 @@ static void test_effect_default_variable_value(void) ok(matrix->lpVtbl->IsValid(matrix), "Expected valid matrix.\n"); memset(&m_ret, 0, sizeof(m_ret)); hr = matrix->lpVtbl->GetMatrix(matrix, &m_ret.m[0][0]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); set_test_matrix(&m_set, D3D10_SVT_INT, 2, 3, 1); compare_matrix("m1", __LINE__, &m_set, &m_ret, 2, 3, FALSE); @@ -7571,7 +7569,7 @@ static void test_effect_default_variable_value(void) ok(matrix->lpVtbl->IsValid(matrix), "Expected valid matrix.\n"); memset(&m_ret, 0, sizeof(m_ret)); hr = matrix->lpVtbl->GetMatrix(matrix, &m_ret.m[0][0]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); set_test_matrix(&m_set, D3D10_SVT_INT, 2, 3, 1); compare_matrix("m2", __LINE__, &m_set, &m_ret, 2, 3, FALSE); @@ -7581,7 +7579,7 @@ static void test_effect_default_variable_value(void) ok(matrix->lpVtbl->IsValid(matrix), "Expected valid matrix.\n"); memset(&m_ret, 0, sizeof(m_ret)); hr = matrix->lpVtbl->GetMatrix(matrix, &m_ret.m[0][0]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); memset(&m_set, 0, sizeof(m_set)); *(unsigned int *)&m_set.m[0][0] = 1; @@ -7597,7 +7595,7 @@ static void test_effect_default_variable_value(void) ok(matrix->lpVtbl->IsValid(matrix), "Expected valid matrix.\n"); memset(&m_ret, 0, sizeof(m_ret)); hr = matrix->lpVtbl->GetMatrix(matrix, &m_ret.m[0][0]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); set_test_matrix(&m_set, D3D10_SVT_FLOAT, 2, 2, 1); compare_matrix("m4", __LINE__, &m_set, &m_ret, 2, 2, FALSE); @@ -7610,27 +7608,27 @@ static void test_effect_default_variable_value(void) ok(m->lpVtbl->IsValid(m), "Expected valid variable.\n"); scalar = m->lpVtbl->AsScalar(m); hr = scalar->lpVtbl->GetBool(scalar, &ret); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(ret == 1, "Unexpected value.\n"); m = v->lpVtbl->GetMemberByName(v, "f2"); ok(m->lpVtbl->IsValid(m), "Expected valid variable.\n"); scalar = m->lpVtbl->AsScalar(m); hr = scalar->lpVtbl->GetFloat(scalar, &float_s); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(float_s == -0.2f, "Unexpected value %f.\n", float_s); m = v->lpVtbl->GetMemberByName(v, "b2"); ok(m->lpVtbl->IsValid(m), "Expected valid variable.\n"); scalar = m->lpVtbl->AsScalar(m); hr = scalar->lpVtbl->GetBool(scalar, &ret); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!ret, "Unexpected value.\n"); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_effect_raw_value(void) @@ -7652,29 +7650,29 @@ static void test_effect_raw_value(void) } hr = create_effect(fx_test_default_variable_value, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Read 1 float at a time, from float4 vector. */ v = effect->lpVtbl->GetVariableByName(effect, "f4"); for (i = 0; i < 4; ++i) { hr = v->lpVtbl->GetRawValue(v, &f, sizeof(f) * i, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == i + 1.0f, "Unexpected value %f.\n", f); } /* Offset outside of variable storage, returns adjacent memory contents. */ hr = v->lpVtbl->GetRawValue(v, &f, 16, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 1.0f, "Unexpected value %f.\n", f); hr = v->lpVtbl->GetRawValue(v, &f, 20, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 2.0f, "Unexpected value %f.\n", f); /* Array */ v = effect->lpVtbl->GetVariableByName(effect, "i2"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); hr = v->lpVtbl->GetRawValue(v, i_v, 0, 8 * sizeof(float)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(i_v[0] == 9, "Unexpected value %d.\n", i_v[0]); ok(i_v[1] == 0, "Unexpected value %d.\n", i_v[1]); ok(i_v[2] == 0, "Unexpected value %d.\n", i_v[2]); @@ -7682,7 +7680,7 @@ static void test_effect_raw_value(void) ok(i_v[4] == 12, "Unexpected value %d.\n", i_v[4]); hr = v->lpVtbl->GetRawValue(v, &f, 20, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 0.2f, "Unexpected value %f.\n", f); /* Matrix */ @@ -7715,25 +7713,25 @@ static void test_effect_raw_value(void) for (i = 0; i < 4; ++i) { hr = cb->lpVtbl->GetRawValue(cb, &f, sizeof(f) * i, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == i + 1.0f, "Unexpected value %f.\n", f); } hr = cb->lpVtbl->GetRawValue(cb, &f, 16, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 1.0f, "Unexpected value %f.\n", f); hr = cb->lpVtbl->GetRawValue(cb, &f, 20, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 2.0f, "Unexpected value %f.\n", f); /* Invalid variable */ v = effect->lpVtbl->GetVariableByName(effect, "invalid"); hr = v->lpVtbl->GetRawValue(v, &f, 0, sizeof(f)); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -7816,7 +7814,7 @@ static void test_effect_dynamic_numeric_field(void) } hr = create_effect(fx_test_effect_dynamic_numeric_field, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); ok(tech->lpVtbl->IsValid(tech), "Expected valid technique.\n"); @@ -7828,7 +7826,7 @@ static void test_effect_dynamic_numeric_field(void) memset(blend_factor, 0, sizeof(blend_factor)); ID3D10Device_OMSetBlendState(device, NULL, blend_factor, 0); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetDepthStencilState(device, &ds_state, &stencil_ref); ok(!stencil_ref, "Unexpected stencil ref value %#x.\n", stencil_ref); ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); @@ -7841,17 +7839,17 @@ static void test_effect_dynamic_numeric_field(void) v = effect->lpVtbl->GetVariableByName(effect, "i1"); scalar = v->lpVtbl->AsScalar(v); hr = scalar->lpVtbl->SetInt(scalar, 2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetDepthStencilState(device, &ds_state, &stencil_ref); ok(stencil_ref == 0x2, "Unexpected stencil ref value %#x.\n", stencil_ref); hr = scalar->lpVtbl->SetInt(scalar, 3); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pass_desc.StencilRef == 0x3, "Unexpected stencil ref value %#x.\n", stencil_ref); ID3D10Device_OMGetDepthStencilState(device, &ds_state, &stencil_ref); ok(stencil_ref == 0x2, "Unexpected stencil ref value %#x.\n", stencil_ref); @@ -7862,13 +7860,13 @@ static void test_effect_dynamic_numeric_field(void) v = v->lpVtbl->GetElement(v, 1); scalar = v->lpVtbl->AsScalar(v); hr = scalar->lpVtbl->SetInt(scalar, 4); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMSetDepthStencilState(device, NULL, 0x1); memset(blend_factor, 0, sizeof(blend_factor)); ID3D10Device_OMSetBlendState(device, NULL, blend_factor, 0); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetDepthStencilState(device, &ds_state, &stencil_ref); ok(stencil_ref == 0x4, "Unexpected stencil ref value %#x.\n", stencil_ref); ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); @@ -7881,7 +7879,7 @@ static void test_effect_dynamic_numeric_field(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -8000,13 +7998,13 @@ static void test_effect_index_expression(void) } hr = create_effect(fx_test_index_expression, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Initial index */ tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); pass = tech->lpVtbl->GetPassByIndex(tech, 0); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index.\n"); v = effect->lpVtbl->GetVariableByName(effect, "g_var"); @@ -8014,14 +8012,14 @@ static void test_effect_index_expression(void) set_vec4(val, 0.0f, 0.0f, 1.0f, 0.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shader_desc.ShaderIndex == 1, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); @@ -8029,10 +8027,10 @@ static void test_effect_index_expression(void) set_vec4(val, 0.0f, 0.0f, 1.0f, 1.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); @@ -8041,14 +8039,14 @@ static void test_effect_index_expression(void) /* Out of bounds index */ set_vec4(val, 0.0f, 0.0f, 2.0f, 2.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); @@ -8056,14 +8054,14 @@ static void test_effect_index_expression(void) set_vec4(val, 0.0f, 0.0f, 3.0f, 3.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); @@ -8071,14 +8069,14 @@ static void test_effect_index_expression(void) set_vec4(val, 0.0f, 0.0f, -1.0f, -1.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); @@ -8086,50 +8084,50 @@ static void test_effect_index_expression(void) set_vec4(val, 0.0f, 0.0f, -11.0f, 0.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); ID3D10BlendState_Release(bs); hr = pass->lpVtbl->GetVertexShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); set_vec4(val, 0.9f, 0.0f, 1.0f, 0.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetVertexShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shader_desc.ShaderIndex == 1, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); v = effect->lpVtbl->GetVariableByName(effect, "g_var2"); vector = v->lpVtbl->AsVector(v); hr = pass->lpVtbl->GetGeometryShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); set_vec4(val, 0.0f, 1.0f, 0.0f, 0.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetGeometryShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shader_desc.ShaderIndex == 1, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -8201,12 +8199,12 @@ static void test_effect_value_expression(void) } hr = create_effect(fx_test_value_expression, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -8238,12 +8236,12 @@ static void test_effect_fx_4_1(void) } hr = create_effect(fx_test_fx_4_1, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } START_TEST(effect) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 6d6173824a2..13769d57e34 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -22,6 +22,9 @@ * The functions are e.g.: D3DGet*SignatureBlob, D3DReflect */ +#ifndef WINE_NO_LONG_TYPES +#define WINE_NO_LONG_TYPES +#endif #define COBJMACROS #include "initguid.h" #include "d3dcompiler.h" -- 2.30.2

1 0

[PATCH v3 5/5] msvcp: Print 0x prefix with %#x format in traces.
by Piotr Caban Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH v3 4/5] msvcrt: Print 0x prefix with %#x format in traces.
by Piotr Caban Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/data.c | 2 +- dlls/msvcrt/file.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)

1 0

[PATCH v3 3/5] msvcrt: Use %#I64x format in traces.
by Piotr Caban Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 2 +- dlls/msvcrt/console.c | 4 ++-- dlls/msvcrt/except_x86_64.c | 4 ++-- dlls/msvcrt/file.c | 33 +++++++++++++++------------------ dlls/msvcrt/scanf.c | 8 ++++---- dlls/msvcrt/string.c | 10 +++++----- dlls/msvcrt/wcs.c | 14 +++++++------- 7 files changed, 36 insertions(+), 39 deletions(-)

1 0

[PATCH v3 2/5] msvcr: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban Feb. 8, 2022

Feb. 8, 2022

1 0

[PATCH v3 1/5] msvcp: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban Feb. 8, 2022

Feb. 8, 2022

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v3: - use I64 instead of ll printf format dlls/msvcirt/Makefile.in | 2 +- dlls/msvcirt/msvcirt.c | 30 +++++++++++++++--------------- dlls/msvcp100/Makefile.in | 2 +- dlls/msvcp110/Makefile.in | 2 +- dlls/msvcp120/Makefile.in | 2 +- dlls/msvcp140/Makefile.in | 2 +- dlls/msvcp60/Makefile.in | 2 +- dlls/msvcp60/main.c | 2 +- dlls/msvcp70/Makefile.in | 2 +- dlls/msvcp71/Makefile.in | 2 +- dlls/msvcp80/Makefile.in | 2 +- dlls/msvcp90/Makefile.in | 2 +- dlls/msvcp90/locale.c | 20 ++++++++++---------- dlls/msvcp90/misc.c | 18 +++++++++--------- dlls/msvcp90/msvcp_main.c | 2 +- 15 files changed, 46 insertions(+), 46 deletions(-)

1 0