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

[PATCH v2 1/5] include/windows.foundation.collections.idl: Add IVector<T> interface.
by Bernhard Kölbl Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- v2: Added missing parameters and attributes. This and more incoming patches are part of a bigger branch: https://github.com/besentv/wine-patches/tree/main/windows.media.speech --- include/windows.foundation.collections.idl | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index 876e15336a2..a2d2d75ec4f 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -118,6 +118,26 @@ cpp_quote("#endif") HRESULT IndexOf([in, optional] T element, [out] UINT32 *index, [out, retval] BOOLEAN *value); HRESULT GetMany([in] UINT32 start_index, [in] UINT32 items_size, [out] T *items, [out, retval] UINT32 *value); } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(913337e9-11a1-4345-a3a2-4e7f956e222d) + ] + interface IVector<T> : IInspectable + { + HRESULT GetAt([in, optional] UINT32 index, [out, retval] T *value); + [propget] HRESULT Size([out, retval] UINT32 *value); + HRESULT GetView([out, retval] IVectorView<T> **value); + HRESULT IndexOf([in, optional] T element, [out] UINT32 *index, [out, retval] BOOLEAN *value); + HRESULT SetAt([in] UINT32 index, [in, optional] T value); + HRESULT InsertAt([in] UINT32 index, [in, optional] T value); + HRESULT RemoveAt([in] UINT32 index); + HRESULT Append([in, optional] T value); + HRESULT RemoveAtEnd(); + HRESULT Clear(); + HRESULT GetMany([in] UINT32 start_index, [in] UINT32 items_size, [out] T *items, [out, retval] UINT32 *value); + HRESULT ReplaceAll([in] UINT32 count, [in] T *items); + } } #endif } -- 2.34.1

2 5

[PATCH 2/2] msvcirt/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcirt/tests/Makefile.in | 1 - dlls/msvcirt/tests/msvcirt.c | 84 +++++++++++++++++----------------- 2 files changed, 42 insertions(+), 43 deletions(-)

1 0

[PATCH vkd3d v5 1/6] tests: Test matrix multiplication.
by Giovanni Mascellani Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v2: * Split to many individual tests --- Makefile.am | 2 + tests/hlsl-mul.shader_test | 290 +++++++++++++++++++++++++++++++++++++ 2 files changed, 292 insertions(+) create mode 100644 tests/hlsl-mul.shader_test diff --git a/Makefile.am b/Makefile.am index 7a7bd6a7..687b624c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,6 +79,7 @@ vkd3d_shader_tests = \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ + tests/hlsl-mul.shader_test \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-numeric-constructor-truncation.shader_test \ tests/hlsl-numeric-types.shader_test \ @@ -319,6 +320,7 @@ XFAIL_TESTS = \ tests/hlsl-intrinsic-override.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ + tests/hlsl-mul.shader_test \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-numeric-constructor-truncation.shader_test \ tests/hlsl-numeric-types.shader_test \ diff --git a/tests/hlsl-mul.shader_test b/tests/hlsl-mul.shader_test new file mode 100644 index 00000000..7b453187 --- /dev/null +++ b/tests/hlsl-mul.shader_test @@ -0,0 +1,290 @@ + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float4 y = float4(1.0, 2.0, 3.0, 4.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (30.0, 70.0, 110.0, 150.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4 x = float4(1.0, 2.0, 3.0, 4.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (90.0, 100.0, 110.0, 120.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float3 y = float3(1.0, 2.0, 3.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (14.0, 38.0, 62.0, 86.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float3 x = float3(1.0, 2.0, 3.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (38.0, 44.0, 50.0, 56.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float3x3 x = float3x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0, + 7.0, 8.0, 9.0); + float4 y = float4(1.0, 2.0, 3.0, 4.0); + + return float4(mul(x, y), 0.0); +} + +[test] +draw quad +probe all rgba (14.0, 32.0, 50.0, 0.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4 x = float4(1.0, 2.0, 3.0, 4.0); + float3x3 y = float3x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0, + 7.0, 8.0, 9.0); + + return float4(mul(x, y), 0.0); +} + +[test] +draw quad +probe all rgba (30.0, 36.0, 42.0, 0.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float x = 10.0; + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y)[1]; +} + +[test] +draw quad +probe all rgba (50.0, 60.0, 70.0, 80.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float y = 10.0; + + return mul(x, y)[1]; +} + +[test] +draw quad +probe all rgba (50.0, 60.0, 70.0, 80.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float1 x = float1(10.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (10.0, 20.0, 30.0, 40.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float1 y = float1(10.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (10.0, 50.0, 90.0, 130.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float1x1 x = float1x1(10.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (10.0, 20.0, 30.0, 40.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float1x1 y = float1x1(10.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (10.0, 50.0, 90.0, 130.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float1x4 x = float1x4(1.0, 2.0, 3.0, 4.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (90.0, 100.0, 110.0, 120.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float1x4 y = float1x4(1.0, 2.0, 3.0, 4.0); + + return mul(x, y)[1]; +} + +[test] +draw quad +probe all rgba (5.0, 10.0, 15.0, 20.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x1 x = float4x1(1.0, 2.0, 3.0, 4.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y)[1]; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 6.0, 8.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float4x1 y = float4x1(1.0, 2.0, 3.0, 4.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (30.0, 70.0, 110.0, 150.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float3x3 x = float3x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0, + 7.0, 8.0, 9.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y)[1]; +} + +[test] +draw quad +probe all rgba (83.0, 98.0, 113.0, 128.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float3x3 y = float3x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0, + 7.0, 8.0, 9.0); + + return float4(mul(x, y)[1], 0.0); +} + +[test] +draw quad +probe all rgba (78.0, 96.0, 114.0, 0.0) -- 2.34.1

2 6

[PATCH] concrt140/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/concrt140/tests/Makefile.in | 1 - dlls/concrt140/tests/concrt140.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-)

1 0

[PATCH v2 1/5] comctl32/tests: Print id value as decimal.
by Dmitry Timoshkov Feb. 11, 2022

Feb. 11, 2022

All the notification codes (printed as an id) have negative base value (SBN_, UDN_, HDN_, BCN_, TBN_, TTN_, RBN_, TRBN_, PGN_, TVN_, LVN_, TCN_, CBEN_, IPN_, MCN_, DTN_), and printing them as decimal helps to quickly identify the corresponding notification value in cases when an id in the message sequence doesn't match. Custom ids in the message sequences have small numbers (0, 1, 2, ...), so they also get printed correctly. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/msg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/msg.h b/dlls/comctl32/tests/msg.h index 7337c724a5c..8ba2efddb0a 100644 --- a/dlls/comctl32/tests/msg.h +++ b/dlls/comctl32/tests/msg.h @@ -261,14 +261,14 @@ static void ok_sequence_(struct msg_sequence **seq, int sequence_index, failcount++; dump++; ok_(file, line) (FALSE, - "%s: in msg 0x%04x expecting id 0x%x got 0x%x\n", + "%s: in msg 0x%04x expecting id %d got %d\n", context, expected->message, expected->id, actual->id); } } else { ok_(file, line) (expected->id == actual->id, - "%s: in msg 0x%04x expecting id 0x%x got 0x%x\n", + "%s: in msg 0x%04x expecting id %d got %d\n", context, expected->message, expected->id, actual->id); if (expected->id != actual->id) dump++; } -- 2.34.1

2 1

[PATCH 1/2] wined3d: Reinitialize query pool's free list entry when it runs out.
by Jan Sikorski Feb. 11, 2022

Feb. 11, 2022

We check if it's empty to put it back in. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 97c60719489..60132dc81b5 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1445,6 +1445,7 @@ bool wined3d_context_vk_allocate_query(struct wined3d_context_vk *context_vk, if (wined3d_query_pool_vk_allocate_query(pool_vk, &idx)) goto done; list_remove(&pool_vk->entry); + list_init(&pool_vk->entry); } if (!(pool_vk = heap_alloc_zero(sizeof(*pool_vk)))) -- 2.32.0

2 4

[PATCH 1/7] wined3d: Always set map_ptr for mapped OpenGL BOs.
by Zebediah Figura Feb. 11, 2022

Feb. 11, 2022

Regardless of whether we are mapping persistently. Matches the Vulkan backend. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 7b40b1de0fb..9153b7fd95f 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2831,7 +2831,6 @@ static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, struct wined3d_context_ const struct wined3d_gl_info *gl_info; struct wined3d_bo_user *bo_user; struct wined3d_bo_gl tmp; - uint8_t *map_ptr; if (flags & WINED3D_MAP_NOOVERWRITE) goto map; @@ -2869,9 +2868,9 @@ map: { 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))) + if (!(bo->b.map_ptr = wined3d_allocator_chunk_gl_map(chunk_gl, context_gl))) ERR("Failed to map chunk.\n"); - return map_ptr; + return bo->b.map_ptr; } gl_info = context_gl->gl_info; @@ -2906,31 +2905,32 @@ map: } gl_flags |= GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; - if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, gl_flags))) && wined3d_map_persistent()) - bo->b.map_ptr = map_ptr; + bo->b.map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, gl_flags)); } else if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, wined3d_resource_gl_map_flags(bo, flags))); + bo->b.map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, wined3d_resource_gl_map_flags(bo, flags))); } else { - map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))); + bo->b.map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))); } wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); checkGLcall("Map buffer object"); - return map_ptr; + return bo->b.map_ptr; } static void wined3d_bo_gl_unmap(struct wined3d_bo_gl *bo, struct wined3d_context_gl *context_gl) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; - if (bo->b.map_ptr) + if (wined3d_map_persistent()) return; + bo->b.map_ptr = NULL; + wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); if (bo->memory) -- 2.34.1

3 10

[PATCH] wined3d: Use a separate heap for deferred resource upload buffers.
by Jan Sikorski Feb. 11, 2022

Feb. 11, 2022

Significantly reduces global heap lock contention in some games. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/cs.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 90686e8d170..ffa0689e5a4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -49,6 +49,7 @@ struct wined3d_command_list SIZE_T data_size; void *data; + HANDLE upload_heap; SIZE_T resource_count; struct wined3d_resource **resources; @@ -3979,6 +3980,7 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) struct wined3d_deferred_context { struct wined3d_device_context c; + HANDLE upload_heap; SIZE_T data_size, data_capacity; void *data; @@ -4108,7 +4110,15 @@ static bool wined3d_deferred_context_map_upload_bo(struct wined3d_device_context deferred->upload_count + 1, sizeof(*deferred->uploads))) return false; - if (!(sysmem = heap_alloc(size + RESOURCE_ALIGNMENT - 1))) + if (!deferred->upload_heap) + deferred->upload_heap = HeapCreate(HEAP_NO_SERIALIZE, 0, 0); + if (!deferred->upload_heap) + { + ERR("Failed to create upload heap.\n"); + return false; + } + + if (!(sysmem = HeapAlloc(deferred->upload_heap, 0, size + RESOURCE_ALIGNMENT - 1))) return false; upload = &deferred->uploads[deferred->upload_count++]; @@ -4253,10 +4263,9 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte heap_free(deferred->resources); for (i = 0; i < deferred->upload_count; ++i) - { wined3d_resource_decref(deferred->uploads[i].resource); - heap_free(deferred->uploads[i].sysmem); - } + if (deferred->upload_heap) + HeapDestroy(deferred->upload_heap); heap_free(deferred->uploads); for (i = 0; i < deferred->command_list_count; ++i) @@ -4341,6 +4350,9 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->command_list_count = 0; deferred->query_count = 0; + object->upload_heap = deferred->upload_heap; + deferred->upload_heap = 0; + /* This is in fact recorded into a subsequent command list. */ if (restore) wined3d_device_context_set_state(&deferred->c, deferred->c.state); @@ -4357,13 +4369,11 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device static void wined3d_command_list_destroy_object(void *object) { struct wined3d_command_list *list = object; - SIZE_T i; TRACE("list %p.\n", list); - for (i = 0; i < list->upload_count; ++i) - heap_free(list->uploads[i].sysmem); - + if (list->upload_heap) + HeapDestroy(list->upload_heap); heap_free(list); } -- 2.32.0

2 1

[PATCH] wined3d: Use StretchBlt() in swapchain_blit_gdi().
by Paul Gofman Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Fixes Serious Sam: The Random Encounter which has the contents presented in a smaller rectangle in the upper left corner of the screen since commit 6181b0ea270dfe0be2a0246bb391568559cc01af. While at the same time the game benefits from that commit as it solves the issue which happens when display aspect ration doesn't match the game's one (in which case it should present letterboxed image which black parts get garbage without the commit). The actual issue is probably in the earlier commit 70418f69dd49da5625bb1893d9fc2bef3fe97b5e which doesn't account for possibly different source and destination rectangle dimensions. dlls/wined3d/swapchain.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 49a40f3e1d6..5fcbfc58779 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -459,8 +459,9 @@ static void swapchain_blit_gdi(struct wined3d_swapchain *swapchain, if (!(dst_dc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) ERR("Failed to get destination DC.\n"); - if (!BitBlt(dst_dc, dst_rect->left, dst_rect->top, dst_rect->right - dst_rect->left, - dst_rect->bottom - dst_rect->top, src_dc, src_rect->left, src_rect->top, SRCCOPY)) + if (!StretchBlt(dst_dc, dst_rect->left, dst_rect->top, dst_rect->right - dst_rect->left, + dst_rect->bottom - dst_rect->top, src_dc, src_rect->left, src_rect->top, + src_rect->right - src_rect->left, src_rect->bottom - src_rect->top, SRCCOPY)) ERR("Failed to blit.\n"); ReleaseDC(swapchain->win_handle, dst_dc); -- 2.34.1

2 1

[PATCH] d2d1: Implement d2d_bitmap_CopyFromBitmap().
by Jactry Zeng Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 28 ++++++++++++++++++++++++++-- dlls/d2d1/tests/d2d1.c | 39 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 50744836b13..971e3c7ff6b 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -133,9 +133,33 @@ static void STDMETHODCALLTYPE d2d_bitmap_GetDpi(ID2D1Bitmap1 *iface, float *dpi_ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromBitmap(ID2D1Bitmap1 *iface, const D2D1_POINT_2U *dst_point, ID2D1Bitmap *bitmap, const D2D1_RECT_U *src_rect) { - FIXME("iface %p, dst_point %p, bitmap %p, src_rect %p stub!\n", iface, dst_point, bitmap, src_rect); + struct d2d_bitmap *src_bitmap = unsafe_impl_from_ID2D1Bitmap(bitmap); + struct d2d_bitmap *dst_bitmap = impl_from_ID2D1Bitmap1(iface); + ID3D11DeviceContext *context; + ID3D11Device *device; + D3D11_BOX box; - return E_NOTIMPL; + TRACE("iface %p, dst_point %p, bitmap %p, src_rect %p.\n", iface, dst_point, bitmap, src_rect); + + if (src_rect) + { + box.left = src_rect->left; + box.top = src_rect->top; + box.front = 0; + box.right = src_rect->right; + box.bottom = src_rect->bottom; + box.back = 1; + } + + ID3D11Resource_GetDevice(dst_bitmap->resource, &device); + ID3D11Device_GetImmediateContext(device, &context); + ID3D11DeviceContext_CopySubresourceRegion(context, dst_bitmap->resource, 0, + dst_point ? dst_point->x : 0, dst_point ? dst_point->y : 0, 0, + src_bitmap->resource, 0, src_rect ? &box : NULL); + ID3D11DeviceContext_Release(context); + ID3D11Device_Release(device); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromRenderTarget(ID2D1Bitmap1 *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ba67dd53111..b3691d91173 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4802,10 +4802,11 @@ static void test_shared_bitmap(BOOL d3d11) static void test_bitmap_updates(BOOL d3d11) { D2D1_BITMAP_PROPERTIES bitmap_desc; + ID2D1Bitmap *bitmap, *dst_bitmap; + D2D1_RECT_U dst_rect, src_rect; struct d2d1_test_context ctx; + D2D1_POINT_2U dst_point; ID2D1RenderTarget *rt; - D2D1_RECT_U dst_rect; - ID2D1Bitmap *bitmap; D2D1_COLOR_F color; D2D1_RECT_F rect; D2D1_SIZE_U size; @@ -4883,6 +4884,40 @@ static void test_bitmap_updates(BOOL d3d11) match = compare_surface(&ctx, "cb8136c91fbbdc76bb83b8c09edc1907b0a5d0a6"); ok(match, "Surface does not match.\n"); + ID2D1RenderTarget_BeginDraw(rt); + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(rt, &color); + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, NULL, 0, &bitmap_desc, &dst_bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap_CopyFromBitmap(dst_bitmap, NULL, bitmap, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + dst_point.x = 1; dst_point.y = 1; + hr = ID2D1Bitmap_CopyFromBitmap(dst_bitmap, &dst_point, bitmap, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + dst_point.x = 0; dst_point.y = 1; + set_rect_u(&src_rect, 1, 1, 3, 3); + hr = ID2D1Bitmap_CopyFromBitmap(dst_bitmap, &dst_point, bitmap, &src_rect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + dst_point.x = 1; dst_point.y = 0; + set_rect_u(&src_rect, 2, 2, 1, 1); + hr = ID2D1Bitmap_CopyFromBitmap(dst_bitmap, &dst_point, bitmap, &src_rect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + set_rect_u(&src_rect, 1, 1, 2, 2); + hr = ID2D1Bitmap_CopyFromBitmap(dst_bitmap, NULL, bitmap, &src_rect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + set_rect(&rect, 320.0f, 0.0f, 640.0f, 240.0f); + ID2D1RenderTarget_DrawBitmap(rt, dst_bitmap, &rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + match = compare_surface(&ctx, "a1758bd644d897f75d43769ba26456af70cd9056"); + ok(match, "Surface does not match.\n"); + ID2D1Bitmap_Release(dst_bitmap); + ID2D1Bitmap_Release(bitmap); release_test_context(&ctx); } -- 2.34.1

2 1

[PATCH] mfplat/buffer: Lock D3D9 surfaces with usage flags.
by Giovanni Mascellani Feb. 11, 2022

Feb. 11, 2022

This way the underlying implementation is able to save some copies. Running CHRONO TRIGGER with this commit saves 1-2 ms per frame in the sample copier on my computer. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfplat/buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index f161bb29d80..c45309e1c31 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -385,7 +385,7 @@ static HRESULT WINAPI d3d9_surface_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat if (SUCCEEDED(hr)) { - hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &rect, NULL, 0); + hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &rect, NULL, D3DLOCK_READONLY); if (SUCCEEDED(hr)) { copy_image(buffer, buffer->_2d.linear_buffer, buffer->_2d.width, rect.pBits, rect.Pitch, @@ -425,7 +425,7 @@ static HRESULT WINAPI d3d9_surface_buffer_Unlock(IMFMediaBuffer *iface) { D3DLOCKED_RECT rect; - if (SUCCEEDED(hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &rect, NULL, 0))) + if (SUCCEEDED(hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &rect, NULL, D3DLOCK_DISCARD))) { copy_image(buffer, rect.pBits, rect.Pitch, buffer->_2d.linear_buffer, buffer->_2d.width, buffer->_2d.width, buffer->_2d.height); -- 2.34.1

1 0

[PATCH 7/7] msvcp60: Remove unused functions from ios.c file.
by Piotr Caban Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 1416 +++++++------------------------------------- 1 file changed, 225 insertions(+), 1191 deletions(-)

1 0

[PATCH 6/7] msvcp60: Add missing exports.
by Piotr Caban Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 9 +++++---- dlls/msvcp60/msvcp60.spec | 36 ++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 22 deletions(-)

1 0

[PATCH 5/7] msvcp60: Remove basic_ios<wchar> code.
by Piotr Caban Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 498 +++++++++++++++++--------------------- dlls/msvcp60/msvcp60.spec | 56 ++--- 2 files changed, 246 insertions(+), 308 deletions(-)

1 0

[PATCH 4/7] msvcp60: Remove basic_streambuf<wchar> code.
by Piotr Caban Feb. 11, 2022

Feb. 11, 2022

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

1 0

[PATCH 3/7] msvcp60: Remove basic_filebuf<wchar> code.
by Piotr Caban Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 341 +++++++++----------------------------- dlls/msvcp60/msvcp60.spec | 52 +++--- 2 files changed, 106 insertions(+), 287 deletions(-)

1 0

[PATCH 2/7] msvcp60: Remove basic_streambuf<wchar> code.
by Piotr Caban Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 188 ++++++++++++-------------------------- dlls/msvcp60/msvcp60.spec | 44 ++++----- 2 files changed, 80 insertions(+), 152 deletions(-)

1 0

[PATCH 1/7] msvcp60: Remove basic_ostream<wchar> code.
by Piotr Caban Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 686 ++++++++++++-------------------------- dlls/msvcp60/msvcp60.spec | 88 ++--- 2 files changed, 256 insertions(+), 518 deletions(-)

1 0

[PATCH v2 4/5] comctl32: LVM_INSERTITEM handler should send LVN_ITEMCHANGING/LVN_ITEMCHANGED notifications when the item state is being set.
by Dmitry Timoshkov Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/listview.c | 9 +++++---- dlls/comctl32/tests/listview.c | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cd7fec28e27..137ca7c6529 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4260,11 +4260,12 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; nmlv.lParam = item.lParam; - /* Send LVN_ITEMCHANGING notification, if the item is not being inserted + /* Send LVN_ITEMCHANGING notification: + if the item is not being inserted or its state is being set, and we are _NOT_ virtual (LVS_OWNERDATA), and change notifications are enabled. Even nothing really changed we still need to send this, in this case uChanged mask is just set to passed item mask. */ - if (lpItem && !isNew && (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE)) + if (lpItem && (!isNew || (uChanged & LVIF_STATE)) && (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE)) { HWND hwndSelf = infoPtr->hwndSelf; @@ -4352,8 +4353,8 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL } } - /* if we're inserting the item, we're done */ - if (isNew) return TRUE; + /* if we're inserting the item and its state is not being set, we're done */ + if (isNew && !(uChanged & LVIF_STATE)) return TRUE; /* send LVN_ITEMCHANGED notification */ if (lpLVItem->mask & LVIF_PARAM) nmlv.lParam = lpLVItem->lParam; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index a53fec81c90..4521158d141 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6017,7 +6017,7 @@ static void test_LVM_INSERTITEM(void) if ((insert_item[i].mask & LVIF_STATE) && (insert_item[i].state & (LVIS_FOCUSED | LVIS_SELECTED))) { sprintf(buf, "%d: insert focused", i); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, insert_item[i].mask != LVIF_STATE); } else { @@ -6054,7 +6054,7 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 0, "got %d\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, "insert focused 0", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, "insert focused 0", FALSE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); @@ -6067,7 +6067,7 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 1, "got %d\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused1_seq, "insert focused 1", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused1_seq, "insert focused 1", FALSE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); -- 2.34.1

2 3

[PATCH v2 5/5] comctl32: LVM_INSERTITEM handler should send notifications with uChanged = LVIF_STATE.
by Dmitry Timoshkov Feb. 11, 2022

Feb. 11, 2022

According to the tests uChanged in the notification for a new item has only LVIF_STATE flag set. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/listview.c | 8 +++++++- dlls/comctl32/tests/listview.c | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 137ca7c6529..e65d86f1ccc 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4257,7 +4257,13 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL nmlv.uNewState = (item.state & ~stateMask) | (lpLVItem->state & stateMask); nmlv.uOldState = item.state; } - nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; + /* According to the tests uChanged in the notification for a new item + * has only LVIF_STATE flag set. + */ + if (isNew) + nmlv.uChanged = LVIF_STATE; + else + nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; nmlv.lParam = item.lParam; /* Send LVN_ITEMCHANGING notification: diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 4521158d141..2dc77a78b75 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6017,7 +6017,7 @@ static void test_LVM_INSERTITEM(void) if ((insert_item[i].mask & LVIF_STATE) && (insert_item[i].state & (LVIS_FOCUSED | LVIS_SELECTED))) { sprintf(buf, "%d: insert focused", i); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, insert_item[i].mask != LVIF_STATE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, FALSE); } else { @@ -6094,7 +6094,7 @@ static void test_insertitem(void) item.lParam = 0xdeadbeef; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 3, "got %d\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_selected_seq, "insert selected", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_selected_seq, "insert selected", FALSE); /* insert item 4 */ item.mask = LVIF_PARAM; -- 2.34.1

1 0

[PATCH v2 3/5] comctl32/tests: Add more LVM_INSERTITEM tests.
by Dmitry Timoshkov Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/listview.c | 176 ++++++++++++++++++++++++++++++--- 1 file changed, 163 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index bc89e8938be..a53fec81c90 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -413,15 +413,6 @@ static const struct message listview_header_set_imagelist[] = { { 0 } }; -static const struct message parent_insert_focused_seq[] = { - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, - { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, - { 0 } -}; - static const struct message parent_report_cd_seq[] = { { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_PREPAINT }, { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT }, @@ -5920,6 +5911,130 @@ static void test_deleteitem(void) DestroyWindow(hwnd); } +static const struct message parent_insert_focused0_seq[] = { + { WM_NOTIFY, sent|id|wparam|lparam, 0, LVIF_STATE, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id|wparam|lparam, 0, LVIF_STATE, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + +static const struct message parent_insert_focused1_seq[] = { + { WM_NOTIFY, sent|id|wparam|lparam, 1, LVIF_STATE, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id|wparam|lparam, 0, LVIF_STATE, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id|wparam|lparam, 0, LVIF_STATE, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam|lparam, 1, LVIF_STATE, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + +static const struct message parent_insert_item_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + +static const struct message parent_insert_selected_seq[] = { + { WM_NOTIFY, sent|id|wparam|lparam, 3, LVIF_STATE, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id|wparam|lparam, 3, LVIF_STATE, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + +#define LVIS_ALL (LVIS_FOCUSED | LVIS_SELECTED | LVIS_CUT | LVIS_DROPHILITED | LVIS_ACTIVATING) + +static void test_LVM_INSERTITEM(void) +{ + static const struct + { + UINT mask, state, stateMask; + } insert_item[] = + { + { LVIF_STATE, LVIS_FOCUSED, LVIS_FOCUSED }, + { LVIF_STATE, LVIS_FOCUSED, 0 }, + { LVIF_STATE, 0, LVIS_FOCUSED }, + + { LVIF_STATE, LVIS_SELECTED, LVIS_SELECTED }, + { LVIF_STATE, LVIS_SELECTED, 0 }, + { LVIF_STATE, 0, LVIS_SELECTED }, + + { LVIF_STATE, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED }, + { LVIF_STATE, LVIS_FOCUSED | LVIS_SELECTED, 0 }, + { LVIF_STATE, 0, LVIS_FOCUSED | LVIS_SELECTED }, + + { LVIF_STATE, LVIS_ALL, LVIS_ALL }, + { LVIF_STATE, LVIS_ALL, 0 }, + { LVIF_STATE, 0, LVIS_ALL }, + + { LVIF_STATE | LVIF_PARAM, 0, 0 }, + { LVIF_STATE | LVIF_PARAM, LVIS_FOCUSED, LVIS_FOCUSED }, + { LVIF_STATE | LVIF_PARAM, LVIS_FOCUSED, 0 }, + { LVIF_STATE | LVIF_PARAM, 0, LVIS_FOCUSED }, + + { LVIF_STATE | LVIF_PARAM, LVIS_SELECTED, LVIS_SELECTED }, + { LVIF_STATE | LVIF_PARAM, LVIS_SELECTED, 0 }, + { LVIF_STATE | LVIF_PARAM, 0, LVIS_SELECTED }, + + { LVIF_STATE, 0, 0 }, + { LVIF_PARAM, 0, 0 }, + + { LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, 0, 0 }, + { LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, LVIS_FOCUSED, LVIS_FOCUSED }, + { LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, LVIS_FOCUSED, 0 }, + { LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, 0, LVIS_FOCUSED }, + + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, 0, 0 }, + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, LVIS_FOCUSED, LVIS_FOCUSED }, + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, LVIS_FOCUSED, 0 }, + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, 0, LVIS_FOCUSED }, + + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, 0, 0 }, + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, LVIS_ALL, LVIS_ALL }, + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, LVIS_ALL, 0 }, + { LVIF_STATE | LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE, 0, LVIS_ALL }, + }; + LVITEMA item; + UINT state; + HWND hwnd; + INT ret, i; + char buf[256]; + + for (i = 0; i < ARRAYSIZE(insert_item); i++) + { + hwnd = create_listview_control(LVS_REPORT); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + item.mask = insert_item[i].mask; + item.state = insert_item[i].state; + item.stateMask = insert_item[i].stateMask; + item.pszText = (LPSTR)"Hello World!"; + item.iImage = I_IMAGECALLBACK; + item.iItem = 0; + item.iSubItem = 0; + item.lParam = 0xdeadbeef; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 0, "%d: got %d\n", i, ret); + + if ((insert_item[i].mask & LVIF_STATE) && (insert_item[i].state & (LVIS_FOCUSED | LVIS_SELECTED))) + { + sprintf(buf, "%d: insert focused", i); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, TRUE); + } + else + { + sprintf(buf, "%d: insert item", i); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_item_seq, buf, FALSE); + } + + state = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_ALL); + if ((insert_item[i].mask & LVIF_STATE) && (insert_item[i].state & (LVIS_FOCUSED | LVIS_SELECTED))) + ok(state == insert_item[i].state, "%d: expected %#x, got %#x\n", i, insert_item[i].state, state); + else + ok(state == 0, "%d: expected 0, got %#x\n", i, state); + + DestroyWindow(hwnd); + } +} + static void test_insertitem(void) { LVITEMA item; @@ -5929,6 +6044,8 @@ static void test_insertitem(void) hwnd = create_listview_control(LVS_REPORT); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + /* insert item 0 focused */ item.mask = LVIF_STATE; item.state = LVIS_FOCUSED; @@ -5937,12 +6054,11 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 0, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, "insert focused 0", TRUE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); - flush_sequences(sequences, NUM_MSG_SEQUENCES); - /* insert item 1, focus shift */ item.mask = LVIF_STATE; item.state = LVIS_FOCUSED; @@ -5951,8 +6067,7 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 1, "got %d\n", ret); - - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused_seq, "insert focused", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused1_seq, "insert focused 1", TRUE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); @@ -5965,10 +6080,44 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 2, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_item_seq, "insert focused 2", FALSE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); + /* insert item 3 */ + item.mask = LVIF_STATE | LVIF_PARAM; + item.state = LVIS_SELECTED; + item.stateMask = LVIS_SELECTED; + item.iItem = 3; + item.iSubItem = 0; + item.lParam = 0xdeadbeef; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 3, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_selected_seq, "insert selected", TRUE); + + /* insert item 4 */ + item.mask = LVIF_PARAM; + item.state = 0; + item.stateMask = 0; + item.iItem = 4; + item.iSubItem = 0; + item.lParam = 0xdeadbeef; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 4, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_item_seq, "insert param", FALSE); + + /* insert item 5 */ + item.mask = LVIF_STATE; + item.state = 0; + item.stateMask = 0; + item.iItem = 5; + item.iSubItem = 0; + item.lParam = 0xdeadbeef; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 5, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_item_seq, "insert state", FALSE); + DestroyWindow(hwnd); } @@ -6718,6 +6867,7 @@ START_TEST(listview) test_imagelists(); test_deleteitem(); test_insertitem(); + test_LVM_INSERTITEM(); test_header_proc(); test_oneclickactivate(); test_callback_mask(); -- 2.34.1

1 0

[PATCH v2 2/5] comctl32/tests: Add iItem and uChanged to LVN_ITEMCHANGING/LVN_ITEMCHANGED context.
by Dmitry Timoshkov Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/listview.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 5485cd4b4e2..bc89e8938be 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -472,7 +472,17 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; - if (message == WM_NOTIFY && lParam) msg.id = ((NMHDR*)lParam)->code; + if (message == WM_NOTIFY && lParam) + { + NMLISTVIEW *nmlv = (NMLISTVIEW *)lParam; + + msg.id = nmlv->hdr.code; + if (msg.id == LVN_ITEMCHANGING || msg.id == LVN_ITEMCHANGED) + { + msg.wParam = nmlv->iItem; + msg.lParam = nmlv->uChanged; + } + } if (message == WM_COMMAND) msg.id = HIWORD(wParam); /* log system messages, except for painting */ -- 2.34.1

1 0

[PATCH] mfplat/buffer: Avoid two copies when locking a D3D9 buffer if possible.
by Giovanni Mascellani Feb. 11, 2022

Feb. 11, 2022

Running CHRONO TRIGGER with this commit saves at least 3 ms per frame in the sample copier on my computer. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfplat/buffer.c | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index f161bb29d80..e20961169f8 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -57,6 +57,7 @@ struct buffer int pitch; unsigned int locks; p_copy_image_func copy_image; + BOOL copy; } _2d; struct { @@ -380,17 +381,28 @@ static HRESULT WINAPI d3d9_surface_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat { D3DLOCKED_RECT rect; - if (!(buffer->_2d.linear_buffer = malloc(ALIGN_SIZE(buffer->_2d.plane_size, MF_64_BYTE_ALIGNMENT)))) - hr = E_OUTOFMEMORY; + hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &rect, NULL, 0); if (SUCCEEDED(hr)) { - hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &rect, NULL, 0); - if (SUCCEEDED(hr)) + if (rect.Pitch == buffer->_2d.width) { - copy_image(buffer, buffer->_2d.linear_buffer, buffer->_2d.width, rect.pBits, rect.Pitch, - buffer->_2d.width, buffer->_2d.height); - IDirect3DSurface9_UnlockRect(buffer->d3d9_surface.surface); + buffer->_2d.linear_buffer = rect.pBits; + buffer->_2d.copy = FALSE; + } + else + { + if ((buffer->_2d.linear_buffer = malloc(ALIGN_SIZE(buffer->_2d.plane_size, MF_64_BYTE_ALIGNMENT)))) + { + copy_image(buffer, buffer->_2d.linear_buffer, buffer->_2d.width, rect.pBits, rect.Pitch, + buffer->_2d.width, buffer->_2d.height); + IDirect3DSurface9_UnlockRect(buffer->d3d9_surface.surface); + buffer->_2d.copy = TRUE; + } + else + { + hr = E_OUTOFMEMORY; + } } } } @@ -425,14 +437,22 @@ static HRESULT WINAPI d3d9_surface_buffer_Unlock(IMFMediaBuffer *iface) { D3DLOCKED_RECT rect; - if (SUCCEEDED(hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &rect, NULL, 0))) + if (buffer->_2d.copy) + { + if (SUCCEEDED(hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &rect, NULL, 0))) + { + copy_image(buffer, rect.pBits, rect.Pitch, buffer->_2d.linear_buffer, buffer->_2d.width, + buffer->_2d.width, buffer->_2d.height); + IDirect3DSurface9_UnlockRect(buffer->d3d9_surface.surface); + } + + free(buffer->_2d.linear_buffer); + } + else { - copy_image(buffer, rect.pBits, rect.Pitch, buffer->_2d.linear_buffer, buffer->_2d.width, - buffer->_2d.width, buffer->_2d.height); IDirect3DSurface9_UnlockRect(buffer->d3d9_surface.surface); } - free(buffer->_2d.linear_buffer); buffer->_2d.linear_buffer = NULL; } -- 2.34.1

2 3

[PATCH 01/23] dlls/iccvid: enable compilation with long types
by Eric Pouech Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/iccvid/Makefile.in | 1 - dlls/iccvid/iccvid.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/iccvid/Makefile.in b/dlls/iccvid/Makefile.in index 835935c1162..77254521fae 100644 --- a/dlls/iccvid/Makefile.in +++ b/dlls/iccvid/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = iccvid.dll IMPORTS = user32 diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index 67967a0fb38..4dc418c590b 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -743,8 +743,8 @@ static void ICCVID_dump_BITMAPINFO(const BITMAPINFO * bmi) TRACE( "planes = %d\n" "bpp = %d\n" - "height = %d\n" - "width = %d\n" + "height = %ld\n" + "width = %ld\n" "compr = %s\n", bmi->bmiHeader.biPlanes, bmi->bmiHeader.biBitCount, @@ -759,7 +759,7 @@ static inline int ICCVID_CheckMask(RGBQUAD bmiColors[3], COLORREF redMask, COLOR COLORREF realBlueMask = MAKECOLOUR32(bmiColors[1].rgbRed, bmiColors[1].rgbGreen, bmiColors[1].rgbBlue); COLORREF realGreenMask = MAKECOLOUR32(bmiColors[2].rgbRed, bmiColors[2].rgbGreen, bmiColors[2].rgbBlue); - TRACE("\nbmiColors[0] = 0x%08x\nbmiColors[1] = 0x%08x\nbmiColors[2] = 0x%08x\n", + TRACE("\nbmiColors[0] = 0x%08lx\nbmiColors[1] = 0x%08lx\nbmiColors[2] = 0x%08lx\n", realRedMask, realBlueMask, realGreenMask); if ((realRedMask == redMask) && @@ -888,7 +888,7 @@ static LRESULT ICCVID_Decompress( ICCVID_Info *info, ICDECOMPRESS *icd, DWORD si LONG width, height; BOOL inverted; - TRACE("ICM_DECOMPRESS %p %p %d\n", info, icd, size); + TRACE("ICM_DECOMPRESS %p %p %ld\n", info, icd, size); if( (info==NULL) || (info->dwMagic!=ICCVID_MAGIC) ) return ICERR_BADPARAM; @@ -913,7 +913,7 @@ static LRESULT ICCVID_DecompressEx( ICCVID_Info *info, ICDECOMPRESSEX *icd, DWOR LONG width, height; BOOL inverted; - TRACE("ICM_DECOMPRESSEX %p %p %d\n", info, icd, size); + TRACE("ICM_DECOMPRESSEX %p %p %ld\n", info, icd, size); if( (info==NULL) || (info->dwMagic!=ICCVID_MAGIC) ) return ICERR_BADPARAM; @@ -979,7 +979,7 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, { ICCVID_Info *info = (ICCVID_Info *) dwDriverId; - TRACE("%ld %p %d %ld %ld\n", dwDriverId, hdrvr, msg, lParam1, lParam2); + TRACE("%Id %p %d %Id %Id\n", dwDriverId, hdrvr, msg, lParam1, lParam2); switch( msg ) { @@ -1043,14 +1043,14 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, return ICERR_UNSUPPORTED; default: - FIXME("Unknown message: %04x %ld %ld\n", msg, lParam1, lParam2); + FIXME("Unknown message: %04x %Id %Id\n", msg, lParam1, lParam2); } return ICERR_UNSUPPORTED; } BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) { - TRACE("(%p,%d,%p)\n", hModule, dwReason, lpReserved); + TRACE("(%p,%ld,%p)\n", hModule, dwReason, lpReserved); switch (dwReason) {

2 24

[PATCH v2] mscms: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker Feb. 11, 2022

Feb. 11, 2022

v2: Rebase. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mscms/Makefile.in | 1 - dlls/mscms/mscms_main.c | 4 +- dlls/mscms/profile.c | 38 ++-- dlls/mscms/stub.c | 30 +-- dlls/mscms/tests/Makefile.in | 1 - dlls/mscms/tests/profile.c | 372 +++++++++++++++++------------------ dlls/mscms/transform.c | 25 ++- 7 files changed, 232 insertions(+), 239 deletions(-) diff --git a/dlls/mscms/Makefile.in b/dlls/mscms/Makefile.in index f28f90327f4..d57cc54e3c6 100644 --- a/dlls/mscms/Makefile.in +++ b/dlls/mscms/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mscms.dll IMPORTLIB = mscms IMPORTS = $(LCMS2_PE_LIBS) shlwapi advapi32 diff --git a/dlls/mscms/mscms_main.c b/dlls/mscms/mscms_main.c index 1ea2eaef832..8c7e7c9e498 100644 --- a/dlls/mscms/mscms_main.c +++ b/dlls/mscms/mscms_main.c @@ -37,9 +37,9 @@ static void lcms_error_handler(cmsContext ctx, cmsUInt32Number error, const char TRACE("%u %s\n", error, debugstr_a(text)); } -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved ) { - TRACE( "(%p, %d, %p)\n", hinst, reason, reserved ); + TRACE( "(%p, %lu, %p)\n", hinst, reason, reserved ); switch (reason) { diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 83bfcb50143..2c20b857a81 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -328,7 +328,7 @@ BOOL WINAPI GetColorProfileElement( HPROFILE handle, TAGTYPE type, DWORD offset, BOOL ret; struct profile *profile = grab_profile( handle ); - TRACE( "( %p, 0x%08x, %d, %p, %p, %p )\n", handle, type, offset, size, buffer, ref ); + TRACE( "( %p, %#lx, %lu, %p, %p, %p )\n", handle, type, offset, size, buffer, ref ); if (!profile) return FALSE; @@ -366,7 +366,7 @@ BOOL WINAPI GetColorProfileElementTag( HPROFILE handle, DWORD index, PTAGTYPE ty struct profile *profile = grab_profile( handle ); struct tag_entry tag; - TRACE( "( %p, %d, %p )\n", handle, index, type ); + TRACE( "( %p, %lu, %p )\n", handle, index, type ); if (!profile) return FALSE; @@ -507,7 +507,7 @@ BOOL WINAPI GetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile BOOL ret = FALSE; DWORD sizeW; - TRACE( "( 0x%08x, %p, %p )\n", id, profile, size ); + TRACE( "( %#lx, %p, %p )\n", id, profile, size ); if (machine) { @@ -567,7 +567,7 @@ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profi WCHAR rgbprofile[MAX_PATH]; DWORD len = sizeof(rgbprofile); - TRACE( "( 0x%08x, %p, %p )\n", id, profile, size ); + TRACE( "( %#lx, %p, %p )\n", id, profile, size ); if (machine) { @@ -663,15 +663,15 @@ static BOOL match_profile( PENUMTYPEW rec, PPROFILEHEADER hdr ) } if (rec->dwFields & ET_MEDIATYPE) { - FIXME( "ET_MEDIATYPE: 0x%08x\n", rec->dwMediaType ); + FIXME( "ET_MEDIATYPE: %#lx\n", rec->dwMediaType ); } if (rec->dwFields & ET_DITHERMODE) { - FIXME( "ET_DITHERMODE: 0x%08x\n", rec->dwDitheringMode ); + FIXME( "ET_DITHERMODE: %#lx\n", rec->dwDitheringMode ); } if (rec->dwFields & ET_RESOLUTION) { - FIXME( "ET_RESOLUTION: 0x%08x, 0x%08x\n", + FIXME( "ET_RESOLUTION: %#lx, %#lx\n", rec->dwResolution[0], rec->dwResolution[1] ); } if (rec->dwFields & ET_DEVICECLASS) @@ -710,7 +710,7 @@ static BOOL match_profile( PENUMTYPEW rec, PPROFILEHEADER hdr ) } if (rec->dwFields & ET_PROFILEFLAGS) { - TRACE( "ET_PROFILEFLAGS: 0x%08x\n", rec->dwProfileFlags ); + TRACE( "ET_PROFILEFLAGS: %#lx\n", rec->dwProfileFlags ); if (rec->dwProfileFlags != hdr->phProfileFlags) return FALSE; } if (rec->dwFields & ET_MANUFACTURER) @@ -725,14 +725,14 @@ static BOOL match_profile( PENUMTYPEW rec, PPROFILEHEADER hdr ) } if (rec->dwFields & ET_ATTRIBUTES) { - TRACE( "ET_ATTRIBUTES: 0x%08x, 0x%08x\n", + TRACE( "ET_ATTRIBUTES: %#lx, %#lx\n", rec->dwAttributes[0], rec->dwAttributes[1] ); if (rec->dwAttributes[0] != hdr->phAttributes[0] || rec->dwAttributes[1] != hdr->phAttributes[1]) return FALSE; } if (rec->dwFields & ET_RENDERINGINTENT) { - TRACE( "ET_RENDERINGINTENT: 0x%08x\n", rec->dwRenderingIntent ); + TRACE( "ET_RENDERINGINTENT: %#lx\n", rec->dwRenderingIntent ); if (rec->dwRenderingIntent != hdr->phRenderingIntent) return FALSE; } if (rec->dwFields & ET_CREATOR) @@ -1095,7 +1095,7 @@ BOOL WINAPI IsColorProfileTagPresent( HPROFILE handle, TAGTYPE type, PBOOL prese struct profile *profile = grab_profile( handle ); struct tag_entry tag; - TRACE( "( %p, 0x%08x, %p )\n", handle, type, present ); + TRACE( "( %p, %#lx, %p )\n", handle, type, present ); if (!profile) return FALSE; @@ -1164,7 +1164,7 @@ BOOL WINAPI SetColorProfileElement( HPROFILE handle, TAGTYPE type, DWORD offset, BOOL ret; struct profile *profile = grab_profile( handle ); - TRACE( "( %p, 0x%08x, %d, %p, %p )\n", handle, type, offset, size, buffer ); + TRACE( "( %p, %#lx, %lu, %p, %p )\n", handle, type, offset, size, buffer ); if (!profile) return FALSE; @@ -1286,7 +1286,7 @@ HPROFILE WINAPI OpenColorProfileA( PPROFILE profile, DWORD access, DWORD sharing HPROFILE handle = NULL; PROFILE profileW; - TRACE( "( %p, 0x%08x, 0x%08x, 0x%08x )\n", profile, access, sharing, creation ); + TRACE( "( %p, %#lx, %#lx, %#lx )\n", profile, access, sharing, creation ); if (!profile || !profile->pProfileData) return NULL; @@ -1331,7 +1331,7 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing HANDLE handle = INVALID_HANDLE_VALUE; DWORD size; - TRACE( "( %p, 0x%08x, 0x%08x, 0x%08x )\n", profile, access, sharing, creation ); + TRACE( "( %p, %#lx, %#lx, %#lx )\n", profile, access, sharing, creation ); if (!profile || !profile->pProfileData) return NULL; @@ -1381,7 +1381,7 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing } if (handle == INVALID_HANDLE_VALUE) { - WARN( "Unable to open color profile %u\n", GetLastError() ); + WARN( "Unable to open color profile %lu\n", GetLastError() ); return NULL; } if ((size = GetFileSize( handle, NULL )) == INVALID_FILE_SIZE) @@ -1413,7 +1413,7 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing } else { - ERR( "Invalid profile type %u\n", profile->dwType ); + ERR( "Invalid profile type %lu\n", profile->dwType ); return NULL; } @@ -1476,7 +1476,7 @@ BOOL WINAPI WcsGetDefaultColorProfileSize( WCS_PROFILE_MANAGEMENT_SCOPE scope, P COLORPROFILETYPE type, COLORPROFILESUBTYPE subtype, DWORD profile_id, PDWORD profile_size) { - FIXME( "%d %s %d %d %d %p\n", scope, debugstr_w(device_name), type, subtype, profile_id, profile_size ); + FIXME( "%d, %s, %d, %d, %lu, %p\n", scope, debugstr_w(device_name), type, subtype, profile_id, profile_size ); SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } @@ -1500,7 +1500,7 @@ HPROFILE WINAPI WcsOpenColorProfileA( PROFILE *cdm, PROFILE *camp, PROFILE *gmmp PROFILE cdmW, campW = {0}, gmmpW = {0}; HPROFILE ret = NULL; - TRACE( "%p, %p, %p, %08x, %08x, %08x, %08x\n", cdm, camp, gmmp, access, sharing, creation, flags ); + TRACE( "%p, %p, %p, %#lx, %#lx, %#lx, %#lx\n", cdm, camp, gmmp, access, sharing, creation, flags ); if (!cdm || !profile_AtoW( cdm, &cdmW )) return NULL; if (camp && !profile_AtoW( camp, &campW )) goto done; @@ -1521,7 +1521,7 @@ done: HPROFILE WINAPI WcsOpenColorProfileW( PROFILE *cdm, PROFILE *camp, PROFILE *gmmp, DWORD access, DWORD sharing, DWORD creation, DWORD flags ) { - TRACE( "%p, %p, %p, %08x, %08x, %08x, %08x\n", cdm, camp, gmmp, access, sharing, creation, flags ); + TRACE( "%p, %p, %p, %#lx, %#lx, %#lx, %#lx\n", cdm, camp, gmmp, access, sharing, creation, flags ); FIXME("no support for WCS profiles\n" ); return OpenColorProfileW( cdm, access, sharing, creation ); diff --git a/dlls/mscms/stub.c b/dlls/mscms/stub.c index 28c08e20868..6ac777a86f7 100644 --- a/dlls/mscms/stub.c +++ b/dlls/mscms/stub.c @@ -35,7 +35,7 @@ BOOL WINAPI CheckBitmapBits( HTRANSFORM transform, PVOID srcbits, BMFORMAT forma DWORD height, DWORD stride, PBYTE result, PBMCALLBACKFN callback, LPARAM data ) { - FIXME( "( %p, %p, 0x%08x, 0x%08x, 0x%08x, 0x%08x, %p, %p, 0x%08lx ) stub\n", + FIXME( "( %p, %p, %#x, %#lx, %#lx, %#lx, %p, %p, %#Ix ) stub\n", transform, srcbits, format, width, height, stride, result, callback, data ); return FALSE; @@ -44,21 +44,21 @@ BOOL WINAPI CheckBitmapBits( HTRANSFORM transform, PVOID srcbits, BMFORMAT forma BOOL WINAPI CheckColors( HTRANSFORM transform, PCOLOR colors, DWORD number, COLORTYPE type, PBYTE result ) { - FIXME( "( %p, %p, 0x%08x, 0x%08x, %p ) stub\n", transform, colors, number, type, result ); + FIXME( "( %p, %p, %#lx, %#x, %p ) stub\n", transform, colors, number, type, result ); return FALSE; } BOOL WINAPI ConvertColorNameToIndex( HPROFILE profile, PCOLOR_NAME name, PDWORD index, DWORD count ) { - FIXME( "( %p, %p, %p, 0x%08x ) stub\n", profile, name, index, count ); + FIXME( "( %p, %p, %p, %#lx ) stub\n", profile, name, index, count ); return FALSE; } BOOL WINAPI ConvertIndexToColorName( HPROFILE profile, PDWORD index, PCOLOR_NAME name, DWORD count ) { - FIXME( "( %p, %p, %p, 0x%08x ) stub\n", profile, index, name, count ); + FIXME( "( %p, %p, %p, %#lx ) stub\n", profile, index, name, count ); return FALSE; } @@ -66,7 +66,7 @@ BOOL WINAPI ConvertIndexToColorName( HPROFILE profile, PDWORD index, PCOLOR_NAME BOOL WINAPI CreateDeviceLinkProfile( PHPROFILE profiles, DWORD nprofiles, PDWORD intents, DWORD nintents, DWORD flags, PBYTE *data, DWORD index ) { - FIXME( "( %p, 0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08x ) stub\n", + FIXME( "( %p, %#lx, %p, %#lx, %#lx, %p, %#lx ) stub\n", profiles, nprofiles, intents, nintents, flags, data, index ); return FALSE; @@ -90,7 +90,7 @@ DWORD WINAPI GenerateCopyFilePaths( LPCWSTR printer, LPCWSTR directory, LPBYTE c DWORD level, LPWSTR sourcedir, LPDWORD sourcedirsize, LPWSTR targetdir, LPDWORD targetdirsize, DWORD flags ) { - FIXME( "( %s, %s, %p, 0x%08x, %p, %p, %p, %p, 0x%08x ) stub\n", + FIXME( "( %s, %s, %p, %#lx, %p, %p, %p, %p, %#lx ) stub\n", debugstr_w(printer), debugstr_w(directory), clientinfo, level, sourcedir, sourcedirsize, targetdir, targetdirsize, flags ); return ERROR_SUCCESS; @@ -98,7 +98,7 @@ DWORD WINAPI GenerateCopyFilePaths( LPCWSTR printer, LPCWSTR directory, LPBYTE c DWORD WINAPI GetCMMInfo( HTRANSFORM transform, DWORD info ) { - FIXME( "( %p, 0x%08x ) stub\n", transform, info ); + FIXME( "( %p, %#lx ) stub\n", transform, info ); return 0; } @@ -113,14 +113,14 @@ BOOL WINAPI GetNamedProfileInfo( HPROFILE profile, PNAMED_PROFILE_INFO info ) BOOL WINAPI GetPS2ColorRenderingDictionary( HPROFILE profile, DWORD intent, PBYTE buffer, PDWORD size, PBOOL binary ) { - FIXME( "( %p, 0x%08x, %p, %p, %p ) stub\n", profile, intent, buffer, size, binary ); + FIXME( "( %p, %#lx, %p, %p, %p ) stub\n", profile, intent, buffer, size, binary ); return FALSE; } BOOL WINAPI GetPS2ColorRenderingIntent( HPROFILE profile, DWORD intent, PBYTE buffer, PDWORD size ) { - FIXME( "( %p, 0x%08x, %p, %p ) stub\n", profile, intent, buffer, size ); + FIXME( "( %p, %#lx, %p, %p ) stub\n", profile, intent, buffer, size ); return FALSE; } @@ -128,7 +128,7 @@ BOOL WINAPI GetPS2ColorRenderingIntent( HPROFILE profile, DWORD intent, PBYTE bu BOOL WINAPI GetPS2ColorSpaceArray( HPROFILE profile, DWORD intent, DWORD type, PBYTE buffer, PDWORD size, PBOOL binary ) { - FIXME( "( %p, 0x%08x, 0x%08x, %p, %p, %p ) stub\n", profile, intent, type, buffer, size, binary ); + FIXME( "( %p, %#lx, %#lx, %p, %p, %p ) stub\n", profile, intent, type, buffer, size, binary ); return FALSE; } @@ -156,33 +156,33 @@ BOOL WINAPI SelectCMM( DWORD id ) BOOL WINAPI SetColorProfileElementReference( HPROFILE profile, TAGTYPE type, TAGTYPE ref ) { - FIXME( "( %p, 0x%08x, 0x%08x ) stub\n", profile, type, ref ); + FIXME( "( %p, %#lx, %#lx ) stub\n", profile, type, ref ); return TRUE; } BOOL WINAPI SetColorProfileElementSize( HPROFILE profile, TAGTYPE type, DWORD size ) { - FIXME( "( %p, 0x%08x, 0x%08x ) stub\n", profile, type, size ); + FIXME( "( %p, %#lx, %#lx ) stub\n", profile, type, size ); return FALSE; } BOOL WINAPI SetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile ) { - FIXME( "( 0x%08x, %p ) stub\n", id, profile ); + FIXME( "( %#lx, %p ) stub\n", id, profile ); return TRUE; } BOOL WINAPI SetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profile ) { - FIXME( "( 0x%08x, %p ) stub\n", id, profile ); + FIXME( "( %#lx, %p ) stub\n", id, profile ); return TRUE; } BOOL WINAPI SpoolerCopyFileEvent( LPWSTR printer, LPWSTR key, DWORD event ) { - FIXME( "( %s, %s, 0x%08x ) stub\n", debugstr_w(printer), debugstr_w(key), event ); + FIXME( "( %s, %s, %#lx ) stub\n", debugstr_w(printer), debugstr_w(key), event ); return TRUE; } diff --git a/dlls/mscms/tests/Makefile.in b/dlls/mscms/tests/Makefile.in index e9ff9724e2f..2d229c049ab 100644 --- a/dlls/mscms/tests/Makefile.in +++ b/dlls/mscms/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mscms.dll IMPORTS = advapi32 diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index be4eaa66c00..e0bfbd70e10 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -161,29 +161,25 @@ static void test_GetColorDirectoryA(void) /* Parameter checks */ ret = pGetColorDirectoryA( NULL, NULL, NULL ); - ok( !ret, "GetColorDirectoryA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); size = 0; - ret = pGetColorDirectoryA( NULL, NULL, &size ); - ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); size = 0; - ret = pGetColorDirectoryA( NULL, buffer, &size ); - ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); size = 1; - ret = pGetColorDirectoryA( NULL, buffer, &size ); - ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ size = sizeof(buffer); - ret = pGetColorDirectoryA( NULL, buffer, &size ); - ok( ret && size > 0, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); + ok( ret && size > 0, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); } static void test_GetColorDirectoryW(void) @@ -195,33 +191,27 @@ static void test_GetColorDirectoryW(void) /* Parameter checks */ /* This one crashes win2k - ret = pGetColorDirectoryW( NULL, NULL, NULL ); - ok( !ret, "GetColorDirectoryW() succeeded (%d)\n", GetLastError() ); - + ok( !ret, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); */ size = 0; - ret = pGetColorDirectoryW( NULL, NULL, &size ); - ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); size = 0; - ret = pGetColorDirectoryW( NULL, buffer, &size ); - ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); size = 1; - ret = pGetColorDirectoryW( NULL, buffer, &size ); - ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ size = sizeof(buffer); - ret = pGetColorDirectoryW( NULL, buffer, &size ); - ok( ret && size > 0, "GetColorDirectoryW() failed (%d)\n", GetLastError() ); + ok( ret && size > 0, "GetColorDirectoryW() failed (%lu)\n", GetLastError() ); } static void test_GetColorProfileElement( char *standardprofile ) @@ -241,15 +231,15 @@ static void test_GetColorProfileElement( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ ret = pGetColorProfileElement( handle, tag, 0, NULL, NULL, &ref ); - ok( !ret, "GetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElement() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileElement( handle, tag, 0, &size, NULL, NULL ); - ok( !ret, "GetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElement() succeeded (%lu)\n", GetLastError() ); size = 0; ret = pGetColorProfileElement( handle, tag, 0, &size, NULL, &ref ); @@ -260,7 +250,7 @@ static void test_GetColorProfileElement( char *standardprofile ) size = sizeof(buffer); ret = pGetColorProfileElement( handle, tag, 0, &size, buffer, &ref ); - ok( ret, "GetColorProfileElement() failed %u\n", GetLastError() ); + ok( ret, "GetColorProfileElement() failed %lu\n", GetLastError() ); ok( size > 0, "wrong size\n" ); ok( !memcmp( buffer, expect, sizeof(expect)-1 ), "Unexpected tag data\n" ); @@ -283,27 +273,26 @@ static void test_GetColorProfileElementTag( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ ret = pGetColorProfileElementTag( NULL, index, &tag ); - ok( !ret, "GetColorProfileElementTag() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileElementTag( handle, 0, &tag ); - ok( !ret, "GetColorProfileElementTag() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileElementTag( handle, index, NULL ); - ok( !ret, "GetColorProfileElementTag() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileElementTag( handle, 18, NULL ); - ok( !ret, "GetColorProfileElementTag() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ while ((ret = pGetColorProfileElementTag( handle, index, &tag )) && tag != expect) index++; - ok( ret && tag == expect, "GetColorProfileElementTag() failed (%d)\n", - GetLastError() ); + ok( ret && tag == expect, "GetColorProfileElementTag() failed (%lu)\n", GetLastError() ); pCloseColorProfile( handle ); } @@ -325,40 +314,40 @@ static void test_GetColorProfileFromHandle( char *testprofile ) profile.cbDataSize = strlen(testprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ size = 0; ret = pGetColorProfileFromHandle( handle, NULL, &size ); - ok( !ret && size > 0, "GetColorProfileFromHandle() failed (%d)\n", GetLastError() ); + ok( !ret && size > 0, "GetColorProfileFromHandle() failed (%lu)\n", GetLastError() ); buffer = HeapAlloc( GetProcessHeap(), 0, size ); if (buffer) { ret = pGetColorProfileFromHandle( NULL, buffer, &size ); - ok( !ret, "GetColorProfileFromHandle() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileFromHandle() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileFromHandle( handle, buffer, NULL ); - ok( !ret, "GetColorProfileFromHandle() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileFromHandle() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ ret = pGetColorProfileFromHandle( handle, buffer, &size ); - ok( ret && size > 0, "GetColorProfileFromHandle() failed (%d)\n", GetLastError() ); + ok( ret && size > 0, "GetColorProfileFromHandle() failed (%lu)\n", GetLastError() ); header = (PROFILEHEADER *)buffer; - ok( header->phClass == 0x72746e6d, "wrong phClass %x\n", header->phClass ); - ok( header->phDataColorSpace == 0x20424752, "wrong phDataColorSpace %x\n", header->phDataColorSpace ); - ok( header->phConnectionSpace == 0x205a5958, "wrong phConnectionSpace %x\n", header->phConnectionSpace ); - ok( header->phSignature == 0x70736361, "wrong phSignature %x\n", header->phSignature ); - ok( header->phProfileFlags == 0x00000000, "wrong phProfileFlags %x\n", header->phProfileFlags ); - ok( header->phRenderingIntent == 0x00000000, "wrong phRenderingIntent %x\n", header->phRenderingIntent ); - ok( header->phIlluminant.ciexyzX == 0xd6f60000, "wrong phIlluminant.ciexyzX %x\n", header->phIlluminant.ciexyzX ); - ok( header->phIlluminant.ciexyzY == 0x00000100, "wrong phIlluminant.ciexyzY %x\n", header->phIlluminant.ciexyzY ); - ok( header->phIlluminant.ciexyzZ == 0x2dd30000, "wrong phIlluminant.ciexyzZ %x\n", header->phIlluminant.ciexyzZ ); + ok( header->phClass == 0x72746e6d, "wrong phClass %lx\n", header->phClass ); + ok( header->phDataColorSpace == 0x20424752, "wrong phDataColorSpace %lx\n", header->phDataColorSpace ); + ok( header->phConnectionSpace == 0x205a5958, "wrong phConnectionSpace %lx\n", header->phConnectionSpace ); + ok( header->phSignature == 0x70736361, "wrong phSignature %lx\n", header->phSignature ); + ok( header->phProfileFlags == 0x00000000, "wrong phProfileFlags %lx\n", header->phProfileFlags ); + ok( header->phRenderingIntent == 0x00000000, "wrong phRenderingIntent %lx\n", header->phRenderingIntent ); + ok( header->phIlluminant.ciexyzX == 0xd6f60000, "wrong phIlluminant.ciexyzX %lx\n", header->phIlluminant.ciexyzX ); + ok( header->phIlluminant.ciexyzY == 0x00000100, "wrong phIlluminant.ciexyzY %lx\n", header->phIlluminant.ciexyzY ); + ok( header->phIlluminant.ciexyzZ == 0x2dd30000, "wrong phIlluminant.ciexyzZ %lx\n", header->phIlluminant.ciexyzZ ); HeapFree( GetProcessHeap(), 0, buffer ); } @@ -381,36 +370,36 @@ static void test_GetColorProfileHeader( char *testprofile ) profile.cbDataSize = strlen(testprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ ret = pGetColorProfileHeader( NULL, NULL ); - ok( !ret, "GetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); ret = pGetColorProfileHeader( NULL, &header ); - ok( !ret, "GetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); if (0) /* Crashes on Vista */ { ret = pGetColorProfileHeader( handle, NULL ); - ok( !ret, "GetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "GetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); } /* Functional checks */ ret = pGetColorProfileHeader( handle, &header ); - ok( ret, "GetColorProfileHeader() failed (%d)\n", GetLastError() ); - - ok( header.phClass == 0x6d6e7472, "wrong phClass %x\n", header.phClass ); - ok( header.phDataColorSpace == 0x52474220, "wrong phDataColorSpace %x\n", header.phDataColorSpace ); - ok( header.phConnectionSpace == 0x58595a20, "wrong phConnectionSpace %x\n", header.phConnectionSpace ); - ok( header.phSignature == 0x61637370, "wrong phSignature %x\n", header.phSignature ); - ok( header.phProfileFlags == 0x00000000, "wrong phProfileFlags %x\n", header.phProfileFlags ); - ok( header.phRenderingIntent == 0x00000000, "wrong phRenderingIntent %x\n", header.phRenderingIntent ); - ok( header.phIlluminant.ciexyzX == 0x0000f6d6, "wrong phIlluminant.ciexyzX %x\n", header.phIlluminant.ciexyzX ); - ok( header.phIlluminant.ciexyzY == 0x00010000, "wrong phIlluminant.ciexyzY %x\n", header.phIlluminant.ciexyzY ); - ok( header.phIlluminant.ciexyzZ == 0x0000d32d, "wrong phIlluminant.ciexyzZ %x\n", header.phIlluminant.ciexyzZ ); + ok( ret, "GetColorProfileHeader() failed (%lu)\n", GetLastError() ); + + ok( header.phClass == 0x6d6e7472, "wrong phClass %#lx\n", header.phClass ); + ok( header.phDataColorSpace == 0x52474220, "wrong phDataColorSpace %#lx\n", header.phDataColorSpace ); + ok( header.phConnectionSpace == 0x58595a20, "wrong phConnectionSpace %#lx\n", header.phConnectionSpace ); + ok( header.phSignature == 0x61637370, "wrong phSignature %#lx\n", header.phSignature ); + ok( header.phProfileFlags == 0x00000000, "wrong phProfileFlags %#lx\n", header.phProfileFlags ); + ok( header.phRenderingIntent == 0x00000000, "wrong phRenderingIntent %#lx\n", header.phRenderingIntent ); + ok( header.phIlluminant.ciexyzX == 0x0000f6d6, "wrong phIlluminant.ciexyzX %#lx\n", header.phIlluminant.ciexyzX ); + ok( header.phIlluminant.ciexyzY == 0x00010000, "wrong phIlluminant.ciexyzY %#lx\n", header.phIlluminant.ciexyzY ); + ok( header.phIlluminant.ciexyzZ == 0x0000d32d, "wrong phIlluminant.ciexyzZ %#lx\n", header.phIlluminant.ciexyzZ ); pCloseColorProfile( handle ); } @@ -430,23 +419,21 @@ static void test_GetCountColorProfileElements( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ ret = pGetCountColorProfileElements( NULL, &count ); - ok( !ret, "GetCountColorProfileElements() succeeded (%d)\n", - GetLastError() ); + ok( !ret, "GetCountColorProfileElements() succeeded (%lu)\n", GetLastError() ); ret = pGetCountColorProfileElements( handle, NULL ); - ok( !ret, "GetCountColorProfileElements() succeeded (%d)\n", - GetLastError() ); + ok( !ret, "GetCountColorProfileElements() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ ret = pGetCountColorProfileElements( handle, &count ); ok( ret && count > 15 && count < 20, - "GetCountColorProfileElements() failed (%d) %u\n", GetLastError(), count ); + "GetCountColorProfileElements() failed (%lu) %lu\n", GetLastError(), count ); pCloseColorProfile( handle ); } @@ -466,28 +453,32 @@ static void test_GetStandardColorSpaceProfileA( char *standardprofile ) size = sizeof(newprofile); SetLastError(0xfaceabee); /* 1st param, */ ret = pGetStandardColorSpaceProfileA(machine, LCS_sRGB, newprofile, &size); - ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ ret = pGetStandardColorSpaceProfileA(NULL, (DWORD)-1, newprofile, &size); - ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, newprofile, NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 3rd param, */ ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, NULL, &size); - ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* dereferenced 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, newprofile, &size); ok( !ret && (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); /* Several invalid parameter checks: */ @@ -495,30 +486,32 @@ static void test_GetStandardColorSpaceProfileA( char *standardprofile ) SetLastError(0xfaceabee); /* 1st, maybe 2nd and then dereferenced 4th param, */ ret = pGetStandardColorSpaceProfileA(machine, 0, newprofile, &size); ok( !ret && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_NOT_SUPPORTED), - "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); SetLastError(0xfaceabee); /* maybe 2nd and then 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, 0, newprofile, NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* maybe 2nd, then 3rd and dereferenced 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, 0, NULL, &size); ok( !ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_FILE_NOT_FOUND), - "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* maybe 2nd param. */ ret = pGetStandardColorSpaceProfileA(NULL, 0, newprofile, &size); - if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", + ret, GetLastError() ); else ok( !lstrcmpiA( newprofile, "" ) && GetLastError() == 0xfaceabee, - "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); /* Functional checks */ size = sizeof(oldprofile); ret = pGetStandardColorSpaceProfileA( NULL, LCS_sRGB, oldprofile, &size ); - ok( ret, "GetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "GetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); SetLastError(0xdeadbeef); ret = pSetStandardColorSpaceProfileA( NULL, LCS_sRGB, standardprofile ); @@ -527,14 +520,14 @@ static void test_GetStandardColorSpaceProfileA( char *standardprofile ) skip("Not enough rights for SetStandardColorSpaceProfileA\n"); return; } - ok( ret, "SetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "SetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); size = sizeof(newprofile); ret = pGetStandardColorSpaceProfileA( NULL, LCS_sRGB, newprofile, &size ); - ok( ret, "GetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "GetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); ret = pSetStandardColorSpaceProfileA( NULL, LCS_sRGB, oldprofile ); - ok( ret, "SetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "SetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); } static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) @@ -552,19 +545,21 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) size = sizeof(newprofile); SetLastError(0xfaceabee); /* 1st param, */ ret = pGetStandardColorSpaceProfileW(machineW, LCS_sRGB, newprofile, &size); - ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ ret = pGetStandardColorSpaceProfileW(NULL, (DWORD)-1, newprofile, &size); - ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &size); ok( (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) || broken(ret), /* Win98 and WinME */ - "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 3rd param, */ @@ -572,12 +567,13 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) ok( !ret || broken(ret) /* win98 */, "GetStandardColorSpaceProfileW succeeded\n" ); ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER || broken(GetLastError() == 0xfaceabee) /* win98 */, - "GetStandardColorSpaceProfileW() returns GLE=%u\n", GetLastError() ); + "GetStandardColorSpaceProfileW() returns GLE=%lu\n", GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 4th param, */ ret = pGetStandardColorSpaceProfileW(NULL, LCS_sRGB, newprofile, NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* dereferenced 4th param. */ @@ -586,7 +582,7 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) ok( GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER || broken(GetLastError() == 0xfaceabee) /* win98 */, - "GetStandardColorSpaceProfileW() returns GLE=%u\n", GetLastError() ); + "GetStandardColorSpaceProfileW() returns GLE=%lu\n", GetLastError() ); /* Several invalid parameter checks: */ @@ -594,11 +590,12 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) SetLastError(0xfaceabee); /* 1st, maybe 2nd and then dereferenced 4th param, */ ret = pGetStandardColorSpaceProfileW(machineW, 0, newprofile, &size); ok( !ret && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_NOT_SUPPORTED), - "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", ret, GetLastError() ); SetLastError(0xfaceabee); /* maybe 2nd and then 4th param, */ ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* maybe 2nd, then 3rd and dereferenced 4th param, */ @@ -607,24 +604,25 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_FILE_NOT_FOUND || broken(GetLastError() == 0xfaceabee) /* win98 */, - "GetStandardColorSpaceProfileW() returns GLE=%u\n", GetLastError() ); + "GetStandardColorSpaceProfileW() returns GLE=%lu\n", GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* maybe 2nd param. */ ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &size); - if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", + ret, GetLastError() ); else { WideCharToMultiByte(CP_ACP, 0, newprofile, -1, newprofileA, sizeof(newprofileA), NULL, NULL); ok( !lstrcmpiA( newprofileA, "" ) && GetLastError() == 0xfaceabee, - "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", ret, GetLastError() ); } /* Functional checks */ size = sizeof(oldprofile); ret = pGetStandardColorSpaceProfileW( NULL, LCS_sRGB, oldprofile, &size ); - ok( ret, "GetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "GetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); SetLastError(0xdeadbeef); ret = pSetStandardColorSpaceProfileW( NULL, LCS_sRGB, standardprofileW ); @@ -633,14 +631,14 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) skip("Not enough rights for SetStandardColorSpaceProfileW\n"); return; } - ok( ret, "SetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "SetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); size = sizeof(newprofile); ret = pGetStandardColorSpaceProfileW( NULL, LCS_sRGB, newprofile, &size ); - ok( ret, "GetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "GetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); ret = pSetStandardColorSpaceProfileW( NULL, LCS_sRGB, oldprofile ); - ok( ret, "SetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "SetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); } static void test_EnumColorProfilesA( char *standardprofile ) @@ -663,7 +661,7 @@ static void test_EnumColorProfilesA( char *standardprofile ) SetLastError( 0xdeadbeef ); ret = pEnumColorProfilesA( NULL, &record, NULL, &total, &number ); ok( !ret, "EnumColorProfilesA succeeded\n" ); - if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError() ); + if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError() ); buffer = HeapAlloc( GetProcessHeap(), 0, total ); size = total; @@ -678,7 +676,7 @@ static void test_EnumColorProfilesA( char *standardprofile ) ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesA failed %u\n", GetLastError() ); + ok( ret, "EnumColorProfilesA failed %lu\n", GetLastError() ); size = 0; ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); @@ -689,7 +687,7 @@ static void test_EnumColorProfilesA( char *standardprofile ) size = total; ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesA failed %u\n", GetLastError() ); + ok( ret, "EnumColorProfilesA failed %lu\n", GetLastError() ); HeapFree( GetProcessHeap(), 0, buffer ); } @@ -714,7 +712,7 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) SetLastError( 0xdeadbeef ); ret = pEnumColorProfilesW( NULL, &record, NULL, &total, &number ); ok( !ret, "EnumColorProfilesW succeeded\n" ); - if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError() ); + if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError() ); buffer = HeapAlloc( GetProcessHeap(), 0, total * sizeof(WCHAR) ); size = total; @@ -729,7 +727,7 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesW failed %u\n", GetLastError() ); + ok( ret, "EnumColorProfilesW failed %lu\n", GetLastError() ); size = 0; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); @@ -740,7 +738,7 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) size = total; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesW failed %u\n", GetLastError() ); + ok( ret, "EnumColorProfilesW failed %lu\n", GetLastError() ); HeapFree( GetProcessHeap(), 0, buffer ); } @@ -752,18 +750,18 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile /* Parameter checks */ ret = pInstallColorProfileA( NULL, NULL ); - ok( !ret, "InstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileA() succeeded (%lu)\n", GetLastError() ); ret = pInstallColorProfileA( machine, NULL ); - ok( !ret, "InstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileA() succeeded (%lu)\n", GetLastError() ); ret = pInstallColorProfileA( NULL, machine ); - ok( !ret, "InstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileA() succeeded (%lu)\n", GetLastError() ); if (standardprofile) { ret = pInstallColorProfileA( NULL, standardprofile ); - ok( ret, "InstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); } /* Functional checks */ @@ -781,10 +779,10 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile skip("Not enough rights for InstallColorProfileA\n"); return; } - ok( ret, "InstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryA( NULL, dest, &size ); - ok( ret, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); MSCMS_basenameA( testprofile, base ); @@ -793,11 +791,11 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile /* Check if the profile is really there */ handle = CreateFileA( dest, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); - ok( handle != INVALID_HANDLE_VALUE, "Couldn't find the profile (%d)\n", GetLastError() ); + ok( handle != INVALID_HANDLE_VALUE, "Couldn't find the profile (%lu)\n", GetLastError() ); CloseHandle( handle ); ret = pUninstallColorProfileA( NULL, dest, TRUE ); - ok( ret, "UninstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileA() failed (%lu)\n", GetLastError() ); } } @@ -808,18 +806,18 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi /* Parameter checks */ ret = pInstallColorProfileW( NULL, NULL ); - ok( !ret, "InstallColorProfileW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileW() succeeded (%lu)\n", GetLastError() ); ret = pInstallColorProfileW( machineW, NULL ); - ok( !ret, "InstallColorProfileW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileW() succeeded (%lu)\n", GetLastError() ); ret = pInstallColorProfileW( NULL, machineW ); - ok( !ret, "InstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( !ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); if (standardprofileW) { ret = pInstallColorProfileW( NULL, standardprofileW ); - ok( ret, "InstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); } /* Functional checks */ @@ -837,10 +835,10 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi skip("Not enough rights for InstallColorProfileW\n"); return; } - ok( ret, "InstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryW( NULL, dest, &size ); - ok( ret, "GetColorDirectoryW() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryW() failed (%lu)\n", GetLastError() ); MSCMS_basenameW( testprofileW, base ); @@ -849,11 +847,11 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi /* Check if the profile is really there */ handle = CreateFileW( dest, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); - ok( handle != INVALID_HANDLE_VALUE, "Couldn't find the profile (%d)\n", GetLastError() ); + ok( handle != INVALID_HANDLE_VALUE, "Couldn't find the profile (%lu)\n", GetLastError() ); CloseHandle( handle ); ret = pUninstallColorProfileW( NULL, dest, TRUE ); - ok( ret, "UninstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileW() failed (%lu)\n", GetLastError() ); } } @@ -871,27 +869,27 @@ static void test_IsColorProfileTagPresent( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ tag = 0; ret = pIsColorProfileTagPresent( handle, tag, &present ); - ok( !(ret && present), "IsColorProfileTagPresent() succeeded (%d)\n", GetLastError() ); + ok( !(ret && present), "IsColorProfileTagPresent() succeeded (%lu)\n", GetLastError() ); tag = 0x63707274; /* 'cprt' */ ret = pIsColorProfileTagPresent( NULL, tag, &present ); - ok( !ret, "IsColorProfileTagPresent() succeeded (%d)\n", GetLastError() ); + ok( !ret, "IsColorProfileTagPresent() succeeded (%lu)\n", GetLastError() ); ret = pIsColorProfileTagPresent( handle, tag, NULL ); - ok( !ret, "IsColorProfileTagPresent() succeeded (%d)\n", GetLastError() ); + ok( !ret, "IsColorProfileTagPresent() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ ret = pIsColorProfileTagPresent( handle, tag, &present ); - ok( ret && present, "IsColorProfileTagPresent() failed (%d)\n", GetLastError() ); + ok( ret && present, "IsColorProfileTagPresent() failed (%lu)\n", GetLastError() ); pCloseColorProfile( handle ); } @@ -910,16 +908,16 @@ static void test_OpenColorProfileA( char *standardprofile ) /* Parameter checks */ handle = pOpenColorProfileA( NULL, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, PROFILE_READWRITE, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ok ( !pCloseColorProfile( NULL ), "CloseColorProfile() succeeded\n" ); @@ -929,31 +927,31 @@ static void test_OpenColorProfileA( char *standardprofile ) profile.cbDataSize = strlen(standardprofile); handle = pOpenColorProfileA( &profile, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileA( &profile, PROFILE_READ|PROFILE_READWRITE, 0, 0 ); - ok( handle == NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Functional checks */ handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pCloseColorProfile( handle ); - ok( ret, "CloseColorProfile() failed (%d)\n", GetLastError() ); + ok( ret, "CloseColorProfile() failed (%lu)\n", GetLastError() ); profile.dwType = PROFILE_FILENAME; profile.pProfileData = (void *)"sRGB Color Space Profile.icm"; profile.cbDataSize = sizeof("sRGB Color Space Profile.icm"); handle = pOpenColorProfileA( &profile, PROFILE_READ, FILE_SHARE_READ, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pCloseColorProfile( handle ); - ok( ret, "CloseColorProfile() failed (%d)\n", GetLastError() ); + ok( ret, "CloseColorProfile() failed (%lu)\n", GetLastError() ); } } @@ -970,16 +968,16 @@ static void test_OpenColorProfileW( WCHAR *standardprofileW ) /* Parameter checks */ handle = pOpenColorProfileW( NULL, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, PROFILE_READ, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, PROFILE_READWRITE, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); ok ( !pCloseColorProfile( NULL ), "CloseColorProfile() succeeded\n" ); @@ -989,21 +987,21 @@ static void test_OpenColorProfileW( WCHAR *standardprofileW ) profile.cbDataSize = lstrlenW(standardprofileW) * sizeof(WCHAR); handle = pOpenColorProfileW( &profile, 0, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, PROFILE_READ, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); handle = pOpenColorProfileW( &profile, PROFILE_READ|PROFILE_READWRITE, 0, 0 ); - ok( handle == NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); /* Functional checks */ handle = pOpenColorProfileW( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileW() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); ret = pCloseColorProfile( handle ); - ok( ret, "CloseColorProfile() failed (%d)\n", GetLastError() ); + ok( ret, "CloseColorProfile() failed (%lu)\n", GetLastError() ); } } @@ -1027,41 +1025,41 @@ static void test_SetColorProfileElement( char *testprofile ) /* Parameter checks */ handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( handle, tag, 0, &size, data ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); pCloseColorProfile( handle ); handle = pOpenColorProfileA( &profile, PROFILE_READWRITE, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( NULL, 0, 0, NULL, NULL ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( handle, 0, 0, NULL, NULL ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( handle, tag, 0, NULL, NULL ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileElement( handle, tag, 0, &size, NULL ); - ok( !ret, "SetColorProfileElement() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ size = sizeof(data); ret = pSetColorProfileElement( handle, tag, 0, &size, data ); - ok( ret, "SetColorProfileElement() failed %u\n", GetLastError() ); + ok( ret, "SetColorProfileElement() failed %lu\n", GetLastError() ); size = sizeof(buffer); ret = pGetColorProfileElement( handle, tag, 0, &size, buffer, &ref ); - ok( ret, "GetColorProfileElement() failed %u\n", GetLastError() ); + ok( ret, "GetColorProfileElement() failed %lu\n", GetLastError() ); ok( size > 0, "wrong size\n" ); ok( !memcmp( data, buffer, sizeof(data) ), - "Unexpected tag data, expected %s, got %s (%u)\n", data, buffer, GetLastError() ); + "Unexpected tag data, expected %s, got %s (%lu)\n", data, buffer, GetLastError() ); pCloseColorProfile( handle ); } @@ -1105,32 +1103,32 @@ static void test_SetColorProfileHeader( char *testprofile ) /* Parameter checks */ handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pSetColorProfileHeader( handle, &header ); - ok( !ret, "SetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); pCloseColorProfile( handle ); handle = pOpenColorProfileA( &profile, PROFILE_READWRITE, 0, OPEN_EXISTING ); - ok( handle != NULL, "OpenColorProfileA() failed (%d)\n", GetLastError() ); + ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); ret = pSetColorProfileHeader( NULL, NULL ); - ok( !ret, "SetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileHeader( handle, NULL ); - ok( !ret, "SetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); ret = pSetColorProfileHeader( NULL, &header ); - ok( !ret, "SetColorProfileHeader() succeeded (%d)\n", GetLastError() ); + ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ ret = pSetColorProfileHeader( handle, &header ); - ok( ret, "SetColorProfileHeader() failed (%d)\n", GetLastError() ); + ok( ret, "SetColorProfileHeader() failed (%lu)\n", GetLastError() ); ret = pGetColorProfileHeader( handle, &header ); - ok( ret, "GetColorProfileHeader() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorProfileHeader() failed (%lu)\n", GetLastError() ); ok( !memcmp( &header, rgbheader, sizeof(rgbheader) ), "Unexpected header data\n" ); @@ -1145,10 +1143,10 @@ static void test_UninstallColorProfileA( char *testprofile ) /* Parameter checks */ ret = pUninstallColorProfileA( NULL, NULL, FALSE ); - ok( !ret, "UninstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "UninstallColorProfileA() succeeded (%lu)\n", GetLastError() ); ret = pUninstallColorProfileA( machine, NULL, FALSE ); - ok( !ret, "UninstallColorProfileA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "UninstallColorProfileA() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ @@ -1165,10 +1163,10 @@ static void test_UninstallColorProfileA( char *testprofile ) skip("Not enough rights for InstallColorProfileA\n"); return; } - ok( ret, "InstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryA( NULL, dest, &size ); - ok( ret, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); MSCMS_basenameA( testprofile, base ); @@ -1176,11 +1174,11 @@ static void test_UninstallColorProfileA( char *testprofile ) lstrcatA( dest, base ); ret = pUninstallColorProfileA( NULL, dest, TRUE ); - ok( ret, "UninstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileA() failed (%lu)\n", GetLastError() ); /* Check if the profile is really gone */ handle = CreateFileA( dest, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); - ok( handle == INVALID_HANDLE_VALUE, "Found the profile (%d)\n", GetLastError() ); + ok( handle == INVALID_HANDLE_VALUE, "Found the profile (%lu)\n", GetLastError() ); CloseHandle( handle ); } } @@ -1192,10 +1190,10 @@ static void test_UninstallColorProfileW( WCHAR *testprofileW ) /* Parameter checks */ ret = pUninstallColorProfileW( NULL, NULL, FALSE ); - ok( !ret, "UninstallColorProfileW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "UninstallColorProfileW() succeeded (%lu)\n", GetLastError() ); ret = pUninstallColorProfileW( machineW, NULL, FALSE ); - ok( !ret, "UninstallColorProfileW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "UninstallColorProfileW() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ @@ -1214,10 +1212,10 @@ static void test_UninstallColorProfileW( WCHAR *testprofileW ) skip("Not enough rights for InstallColorProfileW\n"); return; } - ok( ret, "InstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryW( NULL, dest, &size ); - ok( ret, "GetColorDirectoryW() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryW() failed (%lu)\n", GetLastError() ); MSCMS_basenameW( testprofileW, base ); @@ -1225,13 +1223,13 @@ static void test_UninstallColorProfileW( WCHAR *testprofileW ) lstrcatW( dest, base ); ret = pUninstallColorProfileW( NULL, dest, TRUE ); - ok( ret, "UninstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileW() failed (%lu)\n", GetLastError() ); bytes_copied = WideCharToMultiByte(CP_ACP, 0, dest, -1, destA, MAX_PATH, NULL, NULL); ok( bytes_copied > 0 , "WideCharToMultiByte() returns %d\n", bytes_copied); /* Check if the profile is really gone */ handle = CreateFileA( destA, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); - ok( handle == INVALID_HANDLE_VALUE, "Found the profile (%d)\n", GetLastError() ); + ok( handle == INVALID_HANDLE_VALUE, "Found the profile (%lu)\n", GetLastError() ); CloseHandle( handle ); } } @@ -1258,56 +1256,56 @@ static void test_AssociateColorProfileWithDeviceA( char *testprofile ) ret = pAssociateColorProfileWithDeviceA( "machine", testprofile, NULL ); error = GetLastError(); ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); ret = pAssociateColorProfileWithDeviceA( "machine", NULL, monitor.DeviceID ); error = GetLastError(); ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); ret = pAssociateColorProfileWithDeviceA( "machine", testprofile, monitor.DeviceID ); error = GetLastError(); ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); - ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %u\n", error ); + ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %lu\n", error ); ret = pInstallColorProfileA( NULL, testprofile ); - ok( ret, "InstallColorProfileA() failed (%u)\n", GetLastError() ); + ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); ret = pGetColorDirectoryA( NULL, profile, &size ); - ok( ret, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); + ok( ret, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); MSCMS_basenameA( testprofile, basename ); lstrcatA( profile, "\\" ); lstrcatA( profile, basename ); ret = pAssociateColorProfileWithDeviceA( NULL, profile, monitor.DeviceID ); - ok( ret, "AssociateColorProfileWithDevice() failed (%u)\n", GetLastError() ); + ok( ret, "AssociateColorProfileWithDevice() failed (%lu)\n", GetLastError() ); SetLastError(0xdeadbeef); ret = pDisassociateColorProfileFromDeviceA( "machine", profile, NULL ); error = GetLastError(); ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); ret = pDisassociateColorProfileFromDeviceA( "machine", NULL, monitor.DeviceID ); error = GetLastError(); ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); ret = pDisassociateColorProfileFromDeviceA( "machine", profile, monitor.DeviceID ); error = GetLastError(); ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); - ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %u\n", error ); + ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %lu\n", error ); ret = pDisassociateColorProfileFromDeviceA( NULL, profile, monitor.DeviceID ); - ok( ret, "DisassociateColorProfileFromDeviceA() failed (%u)\n", GetLastError() ); + ok( ret, "DisassociateColorProfileFromDeviceA() failed (%lu)\n", GetLastError() ); ret = pUninstallColorProfileA( NULL, profile, TRUE ); - ok( ret, "UninstallColorProfileA() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileA() failed (%lu)\n", GetLastError() ); } else skip("Unable to obtain monitor name\n"); @@ -1343,17 +1341,17 @@ static void test_CreateMultiProfileTransform( char *standardprofile, char *testp profile.cbDataSize = strlen(standardprofile); handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle[0] != NULL, "got %u\n", GetLastError() ); + ok( handle[0] != NULL, "got %lu\n", GetLastError() ); profile.dwType = PROFILE_FILENAME; profile.pProfileData = testprofile; profile.cbDataSize = strlen(testprofile); handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); - ok( handle[1] != NULL, "got %u\n", GetLastError() ); + ok( handle[1] != NULL, "got %lu\n", GetLastError() ); transform = pCreateMultiProfileTransform( handle, 2, intents, 2, 0, 0 ); - ok( transform != NULL, "got %u\n", GetLastError() ); + ok( transform != NULL, "got %lu\n", GetLastError() ); pDeleteColorTransform( transform ); pCloseColorProfile( handle[0] ); @@ -1390,7 +1388,7 @@ START_TEST(profile) /* See if we can find the standard color profile */ ret = GetSystemDirectoryA( profilefile1, sizeof(profilefile1) ); - ok( ret > 0, "GetSystemDirectoryA() returns %d, LastError = %d\n", ret, GetLastError()); + ok( ret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", ret, GetLastError()); ok(profilefile1[0] && lstrlenA(profilefile1) < MAX_PATH, "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(profilefile1)); MultiByteToWideChar(CP_ACP, 0, profilefile1, -1, profilefile1W, MAX_PATH); diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 8296341f7b7..0d48e217d66 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -48,13 +48,13 @@ static DWORD from_bmformat( BMFORMAT format ) default: if (!quietfixme) { - FIXME( "unhandled bitmap format %08x\n", format ); + FIXME( "unhandled bitmap format %#x\n", format ); quietfixme = TRUE; } ret = TYPE_RGB_8; break; } - TRACE( "color space: %08x -> %08x\n", format, ret ); + TRACE( "color space: %#x -> %#lx\n", format, ret ); return ret; } @@ -76,7 +76,7 @@ static DWORD from_type( COLORTYPE type ) break; } - TRACE( "color type: %08x -> %08x\n", type, ret ); + TRACE( "color type: %#x -> %#lx\n", type, ret ); return ret; } @@ -85,13 +85,12 @@ static DWORD from_type( COLORTYPE type ) * * See CreateColorTransformW. */ -HTRANSFORM WINAPI CreateColorTransformA( LPLOGCOLORSPACEA space, HPROFILE dest, - HPROFILE target, DWORD flags ) +HTRANSFORM WINAPI CreateColorTransformA( LPLOGCOLORSPACEA space, HPROFILE dest, HPROFILE target, DWORD flags ) { LOGCOLORSPACEW spaceW; DWORD len; - TRACE( "( %p, %p, %p, 0x%08x )\n", space, dest, target, flags ); + TRACE( "( %p, %p, %p, %#lx )\n", space, dest, target, flags ); if (!space || !dest) return FALSE; @@ -119,8 +118,7 @@ HTRANSFORM WINAPI CreateColorTransformA( LPLOGCOLORSPACEA space, HPROFILE dest, * Success: Handle to a transform. * Failure: NULL */ -HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest, - HPROFILE target, DWORD flags ) +HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest, HPROFILE target, DWORD flags ) { HTRANSFORM ret = NULL; cmsHTRANSFORM transform; @@ -129,7 +127,7 @@ HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest, cmsHPROFILE input; int intent; - TRACE( "( %p, %p, %p, 0x%08x )\n", space, dest, target, flags ); + TRACE( "( %p, %p, %p, %#lx )\n", space, dest, target, flags ); if (!space || !(dst = grab_profile( dest ))) return FALSE; @@ -140,7 +138,7 @@ HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest, } intent = space->lcsIntent > 3 ? INTENT_PERCEPTUAL : space->lcsIntent; - TRACE( "lcsIntent: %x\n", space->lcsIntent ); + TRACE( "lcsIntent: %#lx\n", space->lcsIntent ); TRACE( "lcsCSType: %s\n", dbgstr_tag( space->lcsCSType ) ); TRACE( "lcsFilename: %s\n", debugstr_w( space->lcsFilename ) ); @@ -186,8 +184,7 @@ HTRANSFORM WINAPI CreateMultiProfileTransform( PHPROFILE profiles, DWORD nprofil cmsHTRANSFORM transform; struct profile *profile0, *profile1; - TRACE( "( %p, 0x%08x, %p, 0x%08x, 0x%08x, 0x%08x )\n", - profiles, nprofiles, intents, nintents, flags, cmm ); + TRACE( "( %p, %#lx, %p, %lu, %#lx, %#lx )\n", profiles, nprofiles, intents, nintents, flags, cmm ); if (!profiles || !nprofiles || !intents) return NULL; @@ -265,7 +262,7 @@ BOOL WINAPI TranslateBitmapBits( HTRANSFORM handle, PVOID srcbits, BMFORMAT inpu BOOL ret; cmsHTRANSFORM transform = grab_transform( handle ); - TRACE( "( %p, %p, 0x%08x, 0x%08x, 0x%08x, 0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08x )\n", + TRACE( "( %p, %p, %#x, %lu, %lu, %lu, %p, %#x, %lu, %p, %#lx )\n", handle, srcbits, input, width, height, inputstride, destbits, output, outputstride, callback, data ); @@ -300,7 +297,7 @@ BOOL WINAPI TranslateColors( HTRANSFORM handle, PCOLOR in, DWORD count, unsigned int i; cmsHTRANSFORM transform = grab_transform( handle ); - TRACE( "( %p, %p, %d, %d, %p, %d )\n", handle, in, count, input_type, out, output_type ); + TRACE( "( %p, %p, %lu, %d, %p, %d )\n", handle, in, count, input_type, out, output_type ); if (!transform) return FALSE; -- 2.30.2

1 0