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

[PATCH] ucrtbase: Add support for r-value demangling in unDName.
by Piotr Caban Feb. 7, 2022

Feb. 7, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44202 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/undname.c | 6 ++++++ dlls/ucrtbase/tests/cpp.c | 21 ++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-)

1 0

[PATCH 1/4] dlls/msvcrt, msvcp90, concrt140: use correct integral type for interlock
by Eric Pouech Feb. 7, 2022

Feb. 7, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/concrt140/details.c | 2 +- dlls/msvcp90/details.c | 2 +- dlls/msvcrt/concurrency.c | 4 ++-- dlls/msvcrt/file.c | 8 ++++---- dlls/msvcrt/heap.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/concrt140/details.c b/dlls/concrt140/details.c index 59345c52871..72bb744744c 100644 --- a/dlls/concrt140/details.c +++ b/dlls/concrt140/details.c @@ -371,7 +371,7 @@ void __thiscall _Concurrent_queue_base_v4_dummy(_Concurrent_queue_base_v4 *this) DEFINE_RTTI_DATA0(_Concurrent_queue_base_v4, 0, ".?AV_Concurrent_queue_base_v4(a)details@Concurrency@@") -static int _Runtime_object_id; +static LONG _Runtime_object_id; typedef struct { diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index 6b54ea9597f..d63a47667f9 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -385,7 +385,7 @@ void __thiscall _Concurrent_queue_base_v4_dummy(_Concurrent_queue_base_v4 *this) DEFINE_RTTI_DATA0(_Concurrent_queue_base_v4, 0, ".?AV_Concurrent_queue_base_v4(a)details@Concurrency@@") -static int _Runtime_object_id; +static LONG _Runtime_object_id; typedef struct { diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 0a393cd0004..6afe6e81489 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -34,8 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); typedef exception cexception; CREATE_EXCEPTION_OBJECT(cexception) -static int context_id = -1; -static int scheduler_id = -1; +static LONG context_id = -1; +static LONG scheduler_id = -1; typedef enum { SchedulerKind, diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2b0395d7535..2666492956c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -144,8 +144,8 @@ static int MSVCRT_max_streams = 512, MSVCRT_stream_idx; static int MSVCRT_umask = 0; /* INTERNAL: static data for tmpnam and _wtmpname functions */ -static int tmpnam_unique; -static int tmpnam_s_unique; +static LONG tmpnam_unique; +static LONG tmpnam_s_unique; static const unsigned int EXE = 'e' << 16 | 'x' << 8 | 'e'; static const unsigned int BAT = 'b' << 16 | 'a' << 8 | 't'; @@ -4935,7 +4935,7 @@ void CDECL setbuf(FILE* file, char *buf) setvbuf(file, buf, buf ? _IOFBF : _IONBF, BUFSIZ); } -static int tmpnam_helper(char *s, size_t size, int *tmpnam_unique, int tmp_max) +static int tmpnam_helper(char *s, size_t size, LONG *tmpnam_unique, int tmp_max) { char tmpstr[8]; char *p = s; @@ -5006,7 +5006,7 @@ char * CDECL tmpnam(char *s) return tmpnam_helper(s, -1, &tmpnam_unique, TMP_MAX) ? NULL : s; } -static int wtmpnam_helper(wchar_t *s, size_t size, int *tmpnam_unique, int tmp_max) +static int wtmpnam_helper(wchar_t *s, size_t size, LONG *tmpnam_unique, int tmp_max) { wchar_t tmpstr[8]; wchar_t *p = s; diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 429a9e2ecda..049c4e0cd93 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -46,7 +46,7 @@ static HANDLE heap, sb_heap; typedef int (CDECL *MSVCRT_new_handler_func)(size_t size); static MSVCRT_new_handler_func MSVCRT_new_handler; -static int MSVCRT_new_mode; +static LONG MSVCRT_new_mode; /* FIXME - According to documentation it should be 8*1024, at runtime it returns 16 */ static unsigned int MSVCRT_amblksiz = 16;

3 6

[PATCH] server: Always update cached socket name after connect.
by Paul Gofman Feb. 7, 2022

Feb. 7, 2022

Fixes a regression introduced by 5c009c17b3a212c3f5b0034c465077c0c593daae. For IPV6 socket already bound with bind() with IPV6_V6ONLY set to 0 the address returned by getsockname() may change after it is connected to a IPV4 peer (e. g., from :: to ::ffff:192.0.2.128). The effect of blamed commit is that before that Unix getsockname() was called for each ws2_32 getsockname() and after the commit the socket name is cached at bind and connect. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Fixes Street Fighter V connection to server. The game first sets IPV6_V6ONLY to 0, then binds the IPV6 socket to "::", then calls for WSAConnectEx and keeps querying the address, which in the correct case should become e. g. ::ffff:192.0.2.128 after connection but stays at the initial state after the blamed commit. server/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 40fb0cac535..512b7c0f78e 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2340,7 +2340,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) allow_fd_caching( sock->fd ); unix_len = sizeof(unix_addr); - if (!sock->bound && !getsockname( unix_fd, &unix_addr.addr, &unix_len )) + if (!getsockname( unix_fd, &unix_addr.addr, &unix_len )) sock->addr_len = sockaddr_from_unix( &unix_addr, &sock->addr.addr, sizeof(sock->addr) ); sock->bound = 1; -- 2.34.1

1 0

[PATCH v2] d3dx9: Implement D3DXSHProjectCubeMap().
by Zebediah Figura Feb. 7, 2022

Feb. 7, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46284 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/d3dx9_private.h | 2 + dlls/d3dx9_36/math.c | 147 ++++++++++++++++++++++++ dlls/d3dx9_36/surface.c | 2 +- dlls/d3dx9_36/tests/math.c | 208 ++++++++++++++++++++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- include/d3dx9math.h | 1 + 25 files changed, 379 insertions(+), 21 deletions(-) diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec index d617d766f85..8791e4ec044 100644 --- a/dlls/d3dx9_24/d3dx9_24.spec +++ b/dlls/d3dx9_24/d3dx9_24.spec @@ -256,7 +256,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec index f13923dcb3a..0431a9f7f75 100644 --- a/dlls/d3dx9_25/d3dx9_25.spec +++ b/dlls/d3dx9_25/d3dx9_25.spec @@ -256,7 +256,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec index 286a9a094a0..5ab0a1d9fea 100644 --- a/dlls/d3dx9_26/d3dx9_26.spec +++ b/dlls/d3dx9_26/d3dx9_26.spec @@ -260,7 +260,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec index 286a9a094a0..5ab0a1d9fea 100644 --- a/dlls/d3dx9_27/d3dx9_27.spec +++ b/dlls/d3dx9_27/d3dx9_27.spec @@ -260,7 +260,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec index 06ced20df61..af5b6077202 100644 --- a/dlls/d3dx9_28/d3dx9_28.spec +++ b/dlls/d3dx9_28/d3dx9_28.spec @@ -265,7 +265,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec index 06ced20df61..af5b6077202 100644 --- a/dlls/d3dx9_29/d3dx9_29.spec +++ b/dlls/d3dx9_29/d3dx9_29.spec @@ -265,7 +265,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec index 06ced20df61..af5b6077202 100644 --- a/dlls/d3dx9_30/d3dx9_30.spec +++ b/dlls/d3dx9_30/d3dx9_30.spec @@ -265,7 +265,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec index c9aca309a35..8f77dc666a2 100644 --- a/dlls/d3dx9_31/d3dx9_31.spec +++ b/dlls/d3dx9_31/d3dx9_31.spec @@ -262,7 +262,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec index f541f6f2ef1..2fdd2a00615 100644 --- a/dlls/d3dx9_32/d3dx9_32.spec +++ b/dlls/d3dx9_32/d3dx9_32.spec @@ -267,7 +267,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec index f541f6f2ef1..2fdd2a00615 100644 --- a/dlls/d3dx9_33/d3dx9_33.spec +++ b/dlls/d3dx9_33/d3dx9_33.spec @@ -267,7 +267,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec index f541f6f2ef1..2fdd2a00615 100644 --- a/dlls/d3dx9_34/d3dx9_34.spec +++ b/dlls/d3dx9_34/d3dx9_34.spec @@ -267,7 +267,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec index f541f6f2ef1..2fdd2a00615 100644 --- a/dlls/d3dx9_35/d3dx9_35.spec +++ b/dlls/d3dx9_35/d3dx9_35.spec @@ -267,7 +267,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index e1f44261610..5b7070145de 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -269,7 +269,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index c3308b04d44..2d286b04694 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -100,6 +100,8 @@ HRESULT write_buffer_to_file(const WCHAR *filename, ID3DXBuffer *buffer) DECLSPE const struct pixel_format_desc *get_format_info(D3DFORMAT format) DECLSPEC_HIDDEN; const struct pixel_format_desc *get_format_info_idx(int idx) DECLSPEC_HIDDEN; +void format_to_vec4(const struct pixel_format_desc *format, const BYTE *src, struct vec4 *dst); + void copy_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, const struct volume *size, const struct pixel_format_desc *format) DECLSPEC_HIDDEN; diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index a7b0a018680..80f357e00e9 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -2969,6 +2969,153 @@ static void rotate_X(FLOAT *out, UINT order, FLOAT a, FLOAT *in) out[35] = 0.9057110548f * in[31] - 0.4192627370f * in[33] + 0.0624999329f * in[35]; } +static void set_vec3(D3DXVECTOR3 *v, float x, float y, float z) +{ + v->x = x; + v->y = y; + v->z = z; +} + +/* + * The following implementation of D3DXSHProjectCubeMap is based on the + * SHProjectCubeMap() implementation from Microsoft's DirectXMath library, + * covered under the following copyright: + * + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. + */ +HRESULT WINAPI D3DXSHProjectCubeMap(unsigned int order, IDirect3DCubeTexture9 *texture, float *red, float *green, float *blue) +{ + const unsigned int order_square = order * order; + const struct pixel_format_desc *format; + unsigned int x, y, i, face; + float B, S, proj_normal; + D3DSURFACE_DESC desc; + float Wt = 0.0f; + float *temp; + HRESULT hr; + + TRACE("order %u, texture %p, red %p, green %p, blue %p.\n", order, texture, red, green, blue); + + if (!texture || !red || order < D3DXSH_MINORDER || order > D3DXSH_MAXORDER) + return D3DERR_INVALIDCALL; + + memset(red, 0, order_square * sizeof(float)); + if (green) + memset(green, 0, order_square * sizeof(float)); + if (blue) + memset(blue, 0, order_square * sizeof(float)); + + if (FAILED(hr = IDirect3DCubeTexture9_GetLevelDesc(texture, 0, &desc))) + { + ERR("Failed to get level desc, hr %#x.\n", hr); + return hr; + } + + format = get_format_info(desc.Format); + if (format->type != FORMAT_ARGB && format->type != FORMAT_ARGBF16 && format->type != FORMAT_ARGBF) + { + FIXME("Unsupported texture format %#x.\n", desc.Format); + return D3DERR_INVALIDCALL; + } + + if (!(temp = malloc(order_square * sizeof(*temp)))) + return E_OUTOFMEMORY; + + B = -1.0f + 1.0f / desc.Width; + if (desc.Width > 1) + S = 2.0f * (1.0f - 1.0f / desc.Width) / (desc.Width - 1.0f); + else + S = 0.0f; + + for (face = 0; face < 6; ++face) + { + D3DLOCKED_RECT map_desc; + + if (FAILED(hr = IDirect3DCubeTexture9_LockRect(texture, face, 0, &map_desc, NULL, D3DLOCK_READONLY))) + { + ERR("Failed to map texture, hr %#x.\n", hr); + free(temp); + return hr; + } + + for (y = 0; y < desc.Height; ++y) + { + const BYTE *row = (const BYTE *)map_desc.pBits + y * map_desc.Pitch; + + for (x = 0; x < desc.Width; ++x) + { + float diff_solid, x_3d, y_3d; + const float u = x * S + B; + const float v = y * S + B; + struct vec4 colour; + D3DXVECTOR3 dir; + + x_3d = (x * 2.0f + 1.0f) / desc.Width - 1.0f; + y_3d = (y * 2.0f + 1.0f) / desc.Width - 1.0f; + + switch (face) + { + case D3DCUBEMAP_FACE_POSITIVE_X: + set_vec3(&dir, 1.0f, -y_3d, -x_3d); + break; + + case D3DCUBEMAP_FACE_NEGATIVE_X: + set_vec3(&dir, -1.0f, -y_3d, x_3d); + break; + + case D3DCUBEMAP_FACE_POSITIVE_Y: + set_vec3(&dir, x_3d, 1.0f, y_3d); + break; + + case D3DCUBEMAP_FACE_NEGATIVE_Y: + set_vec3(&dir, x_3d, -1.0f, -y_3d); + break; + + case D3DCUBEMAP_FACE_POSITIVE_Z: + set_vec3(&dir, x_3d, -y_3d, 1.0f); + break; + + case D3DCUBEMAP_FACE_NEGATIVE_Z: + set_vec3(&dir, -x_3d, -y_3d, -1.0f); + break; + } + + /* This is more complex than powf(..., 1.5f), but also happens + * to be slightly more accurate, and slightly faster as well. */ + diff_solid = 4.0f / ((1.0f + u * u + v * v) * sqrtf(1.0f + u * u + v * v)); + Wt += diff_solid; + + D3DXVec3Normalize(&dir, &dir); + D3DXSHEvalDirection(temp, order, &dir); + + format_to_vec4(format, &row[x * format->block_byte_count], &colour); + + for (i = 0; i < order_square; ++i) + { + red[i] += temp[i] * colour.x * diff_solid; + if (green) + green[i] += temp[i] * colour.y * diff_solid; + if (blue) + blue[i] += temp[i] * colour.z * diff_solid; + } + } + } + + IDirect3DCubeTexture9_UnlockRect(texture, face, 0); + } + + proj_normal = (4.0f * M_PI) / Wt; + D3DXSHScale(red, order, red, proj_normal); + if (green) + D3DXSHScale(green, order, green, proj_normal); + if (blue) + D3DXSHScale(blue, order, blue, proj_normal); + + free(temp); + return D3D_OK; +} + FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in) { FLOAT alpha, beta, gamma, sinb, temp[36], temp1[36]; diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index c3f9f84a789..2ca6f093b55 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1564,7 +1564,7 @@ static DWORD make_argb_color(const struct argb_conversion_info *info, const DWOR } /* It doesn't work for components bigger than 32 bits (or somewhat smaller but unaligned). */ -static void format_to_vec4(const struct pixel_format_desc *format, const BYTE *src, struct vec4 *dst) +void format_to_vec4(const struct pixel_format_desc *format, const BYTE *src, struct vec4 *dst) { DWORD mask, tmp; unsigned int c; diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 6f64e25d200..62f4eaec124 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -22,6 +22,7 @@ #include "wine/test.h" #include "d3dx9.h" #include <math.h> +#include <stdint.h> static BOOL compare_float(float f, float g, unsigned int ulps) { @@ -205,6 +206,53 @@ static void set_matrix(D3DXMATRIX* mat, U(mat)->m[3][0] = m30; U(mat)->m[3][1] = m31; U(mat)->m[3][2] = m32; U(mat)->m[3][3] = m33; } +static HWND create_window(void) +{ + RECT r = {0, 0, 640, 480}; + + AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); + + return CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); +} + +static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + unsigned int adapter_ordinal; + IDirect3DDevice9 *device; + DWORD behavior_flags = D3DCREATE_HARDWARE_VERTEXPROCESSING; + + adapter_ordinal = D3DADAPTER_DEFAULT; + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = focus_window; + present_parameters.Windowed = TRUE; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + + if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, adapter_ordinal, D3DDEVTYPE_HAL, focus_window, + behavior_flags, &present_parameters, &device))) + return device; + + present_parameters.AutoDepthStencilFormat = D3DFMT_D16; + if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, adapter_ordinal, D3DDEVTYPE_HAL, focus_window, + behavior_flags, &present_parameters, &device))) + return device; + + behavior_flags = (behavior_flags + & ~(D3DCREATE_MIXED_VERTEXPROCESSING | D3DCREATE_SOFTWARE_VERTEXPROCESSING)) + | D3DCREATE_HARDWARE_VERTEXPROCESSING; + + if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, adapter_ordinal, D3DDEVTYPE_HAL, focus_window, + behavior_flags, &present_parameters, &device))) + return device; + + return NULL; +} + static void D3DXColorTest(void) { D3DXCOLOR color, color1, color2, expected, got; @@ -4364,6 +4412,165 @@ static void test_D3DXSHScale(void) } } +static void test_D3DXSHProjectCubeMap(void) +{ + unsigned int i, j, level, face, x, y; + float red[4], green[4], blue[4]; + IDirect3DCubeTexture9 *texture; + IDirect3DDevice9 *device; + D3DLOCKED_RECT map_desc; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + static const struct + { + D3DFORMAT format; + float red[4]; + float green[4]; + float blue[4]; + } + tests[] = + { + {D3DFMT_A8R8G8B8, + {1.77656245f, -1.11197047e-2f, 2.08763797e-2f, -2.10229922e-2f}, + {1.75811982f, -4.82511893e-2f, 1.67397819e-2f, -1.71497762e-2f}, + {1.75515056f, -4.07523997e-2f, 1.05397226e-2f, -2.46812664e-2f}}, + {D3DFMT_X8R8G8B8, + {1.77656245f, -1.11197047e-2f, 2.08763797e-2f, -2.10229922e-2f}, + {1.75811982f, -4.82511893e-2f, 1.67397819e-2f, -1.71497762e-2f}, + {1.75515056f, -4.07523997e-2f, 1.05397226e-2f, -2.46812664e-2f}}, + {D3DFMT_A8B8G8R8, + {1.75515056f, -4.07523997e-2f, 1.05397226e-2f, -2.46812664e-2f}, + {1.75811982f, -4.82511893e-2f, 1.67397819e-2f, -1.71497762e-2f}, + {1.77656245f, -1.11197047e-2f, 2.08763797e-2f, -2.10229922e-2f}}, + {D3DFMT_R5G6B5, + {1.77099848f, -3.88867334e-2f, 6.73775524e-2f, -1.26888147e-2f}, + {1.77244151f, -5.64723741e-4f, -2.77878426e-4f, -9.10691451e-3f}, + {1.78902030f, 2.79005636e-2f, 1.62461456e-2f, 2.21668324e-3f}}, + {D3DFMT_A1R5G5B5, + {1.78022826f, 1.46923587e-2f, 3.58058624e-2f, 2.51076911e-2f}, + {1.77233493f, -7.58088892e-4f, -2.03727093e-3f, -1.34809706e-2f}, + {1.78902030f, 2.79005636e-2f, 1.62461456e-2f, 2.21668324e-3f}}, + {D3DFMT_X1R5G5B5, + {1.78022826f, 1.46923587e-2f, 3.58058624e-2f, 2.51076911e-2f}, + {1.77233493f, -7.58088892e-4f, -2.03727093e-3f, -1.34809706e-2f}, + {1.78902030f, 2.79005636e-2f, 1.62461456e-2f, 2.21668324e-3f}}, + {D3DFMT_A2R10G10B10, + {1.79359019f, -7.74506712e-4f, 8.65613017e-3f, 5.75336441e-3f}, + {1.77067971f, 6.42523961e-3f, 1.35379164e-2f, 2.24088971e-3f}, + {1.76601243f, -4.94002625e-2f, 1.28124524e-2f, -7.69229094e-3f}}, + {D3DFMT_A2B10G10R10, + {1.76601243f, -4.94002625e-2f, 1.28124524e-2f, -7.69229094e-3f}, + {1.77067971f, 6.42523961e-3f, 1.35379164e-2f, 2.24088971e-3f}, + {1.79359019f, -7.74506712e-4f, 8.65613017e-3f, 5.75336441e-3f}}, + {D3DFMT_A16B16G16R16, + {1.75979614f, 1.44450525e-2f, -3.25212209e-3f, 2.98178056e-3f}, + {1.78080165f, -2.63770130e-2f, 6.31967233e-3f, 3.66022950e-3f}, + {1.77588308f, -1.93727610e-3f, -3.22831096e-3f, -6.18841546e-3f}}, + {D3DFMT_A16B16G16R16F, + { 5.17193642e+1f, -3.41681671e+2f, -8.82221741e+2f, 7.77049316e+2f}, + {-2.08198950e+3f, 5.24323584e+3f, -3.42663379e+3f, 3.80999243e+3f}, + {-1.10743945e+3f, -9.43649292e+2f, 5.48424316e+2f, 1.65352710e+3f}}, + }; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context("Format %#x", tests[i].format); + + hr = IDirect3DDevice9_CreateCubeTexture(device, 8, 4, D3DUSAGE_DYNAMIC, + tests[i].format, D3DPOOL_DEFAULT, &texture, NULL); + if (FAILED(hr)) + { + skip("Failed to create cube texture.\n"); + winetest_pop_context(); + continue; + } + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (face = 0; face < 6; ++face) + { + hr = IDirect3DCubeTexture9_LockRect(texture, face, 0, &map_desc, NULL, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (y = 0; y < 8; ++y) + { + uint8_t *row = (uint8_t *)map_desc.pBits + y * map_desc.Pitch; + + for (x = 0; x < map_desc.Pitch; ++x) + row[x] = face * 111 + y * 39 + x * 7; + } + + hr = IDirect3DCubeTexture9_UnlockRect(texture, face, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (level = 1; level < 4; ++level) + { + hr = IDirect3DCubeTexture9_LockRect(texture, face, level, &map_desc, NULL, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memset(map_desc.pBits, 0xcc, 4 * map_desc.Pitch); + hr = IDirect3DCubeTexture9_UnlockRect(texture, face, level); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + } + + hr = D3DXSHProjectCubeMap(1, texture, red, green, blue); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = D3DXSHProjectCubeMap(7, texture, red, green, blue); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = D3DXSHProjectCubeMap(2, NULL, red, green, blue); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + memset(red, 0, sizeof(red)); + memset(green, 0, sizeof(green)); + memset(blue, 0, sizeof(blue)); + hr = D3DXSHProjectCubeMap(2, texture, red, green, blue); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (j = 0; j < 4; ++j) + { + ok(compare_float(red[j], tests[i].red[j], 1024), + "Got unexpected value %.8e for red coefficient %u.\n", red[j], j); + ok(compare_float(green[j], tests[i].green[j], 1024), + "Got unexpected value %.8e for green coefficient %u.\n", green[j], j); + ok(compare_float(blue[j], tests[i].blue[j], 1024), + "Got unexpected value %.8e for blue coefficient %u.\n", blue[j], j); + } + + hr = D3DXSHProjectCubeMap(2, texture, red, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = D3DXSHProjectCubeMap(2, texture, NULL, green, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = D3DXSHProjectCubeMap(2, texture, NULL, NULL, blue); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + IDirect3DCubeTexture9_Release(texture); + + winetest_pop_context(); + } + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(math) { D3DXColorTest(); @@ -4393,4 +4600,5 @@ START_TEST(math) test_D3DXSHRotate(); test_D3DXSHRotateZ(); test_D3DXSHScale(); + test_D3DXSHProjectCubeMap(); } diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec index e1f44261610..5b7070145de 100644 --- a/dlls/d3dx9_37/d3dx9_37.spec +++ b/dlls/d3dx9_37/d3dx9_37.spec @@ -269,7 +269,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec index e1f44261610..5b7070145de 100644 --- a/dlls/d3dx9_38/d3dx9_38.spec +++ b/dlls/d3dx9_38/d3dx9_38.spec @@ -269,7 +269,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec index e1f44261610..5b7070145de 100644 --- a/dlls/d3dx9_39/d3dx9_39.spec +++ b/dlls/d3dx9_39/d3dx9_39.spec @@ -269,7 +269,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec index e1f44261610..5b7070145de 100644 --- a/dlls/d3dx9_40/d3dx9_40.spec +++ b/dlls/d3dx9_40/d3dx9_40.spec @@ -269,7 +269,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec index e1f44261610..5b7070145de 100644 --- a/dlls/d3dx9_41/d3dx9_41.spec +++ b/dlls/d3dx9_41/d3dx9_41.spec @@ -269,7 +269,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec index 0851945d36b..4a418d1508a 100644 --- a/dlls/d3dx9_42/d3dx9_42.spec +++ b/dlls/d3dx9_42/d3dx9_42.spec @@ -262,7 +262,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec index 0851945d36b..4a418d1508a 100644 --- a/dlls/d3dx9_43/d3dx9_43.spec +++ b/dlls/d3dx9_43/d3dx9_43.spec @@ -262,7 +262,7 @@ @ stub D3DXSHMultiply6(ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/include/d3dx9math.h b/include/d3dx9math.h index bf03ca3abaa..32d894f9fed 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -396,6 +396,7 @@ HRESULT WINAPI D3DXSHEvalSphericalLight(UINT order, const D3DXVECTOR3 *dir, FLOA FLOAT* WINAPI D3DXSHMultiply2(FLOAT *out, const FLOAT *a, const FLOAT *b); FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b); FLOAT* WINAPI D3DXSHMultiply4(FLOAT *out, const FLOAT *a, const FLOAT *b); +HRESULT WINAPI D3DXSHProjectCubeMap(UINT order, IDirect3DCubeTexture9 *texture, FLOAT *red, FLOAT *green, FLOAT *blue); FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in); FLOAT* WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, const FLOAT *in); FLOAT* WINAPI D3DXSHScale(FLOAT *out, UINT order, const FLOAT *a, const FLOAT scale); -- 2.34.1

2 1

[PATCH 1/2] include: Introduce wine_debugstr_reference_time to debug.h
by Andrew Eikum Feb. 7, 2022

Feb. 7, 2022

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/evr/evr_private.h | 21 --------------------- dlls/evr/presenter.c | 10 +++++----- dlls/evr/sample.c | 27 +++------------------------ dlls/mf/clock.c | 4 ++-- dlls/mf/copier.c | 2 +- dlls/mf/evr.c | 12 ++++++------ dlls/mf/mf_private.h | 21 --------------------- dlls/mf/samplegrabber.c | 10 +++++----- dlls/mf/sar.c | 12 ++++++------ dlls/mfplat/buffer.c | 2 +- dlls/mfplat/main.c | 10 +++++----- dlls/mfplat/mfplat_private.h | 21 --------------------- dlls/mfplat/sample.c | 4 ++-- dlls/quartz/acmwrapper.c | 6 +++--- dlls/quartz/avidec.c | 2 +- dlls/quartz/dsoundrender.c | 10 +++++----- dlls/quartz/filtergraph.c | 12 ++++++------ dlls/quartz/memallocator.c | 8 ++++---- dlls/quartz/quartz_private.h | 21 --------------------- dlls/quartz/systemclock.c | 6 +++--- dlls/winegstreamer/gst_private.h | 21 --------------------- dlls/winegstreamer/quartz_parser.c | 6 +++--- dlls/winegstreamer/wm_asyncreader.c | 8 ++++---- dlls/winegstreamer/wm_reader.c | 8 ++++---- include/wine/debug.h | 21 +++++++++++++++++++++ libs/strmbase/filter.c | 2 +- libs/strmbase/mediatype.c | 4 ++-- libs/strmbase/pin.c | 4 ++-- libs/strmbase/renderer.c | 8 ++++---- libs/strmbase/strmbase_private.h | 21 --------------------- 30 files changed, 99 insertions(+), 225 deletions(-) diff --git a/dlls/evr/evr_private.h b/dlls/evr/evr_private.h index ef38b0f70cf..dabaaf8ee1a 100644 --- a/dlls/evr/evr_private.h +++ b/dlls/evr/evr_private.h @@ -24,27 +24,6 @@ #include "wine/strmbase.h" #include "wine/debug.h" -static inline const char *debugstr_time(LONGLONG time) -{ - ULONGLONG abstime = time >= 0 ? time : -time; - unsigned int i = 0, j = 0; - char buffer[23], rev[23]; - - while (abstime || i <= 8) - { - buffer[i++] = '0' + (abstime % 10); - abstime /= 10; - if (i == 7) buffer[i++] = '.'; - } - if (time < 0) buffer[i++] = '-'; - - while (i--) rev[j++] = buffer[i]; - while (rev[j-1] == '0' && rev[j-2] != '.') --j; - rev[j] = 0; - - return wine_dbg_sprintf("%s", rev); -} - static inline const char *debugstr_normalized_rect(const MFVideoNormalizedRect *rect) { if (!rect) return "(null)"; diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 7e14cb2f720..864891eec6d 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -902,7 +902,7 @@ static HRESULT WINAPI video_presenter_OnClockStart(IMFVideoPresenter *iface, MFT { struct video_presenter *presenter = impl_from_IMFVideoPresenter(iface); - TRACE("%p, %s, %s.\n", iface, debugstr_time(systime), wine_dbgstr_longlong(offset)); + TRACE("%p, %s, %s.\n", iface, wine_dbgstr_reference_time(systime), wine_dbgstr_longlong(offset)); EnterCriticalSection(&presenter->cs); presenter->state = PRESENTER_STATE_STARTED; @@ -915,7 +915,7 @@ static HRESULT WINAPI video_presenter_OnClockStop(IMFVideoPresenter *iface, MFTI { struct video_presenter *presenter = impl_from_IMFVideoPresenter(iface); - TRACE("%p, %s.\n", iface, debugstr_time(systime)); + TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime)); EnterCriticalSection(&presenter->cs); presenter->state = PRESENTER_STATE_STOPPED; @@ -929,7 +929,7 @@ static HRESULT WINAPI video_presenter_OnClockPause(IMFVideoPresenter *iface, MFT { struct video_presenter *presenter = impl_from_IMFVideoPresenter(iface); - TRACE("%p, %s.\n", iface, debugstr_time(systime)); + TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime)); EnterCriticalSection(&presenter->cs); presenter->state = PRESENTER_STATE_PAUSED; @@ -942,7 +942,7 @@ static HRESULT WINAPI video_presenter_OnClockRestart(IMFVideoPresenter *iface, M { struct video_presenter *presenter = impl_from_IMFVideoPresenter(iface); - TRACE("%p, %s.\n", iface, debugstr_time(systime)); + TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime)); EnterCriticalSection(&presenter->cs); presenter->state = PRESENTER_STATE_STARTED; @@ -953,7 +953,7 @@ static HRESULT WINAPI video_presenter_OnClockRestart(IMFVideoPresenter *iface, M static HRESULT WINAPI video_presenter_OnClockSetRate(IMFVideoPresenter *iface, MFTIME systime, float rate) { - FIXME("%p, %s, %f.\n", iface, debugstr_time(systime), rate); + FIXME("%p, %s, %f.\n", iface, wine_dbgstr_reference_time(systime), rate); return E_NOTIMPL; } diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index 1d29b6cdc2c..b8ac408e4ff 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -29,27 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(evr); -static const char *debugstr_time(LONGLONG time) -{ - ULONGLONG abstime = time >= 0 ? time : -time; - unsigned int i = 0, j = 0; - char buffer[23], rev[23]; - - while (abstime || i <= 8) - { - buffer[i++] = '0' + (abstime % 10); - abstime /= 10; - if (i == 7) buffer[i++] = '.'; - } - if (time < 0) buffer[i++] = '-'; - - while (i--) rev[j++] = buffer[i]; - while (rev[j-1] == '0' && rev[j-2] != '.') --j; - rev[j] = 0; - - return wine_dbg_sprintf("%s", rev); -} - struct surface_buffer { IMFMediaBuffer IMFMediaBuffer_iface; @@ -1258,7 +1237,7 @@ static HRESULT WINAPI video_sample_SetSampleTime(IMFSample *iface, LONGLONG time { struct video_sample *sample = impl_from_IMFSample(iface); - TRACE("%p, %s.\n", iface, debugstr_time(timestamp)); + TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(timestamp)); EnterCriticalSection(&sample->cs); sample->timestamp = timestamp; @@ -1289,7 +1268,7 @@ static HRESULT WINAPI video_sample_SetSampleDuration(IMFSample *iface, LONGLONG { struct video_sample *sample = impl_from_IMFSample(iface); - TRACE("%p, %s.\n", iface, debugstr_time(duration)); + TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(duration)); EnterCriticalSection(&sample->cs); sample->duration = duration; @@ -1523,7 +1502,7 @@ static void WINAPI desired_video_sample_SetDesiredSampleTimeAndDuration(IMFDesir { struct video_sample *sample = impl_from_IMFDesiredSample(iface); - TRACE("%p, %s, %s.\n", iface, debugstr_time(sample_time), debugstr_time(sample_duration)); + TRACE("%p, %s, %s.\n", iface, wine_dbgstr_reference_time(sample_time), wine_dbgstr_reference_time(sample_duration)); EnterCriticalSection(&sample->cs); sample->flags |= SAMPLE_PROP_HAS_DESIRED_PROPS; diff --git a/dlls/mf/clock.c b/dlls/mf/clock.c index 4a3ad7ec7c1..a4212ee0402 100644 --- a/dlls/mf/clock.c +++ b/dlls/mf/clock.c @@ -660,7 +660,7 @@ static HRESULT WINAPI present_clock_Start(IMFPresentationClock *iface, LONGLONG struct clock_state_change_param param = {{0}}; HRESULT hr; - TRACE("%p, %s.\n", iface, debugstr_time(start_offset)); + TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(start_offset)); EnterCriticalSection(&clock->cs); clock->start_offset = param.u.offset = start_offset; @@ -885,7 +885,7 @@ static HRESULT WINAPI present_clock_timer_SetTimer(IMFTimer *iface, DWORD flags, struct clock_timer *clock_timer; HRESULT hr; - TRACE("%p, %#x, %s, %p, %p, %p.\n", iface, flags, debugstr_time(time), callback, state, cancel_key); + TRACE("%p, %#x, %s, %p, %p, %p.\n", iface, flags, wine_dbgstr_reference_time(time), callback, state, cancel_key); if (!(clock_timer = calloc(1, sizeof(*clock_timer)))) return E_OUTOFMEMORY; diff --git a/dlls/mf/copier.c b/dlls/mf/copier.c index fe5664ee4c7..4972c9f9c44 100644 --- a/dlls/mf/copier.c +++ b/dlls/mf/copier.c @@ -424,7 +424,7 @@ static HRESULT WINAPI sample_copier_transform_GetOutputStatus(IMFTransform *ifac static HRESULT WINAPI sample_copier_transform_SetOutputBounds(IMFTransform *iface, LONGLONG lower, LONGLONG upper) { - TRACE("%p, %s, %s.\n", iface, debugstr_time(lower), debugstr_time(upper)); + TRACE("%p, %s, %s.\n", iface, wine_dbgstr_reference_time(lower), wine_dbgstr_reference_time(upper)); return E_NOTIMPL; } diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 5e8b559af04..173e712ab84 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1504,7 +1504,7 @@ static HRESULT WINAPI video_renderer_preroll_NotifyPreroll(IMFMediaSinkPreroll * HRESULT hr = S_OK; size_t i; - TRACE("%p, %s.\n", iface, debugstr_time(start_time)); + TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(start_time)); EnterCriticalSection(&renderer->cs); if (renderer->flags & EVR_SHUT_DOWN) @@ -1880,7 +1880,7 @@ static HRESULT WINAPI video_renderer_clock_sink_OnClockStart(IMFClockStateSink * unsigned int state, request_sample; size_t i; - TRACE("%p, %s, %s.\n", iface, debugstr_time(systime), debugstr_time(offset)); + TRACE("%p, %s, %s.\n", iface, wine_dbgstr_reference_time(systime), wine_dbgstr_reference_time(offset)); EnterCriticalSection(&renderer->cs); @@ -1923,7 +1923,7 @@ static HRESULT WINAPI video_renderer_clock_sink_OnClockStop(IMFClockStateSink *i struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); size_t i; - TRACE("%p, %s.\n", iface, debugstr_time(systime)); + TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime)); EnterCriticalSection(&renderer->cs); @@ -1960,7 +1960,7 @@ static HRESULT WINAPI video_renderer_clock_sink_OnClockPause(IMFClockStateSink * struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); size_t i; - TRACE("%p, %s.\n", iface, debugstr_time(systime)); + TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime)); EnterCriticalSection(&renderer->cs); @@ -1987,7 +1987,7 @@ static HRESULT WINAPI video_renderer_clock_sink_OnClockRestart(IMFClockStateSink struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); size_t i; - TRACE("%p, %s.\n", iface, debugstr_time(systime)); + TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime)); EnterCriticalSection(&renderer->cs); @@ -2010,7 +2010,7 @@ static HRESULT WINAPI video_renderer_clock_sink_OnClockSetRate(IMFClockStateSink struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); IMFClockStateSink *sink; - TRACE("%p, %s, %f.\n", iface, debugstr_time(systime), rate); + TRACE("%p, %s, %f.\n", iface, wine_dbgstr_reference_time(systime), rate); EnterCriticalSection(&renderer->cs); diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index db6f101cd6d..c6f853e4950 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -58,27 +58,6 @@ struct activate_funcs HRESULT create_activation_object(void *context, const struct activate_funcs *funcs, IMFActivate **ret) DECLSPEC_HIDDEN; -static inline const char *debugstr_time(LONGLONG time) -{ - ULONGLONG abstime = time >= 0 ? time : -time; - unsigned int i = 0, j = 0; - char buffer[23], rev[23]; - - while (abstime || i <= 8) - { - buffer[i++] = '0' + (abstime % 10); - abstime /= 10; - if (i == 7) buffer[i++] = '.'; - } - if (time < 0) buffer[i++] = '-'; - - while (i--) rev[j++] = buffer[i]; - while (rev[j-1] == '0' && rev[j-2] != '.') --j; - rev[j] = 0; - - return wine_dbg_sprintf("%s", rev); -} - extern BOOL mf_is_sample_copier_transform(IMFTransform *transform) DECLSPEC_HIDDEN; extern BOOL mf_is_sar_sink(IMFMediaSink *sink) DECLSPEC_HIDDEN; extern HRESULT topology_node_get_object(IMFTopologyNode *node, REFIID riid, void **obj) DECLSPEC_HIDDEN; diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index e7d3be68df3..53c7e381d6a 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -1170,7 +1170,7 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockStart(IMFClockStateSink * { struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); - TRACE("%p, %s, %s.\n", iface, debugstr_time(systime), debugstr_time(offset)); + TRACE("%p, %s, %s.\n", iface, wine_dbgstr_reference_time(systime), wine_dbgstr_reference_time(offset)); return sample_grabber_set_state(grabber, SINK_STATE_RUNNING, systime, offset); } @@ -1179,7 +1179,7 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockStop(IMFClockStateSink *i { struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); - TRACE("%p, %s.\n", iface, debugstr_time(systime)); + TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime)); return sample_grabber_set_state(grabber, SINK_STATE_STOPPED, systime, 0); } @@ -1188,7 +1188,7 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockPause(IMFClockStateSink * { struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); - TRACE("%p, %s.\n", iface, debugstr_time(systime)); + TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime)); return sample_grabber_set_state(grabber, SINK_STATE_PAUSED, systime, 0); } @@ -1197,7 +1197,7 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockRestart(IMFClockStateSink { struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); - TRACE("%p, %s.\n", iface, debugstr_time(systime)); + TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime)); return sample_grabber_set_state(grabber, SINK_STATE_RUNNING, systime, PRESENTATION_CURRENT_POSITION); } @@ -1206,7 +1206,7 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockSetRate(IMFClockStateSink { struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); - TRACE("%p, %s, %f.\n", iface, debugstr_time(systime), rate); + TRACE("%p, %s, %f.\n", iface, wine_dbgstr_reference_time(systime), rate); return IMFSampleGrabberSinkCallback_OnClockSetRate(sample_grabber_get_callback(grabber), systime, rate); } diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 3c9bac90c9f..a6513fc167f 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -518,7 +518,7 @@ static HRESULT WINAPI audio_renderer_preroll_NotifyPreroll(IMFMediaSinkPreroll * { struct audio_renderer *renderer = impl_from_IMFMediaSinkPreroll(iface); - TRACE("%p, %s.\n", iface, debugstr_time(start_time)); + TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(start_time)); if (renderer->flags & SAR_SHUT_DOWN) return MF_E_SHUTDOWN; @@ -626,7 +626,7 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockStart(IMFClockStateSink * struct audio_renderer *renderer = impl_from_IMFClockStateSink(iface); HRESULT hr = S_OK; - TRACE("%p, %s, %s.\n", iface, debugstr_time(systime), debugstr_time(offset)); + TRACE("%p, %s, %s.\n", iface, wine_dbgstr_reference_time(systime), wine_dbgstr_reference_time(offset)); EnterCriticalSection(&renderer->cs); if (renderer->audio_client) @@ -654,7 +654,7 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockStop(IMFClockStateSink *i struct audio_renderer *renderer = impl_from_IMFClockStateSink(iface); HRESULT hr = S_OK; - TRACE("%p, %s.\n", iface, debugstr_time(systime)); + TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime)); EnterCriticalSection(&renderer->cs); if (renderer->audio_client) @@ -686,7 +686,7 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockPause(IMFClockStateSink * struct audio_renderer *renderer = impl_from_IMFClockStateSink(iface); HRESULT hr; - TRACE("%p, %s.\n", iface, debugstr_time(systime)); + TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime)); EnterCriticalSection(&renderer->cs); if (renderer->state == STREAM_STATE_RUNNING) @@ -715,7 +715,7 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockRestart(IMFClockStateSink BOOL preroll = FALSE; HRESULT hr = S_OK; - TRACE("%p, %s.\n", iface, debugstr_time(systime)); + TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(systime)); EnterCriticalSection(&renderer->cs); if (renderer->audio_client) @@ -741,7 +741,7 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockRestart(IMFClockStateSink static HRESULT WINAPI audio_renderer_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate) { - FIXME("%p, %s, %f.\n", iface, debugstr_time(systime), rate); + FIXME("%p, %s, %f.\n", iface, wine_dbgstr_reference_time(systime), rate); return E_NOTIMPL; } diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index f161bb29d80..525c902d192 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1560,7 +1560,7 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO HRESULT hr; GUID major; - TRACE("%p, %s, %u, %u, %p.\n", media_type, debugstr_time(duration), min_length, alignment, buffer); + TRACE("%p, %s, %u, %u, %p.\n", media_type, wine_dbgstr_reference_time(duration), min_length, alignment, buffer); if (!media_type) return E_INVALIDARG; diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e79f59d41dd..ec24b32318b 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -8057,7 +8057,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockStart(IMFClockStateSink *if MFCLOCK_STATE state; HRESULT hr; - TRACE("%p, %s, %s.\n", iface, debugstr_time(system_time), debugstr_time(start_offset)); + TRACE("%p, %s, %s.\n", iface, wine_dbgstr_reference_time(system_time), wine_dbgstr_reference_time(start_offset)); EnterCriticalSection(&source->cs); state = source->state; @@ -8094,7 +8094,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockStop(IMFClockStateSink *ifa struct system_time_source *source = impl_from_IMFClockStateSink(iface); HRESULT hr; - TRACE("%p, %s.\n", iface, debugstr_time(system_time)); + TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(system_time)); EnterCriticalSection(&source->cs); if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_STOP))) @@ -8109,7 +8109,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockPause(IMFClockStateSink *if struct system_time_source *source = impl_from_IMFClockStateSink(iface); HRESULT hr; - TRACE("%p, %s.\n", iface, debugstr_time(system_time)); + TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(system_time)); EnterCriticalSection(&source->cs); if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_PAUSE))) @@ -8127,7 +8127,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockRestart(IMFClockStateSink * struct system_time_source *source = impl_from_IMFClockStateSink(iface); HRESULT hr; - TRACE("%p, %s.\n", iface, debugstr_time(system_time)); + TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(system_time)); EnterCriticalSection(&source->cs); if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_RESTART))) @@ -8145,7 +8145,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockSetRate(IMFClockStateSink * struct system_time_source *source = impl_from_IMFClockStateSink(iface); double intpart; - TRACE("%p, %s, %f.\n", iface, debugstr_time(system_time), rate); + TRACE("%p, %s, %f.\n", iface, wine_dbgstr_reference_time(system_time), rate); if (rate == 0.0f) return MF_E_UNSUPPORTED_RATE; diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index b646d9e7cbb..bc673987650 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -183,24 +183,3 @@ static inline const char *debugstr_fourcc(DWORD format) return wine_dbgstr_an((char *)&format, 4); } - -static inline const char *debugstr_time(LONGLONG time) -{ - ULONGLONG abstime = time >= 0 ? time : -time; - unsigned int i = 0, j = 0; - char buffer[23], rev[23]; - - while (abstime || i <= 8) - { - buffer[i++] = '0' + (abstime % 10); - abstime /= 10; - if (i == 7) buffer[i++] = '.'; - } - if (time < 0) buffer[i++] = '-'; - - while (i--) rev[j++] = buffer[i]; - while (rev[j-1] == '0' && rev[j-2] != '.') --j; - rev[j] = 0; - - return wine_dbg_sprintf("%s", rev); -} diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 04c68c87199..72eca896dae 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -528,7 +528,7 @@ static HRESULT WINAPI sample_SetSampleTime(IMFSample *iface, LONGLONG timestamp) { struct sample *sample = impl_from_IMFSample(iface); - TRACE("%p, %s.\n", iface, debugstr_time(timestamp)); + TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(timestamp)); EnterCriticalSection(&sample->attributes.cs); sample->timestamp = timestamp; @@ -559,7 +559,7 @@ static HRESULT WINAPI sample_SetSampleDuration(IMFSample *iface, LONGLONG durati { struct sample *sample = impl_from_IMFSample(iface); - TRACE("%p, %s.\n", iface, debugstr_time(duration)); + TRACE("%p, %s.\n", iface, wine_dbgstr_reference_time(duration)); EnterCriticalSection(&sample->attributes.cs); sample->duration = duration; diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 12d96f69376..04f942b7d9d 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -203,7 +203,7 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed goto error; } - TRACE("Sample start time: %s.\n", debugstr_time(tStart)); + TRACE("Sample start time: %s.\n", wine_dbgstr_reference_time(tStart)); if (ash.cbSrcLengthUsed == cbSrcStream) { IMediaSample_SetTime(pOutSample, &tStart, &tStop); @@ -236,7 +236,7 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed IMediaSample_SetMediaTime(pOutSample, NULL, NULL); } - TRACE("Sample stop time: %s\n", debugstr_time(tStart)); + TRACE("Sample stop time: %s\n", wine_dbgstr_reference_time(tStart)); hr = IMemInputPin_Receive(This->source.pMemInputPin, pOutSample); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) { @@ -418,7 +418,7 @@ static HRESULT WINAPI acm_wrapper_source_qc_Notify(IQualityControl *iface, HRESULT hr = S_OK; TRACE("filter %p, sender %p, type %#x, proportion %ld, late %s, timestamp %s.\n", - filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp)); + filter, sender, q.Type, q.Proportion, wine_dbgstr_reference_time(q.Late), wine_dbgstr_reference_time(q.TimeStamp)); if (filter->source_qc_sink) return IQualityControl_Notify(filter->source_qc_sink, &filter->filter.IBaseFilter_iface, q); diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 30b6c741eed..ebd59beaf70 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -477,7 +477,7 @@ static HRESULT WINAPI avi_decompressor_source_qc_Notify(IQualityControl *iface, struct avi_decompressor *filter = impl_from_source_IQualityControl(iface); TRACE("filter %p, sender %p, type %#x, proportion %ld, late %s, timestamp %s.\n", - filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp)); + filter, sender, q.Type, q.Proportion, wine_dbgstr_reference_time(q.Late), wine_dbgstr_reference_time(q.TimeStamp)); EnterCriticalSection(&filter->filter.stream_cs); if (q.Late > 0) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 1abd4bdbcec..4f6ebb620e5 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -182,7 +182,7 @@ static HRESULT DSoundRender_GetWritePos(struct dsound_render *This, *ret_writepos = writepos; } else if (delta_t < 0) { REFERENCE_TIME past, min_writepos_t; - WARN("Delta too big %s/%s, overwriting old data or even skipping\n", debugstr_time(delta_t), debugstr_time(max_lag)); + WARN("Delta too big %s/%s, overwriting old data or even skipping\n", wine_dbgstr_reference_time(delta_t), wine_dbgstr_reference_time(max_lag)); if (min_writepos >= playpos) min_writepos_t = cur + time_from_pos(This, min_writepos - playpos); else @@ -200,7 +200,7 @@ static HRESULT DSoundRender_GetWritePos(struct dsound_render *This, } } else /* delta_t > 0 */ { DWORD aheadbytes; - WARN("Delta too big %s/%s, too far ahead\n", debugstr_time(delta_t), debugstr_time(max_lag)); + WARN("Delta too big %s/%s, too far ahead\n", wine_dbgstr_reference_time(delta_t), wine_dbgstr_reference_time(max_lag)); aheadbytes = pos_from_time(This, delta_t); WARN("Advancing %lu bytes.\n", aheadbytes); if (delta_t >= DSoundRenderer_Max_Fill) @@ -213,8 +213,8 @@ end: else *pfree = This->buf_size + playpos - *ret_writepos; if (time_from_pos(This, This->buf_size - *pfree) >= DSoundRenderer_Max_Fill) { - TRACE("Blocked: too full %s / %s\n", debugstr_time(time_from_pos(This, This->buf_size - *pfree)), - debugstr_time(DSoundRenderer_Max_Fill)); + TRACE("Blocked: too full %s / %s\n", wine_dbgstr_reference_time(time_from_pos(This, This->buf_size - *pfree)), + wine_dbgstr_reference_time(DSoundRenderer_Max_Fill)); return S_FALSE; } return S_OK; @@ -962,7 +962,7 @@ static HRESULT WINAPI dsound_render_qc_Notify(IQualityControl *iface, struct dsound_render *filter = impl_from_IQualityControl(iface); FIXME("filter %p, sender %p, type %#x, proportion %ld, late %s, timestamp %s, stub!\n", - filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp)); + filter, sender, q.Type, q.Proportion, wine_dbgstr_reference_time(q.Late), wine_dbgstr_reference_time(q.TimeStamp)); return E_NOTIMPL; } diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 1849174cf97..867eab011d5 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2249,7 +2249,7 @@ static HRESULT WINAPI MediaSeeking_GetDuration(IMediaSeeking *iface, LONGLONG *d LeaveCriticalSection(&graph->cs); TRACE("Returning hr %#lx, duration %s (%s seconds).\n", hr, - wine_dbgstr_longlong(*duration), debugstr_time(*duration)); + wine_dbgstr_longlong(*duration), wine_dbgstr_reference_time(*duration)); return hr; } @@ -2290,7 +2290,7 @@ static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLON LeaveCriticalSection(&graph->cs); - TRACE("Returning %s (%s seconds).\n", wine_dbgstr_longlong(*stop), debugstr_time(*stop)); + TRACE("Returning %s (%s seconds).\n", wine_dbgstr_longlong(*stop), wine_dbgstr_reference_time(*stop)); return hr; } @@ -2320,7 +2320,7 @@ static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONG LeaveCriticalSection(&graph->cs); - TRACE("Returning %s (%s seconds).\n", wine_dbgstr_longlong(ret), debugstr_time(ret)); + TRACE("Returning %s (%s seconds).\n", wine_dbgstr_longlong(ret), wine_dbgstr_reference_time(ret)); *current = ret; return S_OK; @@ -2361,10 +2361,10 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG * stop_ptr ? wine_dbgstr_longlong(*stop_ptr): "<null>", stop_flags); if (current_ptr) TRACE("Setting current position to %s (%s seconds).\n", - wine_dbgstr_longlong(*current_ptr), debugstr_time(*current_ptr)); + wine_dbgstr_longlong(*current_ptr), wine_dbgstr_reference_time(*current_ptr)); if (stop_ptr) TRACE("Setting stop position to %s (%s seconds).\n", - wine_dbgstr_longlong(*stop_ptr), debugstr_time(*stop_ptr)); + wine_dbgstr_longlong(*stop_ptr), wine_dbgstr_reference_time(*stop_ptr)); if ((current_flags & 0x7) != AM_SEEKING_AbsolutePositioning && (current_flags & 0x7) != AM_SEEKING_NoPositioning) @@ -5093,7 +5093,7 @@ static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME start) struct filter_graph *graph = impl_from_IMediaFilter(iface); HRESULT hr; - TRACE("graph %p, start %s.\n", graph, debugstr_time(start)); + TRACE("graph %p, start %s.\n", graph, wine_dbgstr_reference_time(start)); EnterCriticalSection(&graph->cs); diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 87869b4d6b2..715f4b704e0 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -560,8 +560,8 @@ static HRESULT WINAPI StdMediaSample2_SetTime(IMediaSample2 *iface, REFERENCE_TI { StdMediaSample2 *sample = impl_from_IMediaSample2(iface); - TRACE("sample %p, start %s, end %s.\n", sample, start ? debugstr_time(*start) : "(null)", - end ? debugstr_time(*end) : "(null)"); + TRACE("sample %p, start %s, end %s.\n", sample, start ? wine_dbgstr_reference_time(*start) : "(null)", + end ? wine_dbgstr_reference_time(*end) : "(null)"); if (start) { @@ -742,8 +742,8 @@ static HRESULT WINAPI StdMediaSample2_SetMediaTime(IMediaSample2 *iface, LONGLON { StdMediaSample2 *sample = impl_from_IMediaSample2(iface); - TRACE("sample %p, start %s, end %s.\n", sample, start ? debugstr_time(*start) : "(null)", - end ? debugstr_time(*end) : "(null)"); + TRACE("sample %p, start %s, end %s.\n", sample, start ? wine_dbgstr_reference_time(*start) : "(null)", + end ? wine_dbgstr_reference_time(*end) : "(null)"); if (start) { diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index c706d906a26..c68a65244a3 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -37,27 +37,6 @@ #include "wine/strmbase.h" #include "wine/list.h" -static inline const char *debugstr_time(REFERENCE_TIME time) -{ - ULONGLONG abstime = time >= 0 ? time : -time; - unsigned int i = 0, j = 0; - char buffer[23], rev[23]; - - while (abstime || i <= 8) - { - buffer[i++] = '0' + (abstime % 10); - abstime /= 10; - if (i == 7) buffer[i++] = '.'; - } - if (time < 0) buffer[i++] = '-'; - - while (i--) rev[j++] = buffer[i]; - while (rev[j-1] == '0' && rev[j-2] != '.') --j; - rev[j] = 0; - - return wine_dbg_sprintf("%s", rev); -} - /* see IAsyncReader::Request on MSDN for the explanation of this */ #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) #define BYTES_FROM_MEDIATIME(time) ((time) / 10000000) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 729122fec46..9bdbd3e62eb 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -259,7 +259,7 @@ static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_ LeaveCriticalSection(&clock->cs); - TRACE("clock %p, time %p, returning %s.\n", clock, time, debugstr_time(ret)); + TRACE("clock %p, time %p, returning %s.\n", clock, time, wine_dbgstr_reference_time(ret)); return hr; } @@ -269,7 +269,7 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface, struct system_clock *clock = impl_from_IReferenceClock(iface); TRACE("clock %p, base %s, offset %s, event %#Ix, cookie %p.\n", - clock, debugstr_time(base), debugstr_time(offset), event, cookie); + clock, wine_dbgstr_reference_time(base), wine_dbgstr_reference_time(offset), event, cookie); if (base + offset <= 0) return E_INVALIDARG; @@ -283,7 +283,7 @@ static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, struct system_clock *clock = impl_from_IReferenceClock(iface); TRACE("clock %p, start %s, period %s, semaphore %#Ix, cookie %p.\n", - clock, debugstr_time(start), debugstr_time(period), semaphore, cookie); + clock, wine_dbgstr_reference_time(start), wine_dbgstr_reference_time(period), semaphore, cookie); if (start <= 0 || period <= 0) return E_INVALIDARG; diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 222bce3b2c7..7286688666d 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -41,27 +41,6 @@ bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size) DECLSPEC_HIDDEN; -static inline const char *debugstr_time(REFERENCE_TIME time) -{ - ULONGLONG abstime = time >= 0 ? time : -time; - unsigned int i = 0, j = 0; - char buffer[23], rev[23]; - - while (abstime || i <= 8) - { - buffer[i++] = '0' + (abstime % 10); - abstime /= 10; - if (i == 7) buffer[i++] = '.'; - } - if (time < 0) buffer[i++] = '-'; - - while (i--) rev[j++] = buffer[i]; - while (rev[j-1] == '0' && rev[j-2] != '.') --j; - rev[j] = 0; - - return wine_dbg_sprintf("%s", rev); -} - #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) struct wg_parser *wg_parser_create(enum wg_parser_type type, bool unlimited_buffering) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 331bc9a888a..704e782554e 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1298,8 +1298,8 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, int i; TRACE("pin %p, current %s, current_flags %#lx, stop %s, stop_flags %#lx.\n", - pin, current ? debugstr_time(*current) : "<null>", current_flags, - stop ? debugstr_time(*stop) : "<null>", stop_flags); + pin, current ? wine_dbgstr_reference_time(*current) : "<null>", current_flags, + stop ? wine_dbgstr_reference_time(*stop) : "<null>", stop_flags); if (pin->pin.pin.filter->state == State_Stopped) { @@ -1419,7 +1419,7 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil TRACE("pin %p, sender %p, type %s, proportion %ld, late %s, timestamp %s.\n", pin, sender, q.Type == Famine ? "Famine" : "Flood", q.Proportion, - debugstr_time(q.Late), debugstr_time(q.TimeStamp)); + wine_dbgstr_reference_time(q.Late), wine_dbgstr_reference_time(q.TimeStamp)); /* DirectShow filters sometimes pass negative timestamps (Audiosurf uses the * current time instead of the time of the last buffer). GstClockTime is diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index fc919ef2c49..41c335210b8 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -319,7 +319,7 @@ static HRESULT WINAPI WMReader_Start(IWMReader *iface, static const DWORD zero; TRACE("reader %p, start %s, duration %s, rate %.8e, context %p.\n", - reader, debugstr_time(start), debugstr_time(duration), rate, context); + reader, wine_dbgstr_reference_time(start), wine_dbgstr_reference_time(duration), rate, context); if (rate != 1.0f) FIXME("Ignoring rate %.8e.\n", rate); @@ -448,7 +448,7 @@ static HRESULT WINAPI WMReaderAdvanced_DeliverTime(IWMReaderAdvanced6 *iface, QW { struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface); - TRACE("reader %p, time %s.\n", reader, debugstr_time(time)); + TRACE("reader %p, time %s.\n", reader, wine_dbgstr_reference_time(time)); EnterCriticalSection(&reader->stream_cs); @@ -1492,7 +1492,7 @@ static HRESULT WINAPI refclock_AdviseTime(IReferenceClock *iface, REFERENCE_TIME struct async_reader *reader = impl_from_IReferenceClock(iface); FIXME("reader %p, basetime %s, streamtime %s, event %#Ix, cookie %p, stub!\n", - reader, debugstr_time(basetime), debugstr_time(streamtime), event, cookie); + reader, wine_dbgstr_reference_time(basetime), wine_dbgstr_reference_time(streamtime), event, cookie); return E_NOTIMPL; } @@ -1503,7 +1503,7 @@ static HRESULT WINAPI refclock_AdvisePeriodic(IReferenceClock *iface, REFERENCE_ struct async_reader *reader = impl_from_IReferenceClock(iface); FIXME("reader %p, starttime %s, period %s, semaphore %#Ix, cookie %p, stub!\n", - reader, debugstr_time(starttime), debugstr_time(period), semaphore, cookie); + reader, wine_dbgstr_reference_time(starttime), wine_dbgstr_reference_time(period), semaphore, cookie); return E_NOTIMPL; } diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index d40afb66afd..4e14f03fb20 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -912,7 +912,7 @@ static HRESULT WINAPI profile_CreateNewStreamPrioritization(IWMProfile3 *iface, static HRESULT WINAPI profile_GetExpectedPacketCount(IWMProfile3 *iface, QWORD duration, QWORD *count) { - FIXME("iface %p, duration %s, count %p, stub!\n", iface, debugstr_time(duration), count); + FIXME("iface %p, duration %s, count %p, stub!\n", iface, wine_dbgstr_reference_time(duration), count); return E_NOTIMPL; } @@ -1029,7 +1029,7 @@ static HRESULT WINAPI header_info_GetAttributeByName(IWMHeaderInfo3 *iface, WORD EnterCriticalSection(&reader->cs); duration = wg_parser_stream_get_duration(wg_parser_get_stream(reader->wg_parser, 0)); LeaveCriticalSection(&reader->cs); - TRACE("Returning duration %s.\n", debugstr_time(duration)); + TRACE("Returning duration %s.\n", wine_dbgstr_reference_time(duration)); memcpy(value, &duration, sizeof(QWORD)); return S_OK; } @@ -1084,7 +1084,7 @@ static HRESULT WINAPI header_info_GetMarker(IWMHeaderInfo3 *iface, static HRESULT WINAPI header_info_AddMarker(IWMHeaderInfo3 *iface, const WCHAR *name, QWORD time) { - FIXME("iface %p, name %s, time %s, stub!\n", iface, debugstr_w(name), debugstr_time(time)); + FIXME("iface %p, name %s, time %s, stub!\n", iface, debugstr_w(name), wine_dbgstr_reference_time(time)); return E_NOTIMPL; } @@ -1112,7 +1112,7 @@ static HRESULT WINAPI header_info_AddScript(IWMHeaderInfo3 *iface, const WCHAR *type, const WCHAR *command, QWORD time) { FIXME("iface %p, type %s, command %s, time %s, stub!\n", - iface, debugstr_w(type), debugstr_w(command), debugstr_time(time)); + iface, debugstr_w(type), debugstr_w(command), wine_dbgstr_reference_time(time)); return E_NOTIMPL; } diff --git a/include/wine/debug.h b/include/wine/debug.h index 58f92754164..566fb185745 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -349,6 +349,27 @@ static inline const char *wine_dbgstr_longlong( ULONGLONG ll ) else return wine_dbg_sprintf( "%lx", (unsigned long)ll ); } +static inline const char *wine_dbgstr_reference_time( LONGLONG time ) +{ + ULONGLONG abstime = time >= 0 ? time : -time; + unsigned int i = 0, j = 0; + char buffer[23], rev[23]; + + while (abstime || i <= 8) + { + buffer[i++] = '0' + (abstime % 10); + abstime /= 10; + if (i == 7) buffer[i++] = '.'; + } + if (time < 0) buffer[i++] = '-'; + + while (i--) rev[j++] = buffer[i]; + while (rev[j-1] == '0' && rev[j-2] != '.') --j; + rev[j] = 0; + + return wine_dbg_sprintf("%s", rev); +} + #if defined(__oaidl_h__) && defined(V_VT) static inline const char *wine_dbgstr_vt( VARTYPE vt ) diff --git a/libs/strmbase/filter.c b/libs/strmbase/filter.c index 2cf874ac1f1..9b9e05223d0 100644 --- a/libs/strmbase/filter.c +++ b/libs/strmbase/filter.c @@ -347,7 +347,7 @@ static HRESULT WINAPI filter_Run(IBaseFilter *iface, REFERENCE_TIME start) struct strmbase_filter *filter = impl_from_IBaseFilter(iface); HRESULT hr = S_OK; - TRACE("filter %p %s, start %s.\n", filter, debugstr_w(filter->name), debugstr_time(start)); + TRACE("filter %p %s, start %s.\n", filter, debugstr_w(filter->name), wine_dbgstr_reference_time(start)); EnterCriticalSection(&filter->filter_cs); diff --git a/libs/strmbase/mediatype.c b/libs/strmbase/mediatype.c index 6f66999c390..e0618d06acb 100644 --- a/libs/strmbase/mediatype.c +++ b/libs/strmbase/mediatype.c @@ -109,7 +109,7 @@ void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt) if (!IsRectEmpty(&vih->rcTarget)) TRACE("target %s, ", wine_dbgstr_rect(&vih->rcTarget)); if (vih->dwBitRate) TRACE("bitrate %u, ", vih->dwBitRate); if (vih->dwBitErrorRate) TRACE("error rate %u, ", vih->dwBitErrorRate); - TRACE("%s sec/frame, ", debugstr_time(vih->AvgTimePerFrame)); + TRACE("%s sec/frame, ", wine_dbgstr_reference_time(vih->AvgTimePerFrame)); TRACE("size %dx%d, %u planes, %u bpp, compression %s, image size %u", vih->bmiHeader.biWidth, vih->bmiHeader.biHeight, vih->bmiHeader.biPlanes, vih->bmiHeader.biBitCount, debugstr_fourcc(vih->bmiHeader.biCompression), @@ -128,7 +128,7 @@ void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt) if (!IsRectEmpty(&vih->rcTarget)) TRACE("target %s, ", wine_dbgstr_rect(&vih->rcTarget)); if (vih->dwBitRate) TRACE("bitrate %u, ", vih->dwBitRate); if (vih->dwBitErrorRate) TRACE("error rate %u, ", vih->dwBitErrorRate); - TRACE("%s sec/frame, ", debugstr_time(vih->AvgTimePerFrame)); + TRACE("%s sec/frame, ", wine_dbgstr_reference_time(vih->AvgTimePerFrame)); if (vih->dwInterlaceFlags) TRACE("interlace flags %#x, ", vih->dwInterlaceFlags); if (vih->dwCopyProtectFlags) TRACE("copy-protection flags %#x, ", vih->dwCopyProtectFlags); TRACE("aspect ratio %u/%u, ", vih->dwPictAspectRatioX, vih->dwPictAspectRatioY); diff --git a/libs/strmbase/pin.c b/libs/strmbase/pin.c index 36b3fdf1425..cb958099d38 100644 --- a/libs/strmbase/pin.c +++ b/libs/strmbase/pin.c @@ -650,7 +650,7 @@ static HRESULT WINAPI source_NewSegment(IPin * iface, REFERENCE_TIME start, REFE struct strmbase_source *pin = impl_source_from_IPin(iface); TRACE("pin %p %s:%s, start %s, stop %s, rate %.16e.\n", pin, debugstr_w(pin->pin.filter->name), - debugstr_w(pin->pin.name), debugstr_time(start), debugstr_time(stop), rate); + debugstr_w(pin->pin.name), wine_dbgstr_reference_time(start), wine_dbgstr_reference_time(stop), rate); return S_OK; } @@ -1019,7 +1019,7 @@ static HRESULT WINAPI sink_NewSegment(IPin *iface, REFERENCE_TIME start, REFEREN newsegmentargs args; TRACE("pin %p %s:%s, start %s, stop %s, rate %.16e.\n", pin, debugstr_w(pin->pin.filter->name), - debugstr_w(pin->pin.name), debugstr_time(start), debugstr_time(stop), rate); + debugstr_w(pin->pin.name), wine_dbgstr_reference_time(start), wine_dbgstr_reference_time(stop), rate); if (pin->pFuncsTable->sink_new_segment) return pin->pFuncsTable->sink_new_segment(pin, start, stop, rate); diff --git a/libs/strmbase/renderer.c b/libs/strmbase/renderer.c index da257555a19..70e3c78207a 100644 --- a/libs/strmbase/renderer.c +++ b/libs/strmbase/renderer.c @@ -107,11 +107,11 @@ static void perform_qos(struct strmbase_renderer *filter, } TRACE("start %s, entered %s, left %s, pt %s, duration %s, jitter %s.\n", - debugstr_time(start), debugstr_time(entered), debugstr_time(left), - debugstr_time(pt), debugstr_time(duration), debugstr_time(jitter)); + wine_dbgstr_reference_time(start), wine_dbgstr_reference_time(entered), wine_dbgstr_reference_time(left), + wine_dbgstr_reference_time(pt), wine_dbgstr_reference_time(duration), wine_dbgstr_reference_time(jitter)); TRACE("average duration %s, average pt %s, average rate %.16e.\n", - debugstr_time(filter->avg_duration), debugstr_time(filter->avg_pt), filter->avg_rate); + wine_dbgstr_reference_time(filter->avg_duration), wine_dbgstr_reference_time(filter->avg_pt), filter->avg_rate); /* Collect running averages. For first observations, we copy the values. */ if (filter->avg_duration < 0) @@ -527,7 +527,7 @@ static HRESULT WINAPI quality_control_Notify(IQualityControl *iface, IBaseFilter HRESULT hr = S_FALSE; TRACE("filter %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n", - filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp)); + filter, sender, q.Type, q.Proportion, wine_dbgstr_reference_time(q.Late), wine_dbgstr_reference_time(q.TimeStamp)); if (filter->qc_sink) return IQualityControl_Notify(filter->qc_sink, &filter->filter.IBaseFilter_iface, q); diff --git a/libs/strmbase/strmbase_private.h b/libs/strmbase/strmbase_private.h index 9ac0b24bb1a..ad9da316c2c 100644 --- a/libs/strmbase/strmbase_private.h +++ b/libs/strmbase/strmbase_private.h @@ -32,25 +32,4 @@ #include "wine/list.h" #include "wine/strmbase.h" -static inline const char *debugstr_time(REFERENCE_TIME time) -{ - ULONGLONG abstime = time >= 0 ? time : -time; - unsigned int i = 0, j = 0; - char buffer[23], rev[23]; - - while (abstime || i <= 8) - { - buffer[i++] = '0' + (abstime % 10); - abstime /= 10; - if (i == 7) buffer[i++] = '.'; - } - if (time < 0) buffer[i++] = '-'; - - while (i--) rev[j++] = buffer[i]; - while (rev[j-1] == '0' && rev[j-2] != '.') --j; - rev[j] = 0; - - return wine_dbg_sprintf("%s", rev); -} - #endif /* __WINE_STRMBASE_PRIVATE_H */ -- 2.35.1

1 0

[PATCH 4/4] dxgi/tests: Don't run the 32-bit tests multithreaded.
by Henri Verbeet Feb. 7, 2022

Feb. 7, 2022

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v4: Modify "use_mt" instead of run_queued_tests(). This supersedes patch 225752. dlls/dxgi/tests/dxgi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index a83964d75233..f70d849aebc9 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -7595,6 +7595,11 @@ START_TEST(dxgi) ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); use_mt = !getenv("WINETEST_NO_MT_D3D"); + /* Some host drivers (MacOS, Mesa radeonsi) never unmap memory even when + * requested. When using the chunk allocator, running the tests with more + * than one thread can exceed the 32-bit virtual address space. */ + if (sizeof(void *) == 4 && !strcmp(winetest_platform, "wine")) + use_mt = FALSE; argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) -- 2.30.2

2 1

[PATCH 3/4] d3d11/tests: Don't run the 32-bit tests multithreaded.
by Henri Verbeet Feb. 7, 2022

Feb. 7, 2022

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v4: Modify "use_mt" instead of run_queued_tests(). This supersedes patch 225753. dlls/d3d11/tests/d3d11.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 93f0aa896e8f..52c8816b689e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -34055,6 +34055,11 @@ START_TEST(d3d11) char **argv; use_mt = !getenv("WINETEST_NO_MT_D3D"); + /* Some host drivers (MacOS, Mesa radeonsi) never unmap memory even when + * requested. When using the chunk allocator, running the tests with more + * than one thread can exceed the 32-bit virtual address space. */ + if (sizeof(void *) == 4 && !strcmp(winetest_platform, "wine")) + use_mt = FALSE; argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) -- 2.30.2

2 1

[PATCH vkd3d 2/2] configure: Don't require pthread for Mingw builds.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index d296dfd4bc6d..45220f840bfb 100644 --- a/configure.ac +++ b/configure.ac @@ -69,11 +69,10 @@ VKD3D_CHECK_MINGW32_PROG([CROSSCC32], [CROSSTARGET32], [no]) VKD3D_CHECK_MINGW64_PROG([CROSSCC64], [CROSSTARGET64], [no]) dnl Check for headers -AC_CHECK_HEADERS([dlfcn.h pthread.h \ +AC_CHECK_HEADERS([dlfcn.h \ vulkan/vulkan.h \ vulkan/spirv.h vulkan/GLSL.std.450.h \ spirv/unified1/spirv.h spirv/unified1/GLSL.std.450.h]) -AS_IF([test "x$ac_cv_header_pthread_h" != "xyes"], [AC_MSG_ERROR([pthread.h not found.])]) AS_IF([test "x$ac_cv_header_vulkan_vulkan_h" != "xyes"], [AC_MSG_ERROR([vulkan.h not found.])]) AS_IF([test "x$ac_cv_header_spirv_unified1_spirv_h" != "xyes" \ -a "x$ac_cv_header_vulkan_spirv_h" != "xyes"], @@ -103,8 +102,15 @@ AC_CHECK_LIB([dl], [dlopen], [DL_LIBS="-ldl"], [AS_IF([test "$ac_cv_header_dlfnc_h" = "xyes"], [AC_MSG_ERROR([libdl not found.])])]) -AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads]) -VKD3D_CHECK_PTHREAD +case $host_os in + mingw32*) ;; + *) AC_CHECK_HEADERS([pthread.h]) + AS_IF([test "x$ac_cv_header_pthread_h" != "xyes"], [AC_MSG_ERROR([pthread.h not found.])]) + AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads]) + VKD3D_CHECK_PTHREAD + VKD3D_CHECK_PTHREAD_SETNAME_NP + ;; +esac AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library]) VKD3D_CHECK_VULKAN @@ -132,8 +138,6 @@ VKD3D_CHECK_FUNC([HAVE_BUILTIN_ADD_OVERFLOW], [__builtin_add_overflow], [__built VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_and_fetch((int *)0, 0)]) VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)]) -VKD3D_CHECK_PTHREAD_SETNAME_NP - dnl Makefiles AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], [AC_MSG_ERROR([libxcb is required for demos.])]) -- 2.34.1

3 2

[PATCH vkd3d 1/2] vkd3d: Add a create thread implementation for Windows.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 42 ++++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 14 +++++++++---- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index fe90eb37ef00..3360fd6eeeb8 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -4037,6 +4037,23 @@ void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, device->removed_reason = reason; } + +#ifdef _WIN32 +struct thread_data +{ + PFN_vkd3d_thread main_pfn; + void *data; +}; + +static DWORD WINAPI call_thread_main(void *data) +{ + struct thread_data *thread_data = data; + thread_data->main_pfn(thread_data->data); + vkd3d_free(thread_data); + return 0; +} +#endif + HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread) { @@ -4053,11 +4070,27 @@ HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, } else { +#ifdef _WIN32 + struct thread_data *thread_data; + + if (!(thread_data = vkd3d_malloc(sizeof(*thread_data)))) + return E_OUTOFMEMORY; + + thread_data->main_pfn = thread_main; + thread_data->data = data; + if (!(thread->handle = CreateThread(NULL, 0, call_thread_main, thread_data, 0, NULL))) + { + ERR("Failed to create thread, error %d.\n", GetLastError()); + vkd3d_free(thread_data); + hr = E_FAIL; + } +#else if ((rc = pthread_create(&thread->pthread, NULL, thread_main, data))) { ERR("Failed to create thread, error %d.\n", rc); hr = hresult_from_errno(rc); } +#endif } return hr; @@ -4075,11 +4108,20 @@ HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_ha } else { +#ifdef _WIN32 + if ((rc = WaitForSingleObject(thread->handle, INFINITE)) != WAIT_OBJECT_0) + { + ERR("Failed to wait for thread, ret %#x.\n", rc); + hr = E_FAIL; + } + CloseHandle(thread->handle); +#else if ((rc = pthread_join(thread->pthread, NULL))) { ERR("Failed to join thread, error %d.\n", rc); hr = hresult_from_errno(rc); } +#endif } return hr; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index ece111325e77..67989c11285a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -40,7 +40,6 @@ #include <assert.h> #include <inttypes.h> #include <limits.h> -#include <pthread.h> #include <stdbool.h> #define VK_CALL(f) (vk_procs->f) @@ -169,14 +168,13 @@ struct vkd3d_instance LONG refcount; }; +#ifdef _WIN32 + union vkd3d_thread_handle { - pthread_t pthread; void *handle; }; -#ifdef _WIN32 - struct vkd3d_mutex { CRITICAL_SECTION lock; @@ -241,6 +239,14 @@ static inline int vkd3d_cond_destroy(struct vkd3d_cond *cond) #else /* _WIN32 */ +#include <pthread.h> + +union vkd3d_thread_handle +{ + pthread_t pthread; + void *handle; +}; + struct vkd3d_mutex { pthread_mutex_t lock; -- 2.34.1

2 1

[PATCH vkd3d 1/5] vkd3d: Pass shader extension info to all graphics stages.
by Conor McCarthy Feb. 7, 2022

Feb. 7, 2022

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/state.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index fa4de634..a7a878ca 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2515,13 +2515,14 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s VkVertexInputBindingDivisorDescriptionEXT *binding_divisor; const struct vkd3d_vulkan_info *vk_info = &device->vk_info; uint32_t instance_divisors[D3D12_VS_INPUT_REGISTER_COUNT]; + struct vkd3d_shader_spirv_target_info *stage_target_info; uint32_t aligned_offsets[D3D12_VS_INPUT_REGISTER_COUNT]; + struct vkd3d_shader_descriptor_offset_info offset_info; struct vkd3d_shader_parameter ps_shader_parameters[1]; struct vkd3d_shader_transform_feedback_info xfb_info; struct vkd3d_shader_spirv_target_info ps_target_info; struct vkd3d_shader_interface_info shader_interface; - struct vkd3d_shader_descriptor_offset_info offset_info; - struct vkd3d_shader_spirv_target_info *target_info; + struct vkd3d_shader_spirv_target_info target_info; const struct d3d12_root_signature *root_signature; struct vkd3d_shader_signature input_signature; bool have_attachment, is_dsv_format_unknown; @@ -2726,6 +2727,12 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } } + memset(&target_info, 0, sizeof(target_info)); + target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO; + target_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0; + target_info.extensions = vk_info->shader_extensions; + target_info.extension_count = vk_info->shader_extension_count; + graphics->xfb_enabled = false; if (so_desc->NumEntries) { @@ -2778,7 +2785,6 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s offset_info.descriptor_table_count = 0; offset_info.binding_offsets = root_signature->descriptor_offsets; offset_info.uav_counter_offsets = NULL; - vkd3d_prepend_struct(&shader_interface, &offset_info); } for (i = 0; i < ARRAY_SIZE(shader_stages); ++i) @@ -2810,7 +2816,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_interface.uav_counters = NULL; shader_interface.uav_counter_count = 0; - target_info = NULL; + stage_target_info = &target_info; switch (shader_stages[i].stage) { case VK_SHADER_STAGE_VERTEX_BIT: @@ -2837,7 +2843,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s case VK_SHADER_STAGE_FRAGMENT_BIT: shader_interface.uav_counters = state->uav_counters.bindings; shader_interface.uav_counter_count = state->uav_counters.binding_count; - target_info = &ps_target_info; + stage_target_info = &ps_target_info; break; default: @@ -2846,10 +2852,15 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } shader_interface.next = NULL; + xfb_info.next = NULL; + ps_target_info.next = NULL; + target_info.next = NULL; + offset_info.next = NULL; if (shader_stages[i].stage == xfb_stage) vkd3d_prepend_struct(&shader_interface, &xfb_info); - if (target_info) - vkd3d_prepend_struct(&shader_interface, target_info); + vkd3d_prepend_struct(&shader_interface, stage_target_info); + if (root_signature->descriptor_offsets) + vkd3d_prepend_struct(&shader_interface, &offset_info); if (FAILED(hr = create_shader_stage(device, &graphics->stages[graphics->stage_count], shader_stages[i].stage, b, &shader_interface))) -- 2.34.1

2 7

[PATCH 2/4] d3d10core/tests: Don't run the 32-bit tests multithreaded.
by Henri Verbeet Feb. 7, 2022

Feb. 7, 2022

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v4: Modify "use_mt" instead of run_queued_tests(). This supersedes patch 225754. dlls/d3d10core/tests/d3d10core.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index a5f7f4202d52..49622bd0e264 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -19223,6 +19223,11 @@ START_TEST(d3d10core) char **argv; use_mt = !getenv("WINETEST_NO_MT_D3D"); + /* Some host drivers (MacOS, Mesa radeonsi) never unmap memory even when + * requested. When using the chunk allocator, running the tests with more + * than one thread can exceed the 32-bit virtual address space. */ + if (sizeof(void *) == 4 && !strcmp(winetest_platform, "wine")) + use_mt = FALSE; argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) -- 2.30.2

1 0

[PATCH 1/4] d2d1/tests: Don't run the 32-bit tests multithreaded.
by Henri Verbeet Feb. 7, 2022

Feb. 7, 2022

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v4: Modify "use_mt" instead of run_queued_tests(). This supersedes patch 225755. dlls/d2d1/tests/d2d1.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 2ac48e026c32..ba67dd53111c 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10551,6 +10551,11 @@ START_TEST(d2d1) pD2D1ConvertColorSpace = (void *)GetProcAddress(d2d1_dll, "D2D1ConvertColorSpace"); use_mt = !getenv("WINETEST_NO_MT_D3D"); + /* Some host drivers (MacOS, Mesa radeonsi) never unmap memory even when + * requested. When using the chunk allocator, running the tests with more + * than one thread can exceed the 32-bit virtual address space. */ + if (sizeof(void *) == 4 && !strcmp(winetest_platform, "wine")) + use_mt = FALSE; argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) -- 2.30.2

1 0

[v2 PATCH] xmllite/tests: Build without WINE_NO_LONG_TYPES.
by Nikolay Sivov Feb. 7, 2022

Feb. 7, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fixed test breakage dlls/xmllite/tests/Makefile.in | 1 - dlls/xmllite/tests/reader.c | 488 +++++++++++------------ dlls/xmllite/tests/writer.c | 694 ++++++++++++++++----------------- 3 files changed, 591 insertions(+), 592 deletions(-) diff --git a/dlls/xmllite/tests/Makefile.in b/dlls/xmllite/tests/Makefile.in index 1548dc50193..6a87e6663aa 100644 --- a/dlls/xmllite/tests/Makefile.in +++ b/dlls/xmllite/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = xmllite.dll IMPORTS = xmllite ole32 diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index c4e53a5c40c..d0d2373aaf1 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -50,7 +50,7 @@ static IStream *create_stream_on_data(const void *data, unsigned int size) memcpy(ptr, data, size); hr = CreateStreamOnHGlobal(hglobal, TRUE, &stream); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(stream != NULL, "Expected non-NULL stream\n"); GlobalUnlock(hglobal); @@ -209,7 +209,7 @@ static void _set_input_string(unsigned line, IXmlReader *reader, const char *xml stream = create_stream_on_data(xml, strlen(xml)); hr = IXmlReader_SetInput(reader, (IUnknown *)stream); - ok_(__FILE__,line)(hr == S_OK, "got %08x\n", hr); + ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); IStream_Release(stream); } @@ -222,9 +222,9 @@ static void _read_node(unsigned line, IXmlReader *reader, XmlNodeType expected_t hr = IXmlReader_Read(reader, &type); if (expected_type == XmlNodeType_None) - ok_(__FILE__,line)(hr == S_FALSE, "Read returned %08x, expected S_FALSE\n", hr); + ok_(__FILE__,line)(hr == S_FALSE, "Read returned %#lx, expected S_FALSE.\n", hr); else - ok_(__FILE__,line)(hr == S_OK, "Read returned %08x\n", hr); + ok_(__FILE__,line)(hr == S_OK, "Read returned %#lx.\n", hr); ok_(__FILE__,line)(type == expected_type, "read type %d, expected %d\n", type, expected_type); } @@ -233,7 +233,7 @@ static void _next_attribute(unsigned line, IXmlReader *reader) { HRESULT hr; hr = IXmlReader_MoveToNextAttribute(reader); - ok_(__FILE__,line)(hr == S_OK, "MoveToNextAttribute returned %08x\n", hr); + ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); } #define move_to_element(a) _move_to_element(__LINE__,a) @@ -241,7 +241,7 @@ static void _move_to_element(unsigned line, IXmlReader *reader) { HRESULT hr; hr = IXmlReader_MoveToElement(reader); - ok_(__FILE__,line)(hr == S_OK, "MoveToElement failed: %08x\n", hr); + ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); } static void test_read_state(IXmlReader *reader, XmlReadState expected, @@ -269,11 +269,11 @@ static void test_read_state(IXmlReader *reader, XmlReadState expected, static const WCHAR *_reader_value(unsigned line, IXmlReader *reader, const WCHAR *expect) { const WCHAR *str = (void*)0xdeadbeef; - ULONG len = 0xdeadbeef; + UINT len = 0xdeadbeef; HRESULT hr; hr = IXmlReader_GetValue(reader, &str, &len); - ok_(__FILE__,line)(hr == S_OK, "GetValue returned %08x\n", hr); + ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len); ok_(__FILE__,line)(!lstrcmpW(str, expect), "value = %s\n", wine_dbgstr_w(str)); return str; @@ -283,12 +283,12 @@ static const WCHAR *_reader_value(unsigned line, IXmlReader *reader, const WCHAR static const WCHAR *_reader_name(unsigned line, IXmlReader *reader, const WCHAR *expect) { const WCHAR *str = (void*)0xdeadbeef; - ULONG len = 0xdeadbeef; + UINT len = 0xdeadbeef; HRESULT hr; hr = IXmlReader_GetLocalName(reader, &str, &len); - ok_(__FILE__,line)(hr == S_OK, "GetLocalName returned %08x\n", hr); - ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len); + ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok_(__FILE__,line)(len == lstrlenW(str), "len = %u.\n", len); ok_(__FILE__,line)(!lstrcmpW(str, expect), "name = %s\n", wine_dbgstr_w(str)); return str; } @@ -297,12 +297,12 @@ static const WCHAR *_reader_name(unsigned line, IXmlReader *reader, const WCHAR static const WCHAR *_reader_prefix(unsigned line, IXmlReader *reader, const WCHAR *expect) { const WCHAR *str = (void*)0xdeadbeef; - ULONG len = 0xdeadbeef; + UINT len = 0xdeadbeef; HRESULT hr; hr = IXmlReader_GetPrefix(reader, &str, &len); - ok_(__FILE__,line)(hr == S_OK, "GetPrefix returned %08x\n", hr); - ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len); + ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok_(__FILE__,line)(len == lstrlenW(str), "len = %u.\n", len); ok_(__FILE__,line)(!lstrcmpW(str, expect), "prefix = %s\n", wine_dbgstr_w(str)); return str; } @@ -311,12 +311,12 @@ static const WCHAR *_reader_prefix(unsigned line, IXmlReader *reader, const WCHA static const WCHAR *_reader_namespace(unsigned line, IXmlReader *reader, const WCHAR *expect) { const WCHAR *str = (void*)0xdeadbeef; - ULONG len = 0xdeadbeef; + UINT len = 0xdeadbeef; HRESULT hr; hr = IXmlReader_GetNamespaceUri(reader, &str, &len); - ok_(__FILE__,line)(hr == S_OK, "GetNamespaceUri returned %08x\n", hr); - ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len); + ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok_(__FILE__,line)(len == lstrlenW(str), "len = %u.\n", len); ok_(__FILE__,line)(!lstrcmpW(str, expect), "namespace = %s\n", wine_dbgstr_w(str)); return str; } @@ -325,12 +325,12 @@ static const WCHAR *_reader_namespace(unsigned line, IXmlReader *reader, const W static const WCHAR *_reader_qname(IXmlReader *reader, const WCHAR *expect, unsigned line) { const WCHAR *str = (void*)0xdeadbeef; - ULONG len = 0xdeadbeef; + UINT len = 0xdeadbeef; HRESULT hr; hr = IXmlReader_GetQualifiedName(reader, &str, &len); - ok_(__FILE__,line)(hr == S_OK, "GetQualifiedName returned %08x\n", hr); - ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len); + ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok_(__FILE__,line)(len == lstrlenW(str), "len = %u.\n", len); ok_(__FILE__,line)(!lstrcmpW(str, expect), "name = %s\n", wine_dbgstr_w(str)); return str; } @@ -343,7 +343,7 @@ static void _read_value_char(IXmlReader *reader, WCHAR expected_char, unsigned l HRESULT hr; hr = IXmlReader_ReadValueChunk(reader, &c, 1, &count); - ok_(__FILE__,line)(hr == S_OK, "got %08x\n", hr); + ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok_(__FILE__,line)(count == 1, "got %u\n", c); ok_(__FILE__,line)(c == expected_char, "got %x\n", c); } @@ -528,84 +528,84 @@ static void test_reader_create(void) } hr = CreateXmlReader(&IID_IStream, (void **)&unk, NULL); - ok(hr == E_NOINTERFACE, "got %08x\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); hr = CreateXmlReader(&IID_IUnknown, (void **)&unk, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IUnknown_QueryInterface(unk, &IID_IXmlReader, (void **)&reader); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(unk == (IUnknown *)reader, "unexpected interface\n"); IXmlReader_Release(reader); IUnknown_Release(unk); hr = CreateXmlReader(&IID_IUnknown, (void **)&reader, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IXmlReader_Release(reader); hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_READER_STATE(reader, XmlReadState_Closed); nodetype = XmlNodeType_Element; hr = IXmlReader_GetNodeType(reader, &nodetype); - ok(hr == S_FALSE, "got %08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); ok(nodetype == XmlNodeType_None, "got %d\n", nodetype); /* crashes on XP, 2k3, works on newer versions */ if (0) { hr = IXmlReader_GetNodeType(reader, NULL); - ok(hr == E_INVALIDARG, "got %08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); } resolver = (void*)0xdeadbeef; hr = IXmlReader_GetProperty(reader, XmlReaderProperty_XmlResolver, (LONG_PTR*)&resolver); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(resolver == NULL, "got %p\n", resolver); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_XmlResolver, 0); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_XmlResolver, (LONG_PTR)&testresolver); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); resolver = NULL; hr = IXmlReader_GetProperty(reader, XmlReaderProperty_XmlResolver, (LONG_PTR*)&resolver); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(resolver == &testresolver, "got %p\n", resolver); IXmlResolver_Release(resolver); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_XmlResolver, 0); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); dtd = 2; hr = IXmlReader_GetProperty(reader, XmlReaderProperty_DtdProcessing, (LONG_PTR*)&dtd); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(dtd == DtdProcessing_Prohibit, "got %d\n", dtd); dtd = 2; hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, dtd); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, -1); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* Null input pointer, releases previous input */ hr = IXmlReader_SetInput(reader, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_READER_STATE2(reader, XmlReadState_Initial, XmlReadState_Closed); /* test input interface selection sequence */ hr = testinput_createinstance((void**)&input); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (hr == S_OK) { input_iids.count = 0; hr = IXmlReader_SetInput(reader, input); - ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); ok_iids(&input_iids, setinput_full, setinput_full_old, FALSE); IUnknown_Release(input); } @@ -623,71 +623,71 @@ static void test_readerinput(void) LONG ref; hr = CreateXmlReaderInputWithEncodingName(NULL, NULL, NULL, FALSE, NULL, NULL); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = CreateXmlReaderInputWithEncodingName(NULL, NULL, NULL, FALSE, NULL, &reader_input); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ref = IStream_AddRef(stream); - ok(ref == 2, "Expected 2, got %d\n", ref); + ok(ref == 2, "Expected 2, got %ld.\n", ref); IStream_Release(stream); hr = CreateXmlReaderInputWithEncodingName((IUnknown*)stream, NULL, NULL, FALSE, NULL, &reader_input); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IUnknown_QueryInterface(reader_input, &IID_IStream, (void**)&stream2); - ok(hr == E_NOINTERFACE, "Expected S_OK, got %08x\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); hr = IUnknown_QueryInterface(reader_input, &IID_ISequentialStream, (void**)&stream2); - ok(hr == E_NOINTERFACE, "Expected S_OK, got %08x\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); /* IXmlReaderInput grabs a stream reference */ ref = IStream_AddRef(stream); - ok(ref == 3, "Expected 3, got %d\n", ref); + ok(ref == 3, "Expected 3, got %ld.\n", ref); IStream_Release(stream); /* try ::SetInput() with valid IXmlReaderInput */ hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ref = IUnknown_AddRef(reader_input); - ok(ref == 2, "Expected 2, got %d\n", ref); + ok(ref == 2, "Expected 2, got %ld.\n", ref); IUnknown_Release(reader_input); hr = IXmlReader_SetInput(reader, reader_input); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_READER_STATE(reader, XmlReadState_Initial); nodetype = XmlNodeType_Element; hr = IXmlReader_GetNodeType(reader, &nodetype); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(nodetype == XmlNodeType_None, "got %d\n", nodetype); /* IXmlReader grabs a IXmlReaderInput reference */ ref = IUnknown_AddRef(reader_input); - ok(ref == 3, "Expected 3, got %d\n", ref); + ok(ref == 3, "Expected 3, got %ld.\n", ref); IUnknown_Release(reader_input); ref = IStream_AddRef(stream); - ok(ref == 4, "Expected 4, got %d\n", ref); + ok(ref == 4, "Expected 4, got %ld.\n", ref); IStream_Release(stream); /* reset input and check state */ hr = IXmlReader_SetInput(reader, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_READER_STATE2(reader, XmlReadState_Initial, XmlReadState_Closed); IXmlReader_Release(reader); ref = IStream_AddRef(stream); - ok(ref == 3, "Expected 3, got %d\n", ref); + ok(ref == 3, "Expected 3, got %ld.\n", ref); IStream_Release(stream); ref = IUnknown_AddRef(reader_input); - ok(ref == 2, "Expected 2, got %d\n", ref); + ok(ref == 2, "Expected 2, got %ld.\n", ref); IUnknown_Release(reader_input); /* IID_IXmlReaderInput */ @@ -696,9 +696,9 @@ static void test_readerinput(void) Such query will be used only to check if input is really IXmlReaderInput */ obj = (IUnknown*)0xdeadbeef; hr = IUnknown_QueryInterface(reader_input, &IID_IXmlReaderInput, (void**)&obj); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ref = IUnknown_AddRef(reader_input); - ok(ref == 3, "Expected 3, got %d\n", ref); + ok(ref == 3, "Expected 3, got %ld.\n", ref); IUnknown_Release(reader_input); IUnknown_Release(reader_input); @@ -708,59 +708,59 @@ static void test_readerinput(void) /* test input interface selection sequence */ input = NULL; hr = testinput_createinstance((void**)&input); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); input_iids.count = 0; ref = IUnknown_AddRef(input); - ok(ref == 2, "Expected 2, got %d\n", ref); + ok(ref == 2, "Expected 2, got %ld.\n", ref); IUnknown_Release(input); hr = CreateXmlReaderInputWithEncodingName(input, NULL, NULL, FALSE, NULL, &reader_input); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok_iids(&input_iids, empty_seq, NULL, FALSE); /* IXmlReaderInput stores stream interface as IUnknown */ ref = IUnknown_AddRef(input); - ok(ref == 3, "Expected 3, got %d\n", ref); + ok(ref == 3, "Expected 3, got %ld.\n", ref); IUnknown_Release(input); hr = CreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); input_iids.count = 0; ref = IUnknown_AddRef(reader_input); - ok(ref == 2, "Expected 2, got %d\n", ref); + ok(ref == 2, "Expected 2, got %ld.\n", ref); IUnknown_Release(reader_input); ref = IUnknown_AddRef(input); - ok(ref == 3, "Expected 3, got %d\n", ref); + ok(ref == 3, "Expected 3, got %ld.\n", ref); IUnknown_Release(input); hr = IXmlReader_SetInput(reader, reader_input); - ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); ok_iids(&input_iids, setinput_readerinput, NULL, FALSE); TEST_READER_STATE(reader, XmlReadState_Closed); ref = IUnknown_AddRef(input); - ok(ref == 3, "Expected 3, got %d\n", ref); + ok(ref == 3, "Expected 3, got %ld.\n", ref); IUnknown_Release(input); ref = IUnknown_AddRef(reader_input); ok(ref == 3 || broken(ref == 2) /* versions 1.0.x and 1.1.x - XP, Vista */, - "Expected 3, got %d\n", ref); + "Expected 3, got %ld.\n", ref); IUnknown_Release(reader_input); /* repeat another time, no check or caching here */ input_iids.count = 0; hr = IXmlReader_SetInput(reader, reader_input); - ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); ok_iids(&input_iids, setinput_readerinput, NULL, FALSE); /* another reader */ hr = CreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader2, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* resolving from IXmlReaderInput to IStream/ISequentialStream is done at ::SetInput() level, each time it's called */ input_iids.count = 0; hr = IXmlReader_SetInput(reader2, reader_input); - ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); ok_iids(&input_iids, setinput_readerinput, NULL, FALSE); IXmlReader_Release(reader2); @@ -777,11 +777,11 @@ static void test_reader_state(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* invalid arguments */ hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, NULL); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* attempt to read on closed reader */ TEST_READER_STATE(reader, XmlReadState_Closed); @@ -790,7 +790,7 @@ if (0) { /* newer versions crash here, probably because no input was set */ hr = IXmlReader_Read(reader, &nodetype); - ok(hr == S_FALSE, "got %08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); } set_input_string(reader, "xml"); TEST_READER_STATE(reader, XmlReadState_Initial); @@ -798,7 +798,7 @@ if (0) nodetype = XmlNodeType_Element; hr = IXmlReader_Read(reader, &nodetype); todo_wine - ok(FAILED(hr), "got %08x\n", hr); + ok(FAILED(hr), "Unexpected hr %#lx.\n", hr); ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype); todo_wine @@ -807,7 +807,7 @@ if (0) nodetype = XmlNodeType_Element; hr = IXmlReader_Read(reader, &nodetype); todo_wine - ok(FAILED(hr), "got %08x\n", hr); + ok(FAILED(hr), "Unexpected hr %#lx.\n", hr); ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype); IXmlReader_Release(reader); @@ -850,26 +850,26 @@ static void test_read_xmldeclaration(void) const WCHAR *val; hr = CreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); stream = create_stream_on_data(xmldecl_full, sizeof(xmldecl_full)); hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_GetAttributeCount(reader, &count); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count == 0, "got %d\n", count); /* try to move without attributes */ hr = IXmlReader_MoveToElement(reader); - ok(hr == S_FALSE, "got %08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_FALSE, "got %08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_MoveToFirstAttribute(reader); - ok(hr == S_FALSE, "got %08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); TEST_READER_POSITION(reader, 0, 0); @@ -890,7 +890,7 @@ static void test_read_xmldeclaration(void) type = XmlNodeType_None; hr = IXmlReader_GetNodeType(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Attribute, "got %d\n", type); TEST_READER_POSITION2(reader, 1, 7, ~0u, 55); @@ -899,40 +899,40 @@ static void test_read_xmldeclaration(void) next_attribute(reader); next_attribute(reader); hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_FALSE, "got %08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); type = XmlNodeType_None; hr = IXmlReader_GetNodeType(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Attribute, "got %d\n", type); hr = IXmlReader_MoveToFirstAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_READER_POSITION2(reader, 1, 7, ~0u, 55); hr = IXmlReader_GetAttributeCount(reader, NULL); - ok(hr == E_INVALIDARG, "got %08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_GetAttributeCount(reader, &count); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count == 3, "Expected 3, got %d\n", count); for (i = 0; i < count; i++) { len = 0; hr = IXmlReader_GetLocalName(reader, &val, &len); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(len == lstrlenW(name_val[i].name), "expected %u, got %u\n", lstrlenW(name_val[i].name), len); ok(!lstrcmpW(name_val[i].name, val), "expected %s, got %s\n", wine_dbgstr_w(name_val[i].name), wine_dbgstr_w(val)); len = 0; hr = IXmlReader_GetValue(reader, &val, &len); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(len == lstrlenW(name_val[i].val), "expected %u, got %u\n", lstrlenW(name_val[i].val), len); ok(!lstrcmpW(name_val[i].val, val), "expected %s, got %s\n", wine_dbgstr_w(name_val[i].val), wine_dbgstr_w(val)); hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == ((i < count - 1) ? S_OK : S_FALSE), "got %08x\n", hr); + ok(hr == ((i < count - 1) ? S_OK : S_FALSE), "Unexpected hr %#lx.\n", hr); } TEST_DEPTH(reader, 1); @@ -942,7 +942,7 @@ static void test_read_xmldeclaration(void) type = XmlNodeType_None; hr = IXmlReader_GetNodeType(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_XmlDeclaration, "got %d\n", type); type = XmlNodeType_XmlDeclaration; @@ -950,7 +950,7 @@ static void test_read_xmldeclaration(void) /* newer versions return syntax error here cause document is incomplete, it makes more sense than invalid char error */ todo_wine { - ok(hr == WC_E_SYNTAX || broken(hr == WC_E_XMLCHARACTER), "got 0x%08x\n", hr); + ok(hr == WC_E_SYNTAX || broken(hr == WC_E_XMLCHARACTER), "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_None, "got %d\n", type); } IStream_Release(stream); @@ -959,14 +959,14 @@ todo_wine { stream = create_stream_on_data(xmldecl_short, sizeof(xmldecl_short)); hr = IXmlReader_SetInput(reader, (IUnknown *)stream); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); read_node(reader, XmlNodeType_XmlDeclaration); TEST_READER_POSITION2(reader, 1, 3, ~0u, 21); TEST_READER_STATE(reader, XmlReadState_Interactive); hr = IXmlReader_GetAttributeCount(reader, &count); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count == 1, "expected 1, got %d\n", count); ret = IXmlReader_IsEmptyElement(reader); @@ -982,20 +982,20 @@ todo_wine { type = -1; hr = IXmlReader_GetNodeType(reader, &type); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Attribute, "got %d\n", type); TEST_READER_POSITION2(reader, 1, 7, ~0u, 21); /* try to move from last attribute */ hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_FALSE, "expected S_FALSE, got %08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); read_node(reader, XmlNodeType_Element); TEST_READER_POSITION2(reader, 1, 23, ~0u, 40); TEST_READER_STATE(reader, XmlReadState_Interactive); hr = IXmlReader_GetAttributeCount(reader, &count); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count == 0, "expected 0, got %d\n", count); ret = IXmlReader_IsEmptyElement(reader); @@ -1007,7 +1007,7 @@ todo_wine { type = -1; hr = IXmlReader_Read(reader, &type); todo_wine - ok(hr == WC_E_SYNTAX || hr == WC_E_XMLCHARACTER /* XP */, "expected WC_E_SYNTAX, got %08x\n", hr); + ok(hr == WC_E_SYNTAX || hr == WC_E_XMLCHARACTER /* XP */, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type)); TEST_READER_POSITION(reader, 1, 41); todo_wine @@ -1053,7 +1053,7 @@ static void test_read_comment(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); set_input_string(reader, teststr); @@ -1066,7 +1066,7 @@ static void test_read_comment(void) if (type == XmlNodeType_Text || type == XmlNodeType_Comment) { hr = IXmlReader_GetValue(reader, &value, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(*value != 0, "Expected node value\n"); } i++; @@ -1079,9 +1079,9 @@ static void test_read_comment(void) type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); if (test->hr_broken) - ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr || broken(hr == test->hr_broken), "Unexpected hr %#lx, for %s.\n", hr, test->xml); else - ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml); if (hr == S_OK) { const WCHAR *str; @@ -1092,14 +1092,14 @@ static void test_read_comment(void) str = NULL; hr = IXmlReader_GetLocalName(reader, &str, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); reader_qname(reader, L""); str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); /* value */ @@ -1134,7 +1134,7 @@ static void test_read_pi(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); while (test->xml) { @@ -1145,9 +1145,9 @@ static void test_read_pi(void) type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); if (test->hr_broken) - ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr || broken(hr == test->hr_broken), "Unexpected hr %#lx, for %s.\n", hr, test->xml); else - ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml); if (hr == S_OK) { const WCHAR *str; @@ -1160,7 +1160,7 @@ static void test_read_pi(void) len = 0; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(len == lstrlenW(test->name), "got %u\n", len); ok(!lstrcmpW(str, test->name), "got %s\n", wine_dbgstr_w(str)); @@ -1230,7 +1230,7 @@ static void test_read_full(void) int i; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); set_input_string(reader, test->xml); @@ -1257,10 +1257,10 @@ static void test_read_public_dtd(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, DtdProcessing_Parse); - ok(hr == S_OK, "got 0x%8x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); set_input_string(reader, test_public_dtd); @@ -1268,15 +1268,15 @@ static void test_read_public_dtd(void) count = 0; hr = IXmlReader_GetAttributeCount(reader, &count); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count == 2, "got %d\n", count); hr = IXmlReader_MoveToFirstAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); type = XmlNodeType_None; hr = IXmlReader_GetNodeType(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Attribute, "got %d\n", type); reader_name(reader, L"PUBLIC"); @@ -1286,7 +1286,7 @@ static void test_read_public_dtd(void) type = XmlNodeType_None; hr = IXmlReader_GetNodeType(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Attribute, "got %d\n", type); reader_name(reader, L"SYSTEM"); @@ -1298,7 +1298,7 @@ static void test_read_public_dtd(void) len = 0; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); todo_wine { ok(len == lstrlenW(dtdnameW), "got %u\n", len); ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); @@ -1320,10 +1320,10 @@ static void test_read_system_dtd(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, DtdProcessing_Parse); - ok(hr == S_OK, "got 0x%8x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); set_input_string(reader, test_system_dtd); @@ -1331,15 +1331,15 @@ static void test_read_system_dtd(void) count = 0; hr = IXmlReader_GetAttributeCount(reader, &count); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count == 1, "got %d\n", count); hr = IXmlReader_MoveToFirstAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); type = XmlNodeType_None; hr = IXmlReader_GetNodeType(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Attribute, "got %d\n", type); reader_name(reader, L"SYSTEM"); @@ -1351,7 +1351,7 @@ static void test_read_system_dtd(void) len = 0; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); todo_wine { ok(len == lstrlenW(dtdnameW), "got %u\n", len); ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); @@ -1397,7 +1397,7 @@ static void test_read_element(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); while (test->xml) { @@ -1406,10 +1406,10 @@ static void test_read_element(void) type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); if (test->hr_broken) - ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr || broken(hr == test->hr_broken), "Unexpected hr %#lx, for %s.\n", hr, test->xml); else todo_wine_if(test->hr == NC_E_UNDECLAREDPREFIX) - ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml); if (hr == S_OK) { const WCHAR *str; @@ -1420,7 +1420,7 @@ static void test_read_element(void) len = 0; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(len == lstrlenW(test->name), "got %u\n", len); ok(!lstrcmpW(str, test->name), "got %s\n", wine_dbgstr_w(str)); @@ -1444,7 +1444,7 @@ static void test_read_element(void) depth = 123; hr = IXmlReader_GetDepth(reader, &depth); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(depth == depths[i], "%u: got depth %u, expected %u\n", i, depth, depths[i]); if (type == XmlNodeType_Element || type == XmlNodeType_EndElement) @@ -1453,7 +1453,7 @@ static void test_read_element(void) prefix = NULL; hr = IXmlReader_GetPrefix(reader, &prefix, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(prefix != NULL, "got %p\n", prefix); if (!*prefix) @@ -1462,12 +1462,12 @@ static void test_read_element(void) local = NULL; hr = IXmlReader_GetLocalName(reader, &local, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(local != NULL, "got %p\n", local); qname = NULL; hr = IXmlReader_GetQualifiedName(reader, &qname, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(qname != NULL, "got %p\n", qname); ok(local == qname, "expected same pointer\n"); @@ -1478,7 +1478,7 @@ static void test_read_element(void) { count = 1; hr = IXmlReader_GetAttributeCount(reader, &count); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count == 0, "got %u\n", count); } @@ -1486,7 +1486,7 @@ static void test_read_element(void) { count = 0; hr = IXmlReader_GetAttributeCount(reader, &count); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* moving to attributes increases depth */ if (count) @@ -1496,14 +1496,14 @@ static void test_read_element(void) reader_value(reader, L""); hr = IXmlReader_MoveToFirstAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_GetValue(reader, &value, NULL); ok(*value != 0, "Unexpected value %s\n", wine_dbgstr_w(value)); depth = 123; hr = IXmlReader_GetDepth(reader, &depth); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(depth == depths[i] + 1, "%u: got depth %u, expected %u\n", i, depth, depths[i] + 1); move_to_element(reader); @@ -1511,7 +1511,7 @@ static void test_read_element(void) depth = 123; hr = IXmlReader_GetDepth(reader, &depth); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(depth == depths[i], "%u: got depth %u, expected %u\n", i, depth, depths[i]); } } @@ -1526,7 +1526,7 @@ static void test_read_element(void) type = XmlNodeType_Element; hr = IXmlReader_Read(reader, &type); - ok(hr == WC_E_ELEMENTMATCH, "got %08x\n", hr); + ok(hr == WC_E_ELEMENTMATCH, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_None, "got %d\n", type); TEST_READER_STATE(reader, XmlReadState_Error); @@ -1544,16 +1544,16 @@ static void test_read_pending(void) int c; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_SetInput(reader, (IUnknown*)&teststream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* first read call returns incomplete node, second attempt fails with E_PENDING */ stream_readcall = 0; type = XmlNodeType_Element; hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK || broken(hr == E_PENDING), "got 0x%08x\n", hr); + ok(hr == S_OK || broken(hr == E_PENDING), "Unexpected hr %#lx.\n", hr); /* newer versions are happy when it's enough data to detect node type, older versions keep reading until it fails to read more */ todo_wine @@ -1564,7 +1564,7 @@ static void test_read_pending(void) c = stream_readcall; value = (void*)0xdeadbeef; hr = IXmlReader_GetValue(reader, &value, NULL); - ok(hr == E_PENDING, "got 0x%08x\n", hr); + ok(hr == E_PENDING, "Unexpected hr %#lx.\n", hr); ok(value == NULL || broken(value == (void*)0xdeadbeef) /* Win8 sets it to NULL */, "got %p\n", value); ok(c < stream_readcall || broken(c == stream_readcall), "got %d, expected %d\n", stream_readcall, c+1); @@ -1581,12 +1581,12 @@ static void test_readvaluechunk(void) UINT c; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); set_input_string(reader, ""); hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Comment, "type = %u\n", type); read_value_char(reader, ' '); @@ -1599,13 +1599,13 @@ static void test_readvaluechunk(void) c = 0; b = 0; hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c); - ok(hr == S_FALSE, "got %08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); ok(c == 0, "got %u\n", c); ok(b == 0, "got %x\n", b); c = 0xdeadbeef; hr = IXmlReader_ReadValueChunk(reader, buf, 0, &c); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!c, "c = %u\n", c); reader_value(reader, L"omment1 "); @@ -1615,13 +1615,13 @@ static void test_readvaluechunk(void) c = 0xdeadbeef; hr = IXmlReader_ReadValueChunk(reader, buf, 0, &c); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!c, "c = %u\n", c); c = 0xdeadbeef; memset(buf, 0xcc, sizeof(buf)); hr = IXmlReader_ReadValueChunk(reader, buf, ARRAY_SIZE(buf), &c); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(c == 10, "got %u\n", c); ok(buf[c] == 0xcccc, "buffer overflow\n"); buf[c] = 0; @@ -1630,7 +1630,7 @@ static void test_readvaluechunk(void) c = 0xdeadbeef; memset(buf, 0xcc, sizeof(buf)); hr = IXmlReader_ReadValueChunk(reader, buf, ARRAY_SIZE(buf), &c); - ok(hr == S_FALSE, "got %08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); ok(!c, "got %u\n", c); /* portion read as chunk is skipped from resulting node value */ @@ -1640,7 +1640,7 @@ static void test_readvaluechunk(void) c = 0xdeadbeef; b = 0xffff; hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c); - ok(hr == S_FALSE, "got %08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); ok(c == 0, "got %u\n", c); ok(b == 0xffff, "got %x\n", b); @@ -1666,7 +1666,7 @@ static void test_read_cdata(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); while (test->xml) { @@ -1685,9 +1685,9 @@ static void test_read_cdata(void) } if (test->hr_broken) - ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr || broken(hr == test->hr_broken), "Unexpected hr %#lx, for %s.\n", hr, test->xml); else - ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml); if (hr == S_OK) { const WCHAR *str; @@ -1699,19 +1699,19 @@ static void test_read_cdata(void) str = NULL; hr = IXmlReader_GetLocalName(reader, &str, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); len = 1; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(len == 0, "got %u\n", len); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); /* value */ @@ -1740,7 +1740,7 @@ static void test_read_text(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); while (test->xml) { @@ -1757,7 +1757,7 @@ static void test_read_text(void) type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); } - ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml); if (hr == S_OK) { const WCHAR *str; @@ -1769,19 +1769,19 @@ static void test_read_text(void) str = NULL; hr = IXmlReader_GetLocalName(reader, &str, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); len = 1; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(len == 0, "got %u\n", len); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); /* value */ @@ -1812,7 +1812,7 @@ static void test_isemptyelement(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); while (test->xml) { @@ -1823,7 +1823,7 @@ static void test_isemptyelement(void) type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Element, "got %d\n", type); ret = IXmlReader_IsEmptyElement(reader); @@ -1867,7 +1867,7 @@ static void test_read_attribute(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); while (test->xml) { @@ -1878,9 +1878,9 @@ static void test_read_attribute(void) hr = IXmlReader_Read(reader, NULL); if (test->hr_broken) - ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr || broken(hr == test->hr_broken), "Unexpected hr %#lx, for %s.\n", hr, test->xml); else - ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml); if (hr == S_OK) { const WCHAR *str; @@ -1888,19 +1888,19 @@ static void test_read_attribute(void) type = XmlNodeType_None; hr = IXmlReader_GetNodeType(reader, &type); - ok(hr == S_OK, "Failed to get node type, %#x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Element, "got %d for %s\n", type, test->xml); hr = IXmlReader_MoveToFirstAttribute(reader); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_name(reader, test->name); len = 1; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(len == lstrlenW(test->name), "got %u\n", len); ok(!lstrcmpW(str, test->name), "got %s\n", wine_dbgstr_w(str)); @@ -1921,23 +1921,23 @@ static void test_reader_properties(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); value = 0; hr = IXmlReader_GetProperty(reader, XmlReaderProperty_MaxElementDepth, &value); - ok(hr == S_OK, "GetProperty failed: %08x\n", hr); - ok(value == 256, "Unexpected default max depth value %ld\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == 256, "Unexpected default max depth value %Id.\n", value); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MultiLanguage, 0); - ok(hr == S_OK, "SetProperty failed: %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 0); - ok(hr == S_OK, "SetProperty failed: %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); value = 256; hr = IXmlReader_GetProperty(reader, XmlReaderProperty_MaxElementDepth, &value); - ok(hr == S_OK, "GetProperty failed: %08x\n", hr); - ok(value == 0, "Unexpected max depth value %ld\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == 0, "Unexpected max depth value %Id.\n", value); IXmlReader_Release(reader); } @@ -1960,7 +1960,7 @@ static void test_prefix(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); for (i = 0; i < ARRAY_SIZE(prefix_tests); i++) { XmlNodeType type; @@ -1968,16 +1968,16 @@ static void test_prefix(void) set_input_string(reader, prefix_tests[i].xml); hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "Read() failed, %#x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Element, "Unexpected node type %d.\n", type); reader_prefix(reader, prefix_tests[i].prefix1); hr = IXmlReader_MoveToFirstAttribute(reader); - ok(hr == S_OK, "MoveToFirstAttribute() failed, %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_GetNodeType(reader, &type); - ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Attribute, "Unexpected node type %d.\n", type); reader_prefix(reader, prefix_tests[i].prefix2); @@ -1985,7 +1985,7 @@ static void test_prefix(void) next_attribute(reader); hr = IXmlReader_GetNodeType(reader, &type); - ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Attribute, "Unexpected node type %d.\n", type); reader_prefix(reader, prefix_tests[i].prefix3); @@ -2035,7 +2035,7 @@ static void test_namespaceuri(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); for (i = 0; i < ARRAY_SIZE(uri_tests); i++) { unsigned int j = 0; @@ -2059,13 +2059,13 @@ static void test_namespaceuri(void) local = NULL; length = 0; hr = IXmlReader_GetLocalName(reader, &local, &length); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(local != NULL, "Unexpected NULL local name pointer\n"); qname = NULL; length2 = 0; hr = IXmlReader_GetQualifiedName(reader, &qname, &length2); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(qname != NULL, "Unexpected NULL qualified name pointer\n"); if (type == XmlNodeType_Element || @@ -2100,28 +2100,28 @@ static void test_read_charref(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); set_input_string(reader, testA); hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Element, "Unexpected node type %d\n", type); hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Text, "Unexpected node type %d\n", type); hr = IXmlReader_GetValue(reader, &value, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!lstrcmpW(value, chardataW), "Text value : %s\n", wine_dbgstr_w(value)); hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_EndElement, "Unexpected node type %d\n", type); hr = IXmlReader_Read(reader, &type); - ok(hr == S_FALSE, "got %08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_None, "Unexpected node type %d\n", type); IXmlReader_Release(reader); @@ -2154,7 +2154,7 @@ static void test_encoding_detection(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* there's no way to query detected encoding back, so just verify that document is browsable */ @@ -2164,7 +2164,7 @@ static void test_encoding_detection(void) type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type != XmlNodeType_None, "Unexpected node type %d\n", type); } @@ -2173,11 +2173,11 @@ static void test_encoding_detection(void) stream = create_stream_on_data(encoding_testsW[i].text, lstrlenW(encoding_testsW[i].text) * sizeof(WCHAR)); hr = IXmlReader_SetInput(reader, (IUnknown *)stream); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "%u: got %08x\n", i, hr); + ok(hr == S_OK, "%u: unexpected hr %#lx.\n", i, hr); ok(type != XmlNodeType_None, "%u: unexpected node type %d\n", i, type); IStream_Release(stream); @@ -2193,8 +2193,8 @@ static void test_eof_state(IXmlReader *reader, BOOL eof) ok(IXmlReader_IsEOF(reader) == eof, "Unexpected IsEOF() result\n"); hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, &state); - ok(hr == S_OK, "GetProperty() failed, %#x\n", hr); - ok((state == XmlReadState_EndOfFile) == eof, "Unexpected EndOfFile state %ld\n", state); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok((state == XmlReadState_EndOfFile) == eof, "Unexpected EndOfFile state %Id.\n", state); } static void test_endoffile(void) @@ -2204,7 +2204,7 @@ static void test_endoffile(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); test_eof_state(reader, FALSE); @@ -2214,46 +2214,46 @@ static void test_endoffile(void) type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Element, "Unexpected type %d\n", type); test_eof_state(reader, FALSE); type = XmlNodeType_Element; hr = IXmlReader_Read(reader, &type); - ok(hr == S_FALSE, "got %#x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_None, "Unexpected type %d\n", type); test_eof_state(reader, TRUE); hr = IXmlReader_SetInput(reader, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); test_eof_state(reader, FALSE); IXmlReader_Release(reader); hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); set_input_string(reader, "<a/>text"); type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Element, "Unexpected type %d\n", type); test_eof_state(reader, FALSE); type = XmlNodeType_Element; hr = IXmlReader_Read(reader, &type); - ok(hr == WC_E_SYNTAX, "got %#x\n", hr); + ok(hr == WC_E_SYNTAX, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_None, "Unexpected type %d\n", type); test_eof_state(reader, FALSE); hr = IXmlReader_SetInput(reader, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IXmlReader_Release(reader); } @@ -2274,37 +2274,37 @@ static void test_max_element_depth(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); set_input_string(reader, xml); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 2); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_DEPTH(reader, 0); hr = IXmlReader_Read(reader, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_DEPTH(reader, 0); hr = IXmlReader_Read(reader, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_DEPTH(reader, 1); TEST_READER_STATE(reader, XmlReadState_Interactive); hr = IXmlReader_Read(reader, NULL); - ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr); + ok(hr == SC_E_MAXELEMENTDEPTH, "Unexpected hr %#lx.\n", hr); TEST_DEPTH2(reader, 0, 2); TEST_READER_STATE(reader, XmlReadState_Error); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 10); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_Read(reader, NULL); - ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr); + ok(hr == SC_E_MAXELEMENTDEPTH, "Unexpected hr %#lx.\n", hr); TEST_DEPTH2(reader, 0, 2); TEST_READER_STATE(reader, XmlReadState_Error); @@ -2313,34 +2313,34 @@ static void test_max_element_depth(void) set_input_string(reader, xml); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 2); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_DEPTH(reader, 0); hr = IXmlReader_Read(reader, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_DEPTH(reader, 0); hr = IXmlReader_Read(reader, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_DEPTH(reader, 1); hr = IXmlReader_MoveToFirstAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_DEPTH(reader, 2); TEST_READER_STATE(reader, XmlReadState_Interactive); nodetype = 123; hr = IXmlReader_Read(reader, &nodetype); - ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr); + ok(hr == SC_E_MAXELEMENTDEPTH, "Unexpected hr %#lx.\n", hr); ok(nodetype == XmlNodeType_None, "got node type %d\n", nodetype); nodetype = 123; hr = IXmlReader_Read(reader, &nodetype); - ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr); + ok(hr == SC_E_MAXELEMENTDEPTH, "Unexpected hr %#lx.\n", hr); ok(nodetype == XmlNodeType_None, "got node type %d\n", nodetype); TEST_DEPTH2(reader, 0, 2); @@ -2350,7 +2350,7 @@ static void test_max_element_depth(void) set_input_string(reader, xml); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 0); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); count = 0; while (IXmlReader_Read(reader, NULL) == S_OK) @@ -2370,25 +2370,25 @@ static void test_reader_position(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_READER_STATE(reader, XmlReadState_Closed); /* position methods with Null args */ hr = IXmlReader_GetLineNumber(reader, NULL); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_GetLinePosition(reader, NULL); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); position = 123; hr = IXmlReader_GetLinePosition(reader, &position); - ok(hr == S_FALSE, "got %#x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); ok(position == 0, "got %u\n", position); position = 123; hr = IXmlReader_GetLineNumber(reader, &position); - ok(hr == S_FALSE, "got %#x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); ok(position == 0, "got %u\n", position); set_input_string(reader, xml); @@ -2396,7 +2396,7 @@ static void test_reader_position(void) TEST_READER_STATE(reader, XmlReadState_Initial); TEST_READER_POSITION(reader, 0, 0); hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Element, "got type %d\n", type); TEST_READER_POSITION2(reader, 1, 2, ~0u, 34); @@ -2410,17 +2410,17 @@ static void test_reader_position(void) TEST_READER_POSITION2(reader, 1, 2, ~0u, 34); hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Whitespace, "got type %d\n", type); TEST_READER_POSITION2(reader, 1, 35, 2, 6); hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_EndElement, "got type %d\n", type); TEST_READER_POSITION2(reader, 2, 3, 2, 6); hr = IXmlReader_SetInput(reader, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_READER_STATE2(reader, XmlReadState_Initial, XmlReadState_Closed); TEST_READER_POSITION(reader, 0, 0); @@ -2434,7 +2434,7 @@ static void test_string_pointers(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); set_input_string(reader, "<elem xmlns=\"myns\">myns<elem2 /></elem>"); @@ -2565,67 +2565,67 @@ static void test_attribute_by_name(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); - ok(hr == S_OK, "Failed to create reader, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); set_input_string(reader, xml); hr = IXmlReader_MoveToAttributeByName(reader, NULL, NULL); - ok(hr == E_INVALIDARG || broken(hr == S_FALSE) /* WinXP */, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG || broken(hr == S_FALSE) /* WinXP */, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_MoveToAttributeByName(reader, emptyW, NULL); - ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); read_node(reader, XmlNodeType_Element); hr = IXmlReader_MoveToAttributeByName(reader, emptyW, NULL); - ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); read_node(reader, XmlNodeType_Element); hr = IXmlReader_MoveToAttributeByName(reader, NULL, NULL); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_MoveToAttributeByName(reader, NULL, xmlns_uriW); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_MoveToAttributeByName(reader, emptyW, xmlns_uriW); - ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_MoveToAttributeByName(reader, xmlnsW, NULL); - ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_MoveToAttributeByName(reader, xmlnsW, xmlns_uriW); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"myns"); hr = IXmlReader_MoveToAttributeByName(reader, aW, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"value a"); hr = IXmlReader_MoveToAttributeByName(reader, bW, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"value b"); hr = IXmlReader_MoveToAttributeByName(reader, aW, mynsW); - ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_MoveToAttributeByName(reader, nsW, NULL); - ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_MoveToAttributeByName(reader, nsW, xmlns_uriW); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"ns uri"); hr = IXmlReader_MoveToAttributeByName(reader, bW, emptyW); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"value b"); hr = IXmlReader_MoveToAttributeByName(reader, cW, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"value c2"); hr = IXmlReader_MoveToAttributeByName(reader, cW, nsuriW); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"value c"); IXmlReader_Release(reader); diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index c69aa42598d..8d096b0d632 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -41,7 +41,7 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) ULONG refcount; IUnknown_AddRef(obj); refcount = IUnknown_Release(obj); - ok_(__FILE__, line)(refcount == ref, "expected refcount %d, got %d\n", ref, refcount); + ok_(__FILE__, line)(refcount == ref, "expected refcount %lu, got %lu.\n", ref, refcount); } static void check_output_raw(IStream *stream, const void *expected, SIZE_T size, int line) @@ -52,10 +52,10 @@ static void check_output_raw(IStream *stream, const void *expected, SIZE_T size, WCHAR *ptr; hr = GetHGlobalFromStream(stream, &hglobal); - ok_(__FILE__, line)(hr == S_OK, "Failed to get the stream handle, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get the stream handle, hr %#lx.\n", hr); content_size = GlobalSize(hglobal); - ok_(__FILE__, line)(size == content_size, "Unexpected test output size %ld.\n", content_size); + ok_(__FILE__, line)(size == content_size, "Unexpected test output size %Id.\n", content_size); ptr = GlobalLock(hglobal); if (size <= content_size) ok_(__FILE__, line)(!memcmp(expected, ptr, size), "Unexpected output content.\n"); @@ -73,7 +73,7 @@ static void check_output(IStream *stream, const char *expected, BOOL todo, int l char *ptr; hr = GetHGlobalFromStream(stream, &hglobal); - ok_(__FILE__, line)(hr == S_OK, "got 0x%08x\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); size = GlobalSize(hglobal); ptr = GlobalLock(hglobal); @@ -111,7 +111,7 @@ static void writer_set_property(IXmlWriter *writer, XmlWriterProperty property) HRESULT hr; hr = IXmlWriter_SetProperty(writer, property, TRUE); - ok(hr == S_OK, "Failed to set writer property, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set writer property, hr %#lx.\n", hr); } /* used to test all Write* methods for consistent error state */ @@ -123,67 +123,67 @@ static void check_writer_state(IXmlWriter *writer, HRESULT exp_hr) /* FIXME: add WriteAttributes */ hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, aW); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteCData(writer, aW); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteCharEntity(writer, aW[0]); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteChars(writer, aW, 1); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteComment(writer, aW); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteDocType(writer, aW, NULL, NULL, NULL); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, aW); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteEndElement(writer); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteEntityRef(writer, aW); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteFullEndElement(writer); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteName(writer, aW); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteNmToken(writer, aW); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); /* FIXME: add WriteNode */ /* FIXME: add WriteNodeShallow */ hr = IXmlWriter_WriteProcessingInstruction(writer, aW, aW); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteQualifiedName(writer, aW, NULL); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteRaw(writer, aW); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteRawChars(writer, aW, 1); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteString(writer, aW); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr); /* FIXME: add WriteSurrogateCharEntity */ /* FIXME: add WriteWhitespace */ @@ -195,10 +195,10 @@ static IStream *writer_set_output(IXmlWriter *writer) HRESULT hr; hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); return stream; } @@ -295,39 +295,39 @@ static void test_writer_create(void) } hr = CreateXmlWriter(&IID_IStream, (void **)&unk, NULL); - ok(hr == E_NOINTERFACE, "got %08x\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); hr = CreateXmlWriter(&IID_IUnknown, (void **)&unk, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IUnknown_QueryInterface(unk, &IID_IXmlWriter, (void **)&writer); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(unk == (IUnknown *)writer, "unexpected interface pointer\n"); IUnknown_Release(unk); IXmlWriter_Release(writer); hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* check default properties values */ value = 0; hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_ByteOrderMark, &value); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(value == TRUE, "got %ld\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == TRUE, "got %Id.\n", value); value = TRUE; hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_Indent, &value); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(value == FALSE, "got %ld\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == FALSE, "got %Id.\n", value); value = TRUE; hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, &value); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(value == FALSE, "got %ld\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == FALSE, "got %Id.\n", value); value = XmlConformanceLevel_Auto; hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_ConformanceLevel, &value); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(value == XmlConformanceLevel_Document, "got %ld\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == XmlConformanceLevel_Document, "got %Id.\n", value); IXmlWriter_Release(writer); } @@ -337,78 +337,78 @@ static void test_invalid_output_encoding(IXmlWriter *writer, IUnknown *output) HRESULT hr; hr = IXmlWriter_SetOutput(writer, output); - ok(hr == S_OK, "Failed to set output, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set output, hr %#lx.\n", hr); /* TODO: WriteAttributes */ hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, aW); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteCData(writer, aW); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteCharEntity(writer, 0x100); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteChars(writer, aW, 1); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteComment(writer, aW); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteDocType(writer, aW, NULL, NULL, NULL); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, NULL); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndElement(writer); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEntityRef(writer, aW); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteFullEndElement(writer); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteName(writer, aW); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteNmToken(writer, aW); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); /* TODO: WriteNode */ /* TODO: WriteNodeShallow */ hr = IXmlWriter_WriteProcessingInstruction(writer, aW, aW); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteQualifiedName(writer, aW, NULL); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteRaw(writer, aW); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteRawChars(writer, aW, 1); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteString(writer, aW); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); /* TODO: WriteSurrogateCharEntity */ - /* ًُُTODO: WriteWhitespace */ + /* TODO: WriteWhitespace */ hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); } static void test_writeroutput(void) @@ -425,15 +425,15 @@ static void test_writeroutput(void) output = NULL; hr = CreateXmlWriterOutputWithEncodingName(&testoutput, NULL, NULL, &output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); EXPECT_REF(output, 1); IUnknown_Release(output); hr = CreateXmlWriterOutputWithEncodingName(&testoutput, NULL, utf16W, &output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); unk = NULL; hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&unk); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); todo_wine ok(unk != NULL && unk != output, "got %p, output %p\n", unk, output); EXPECT_REF(output, 2); @@ -444,14 +444,14 @@ static void test_writeroutput(void) output = NULL; hr = CreateXmlWriterOutputWithEncodingCodePage(&testoutput, NULL, ~0u, &output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IUnknown_Release(output); hr = CreateXmlWriterOutputWithEncodingCodePage(&testoutput, NULL, CP_UTF8, &output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); unk = NULL; hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&unk); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(unk != NULL, "got %p\n", unk); /* releasing 'unk' crashes on native */ IUnknown_Release(output); @@ -460,27 +460,27 @@ static void test_writeroutput(void) /* create with us-ascii */ output = NULL; hr = CreateXmlWriterOutputWithEncodingName(&testoutput, NULL, usasciiW, &output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IUnknown_Release(output); /* Output with codepage 1200. */ hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL); - ok(hr == S_OK, "Failed to create writer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create writer, hr %#lx.\n", hr); hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "Failed to create stream, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create stream, hr %#lx.\n", hr); hr = CreateXmlWriterOutputWithEncodingCodePage((IUnknown *)stream, NULL, 1200, &output); - ok(hr == S_OK, "Failed to create writer output, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create writer output, hr %#lx.\n", hr); hr = IXmlWriter_SetOutput(writer, output); - ok(hr == S_OK, "Failed to set writer output, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set writer output, hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == S_OK, "Write failed, hr %#x.\n", hr); + ok(hr == S_OK, "Write failed, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); CHECK_OUTPUT_RAW(stream, utf16_outputW, sizeof(utf16_outputW)); @@ -489,11 +489,11 @@ static void test_writeroutput(void) /* Create output with meaningless code page value. */ hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "Failed to create stream, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create stream, hr %#lx.\n", hr); output = NULL; hr = CreateXmlWriterOutputWithEncodingCodePage((IUnknown *)stream, NULL, ~0u, &output); - ok(hr == S_OK, "Failed to create writer output, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create writer output, hr %#lx.\n", hr); test_invalid_output_encoding(writer, output); CHECK_OUTPUT(stream, ""); @@ -503,11 +503,11 @@ static void test_writeroutput(void) /* Same, with invalid encoding name. */ hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); output = NULL; hr = CreateXmlWriterOutputWithEncodingName((IUnknown *)stream, NULL, dummyW, &output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); test_invalid_output_encoding(writer, output); CHECK_OUTPUT(stream, ""); @@ -532,55 +532,55 @@ static void test_writestartdocument(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* output not set */ hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); - ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); /* nothing written yet */ hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, fullprolog); /* one more time */ hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); IStream_Release(stream); /* now add PI manually, and try to start a document */ stream = writer_set_output(writer); hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); /* another attempt to add 'xml' PI */ hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, prologversion); @@ -589,23 +589,23 @@ static void test_writestartdocument(void) /* create with us-ascii */ hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); output = NULL; hr = CreateXmlWriterOutputWithEncodingName((IUnknown *)stream, NULL, usasciiW, &output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_SetOutput(writer, output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, prologversion2); @@ -620,28 +620,28 @@ static void test_flush(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_SetOutput(writer, (IUnknown*)&teststream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); g_write_len = 0; hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(g_write_len > 0, "got %d\n", g_write_len); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(g_write_len > 0, "Unexpected length %lu.\n", g_write_len); g_write_len = 1; hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(g_write_len == 0, "got %d\n", g_write_len); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(g_write_len == 0, "Unexpected length %lu.\n", g_write_len); /* Release() flushes too */ g_write_len = 1; IXmlWriter_Release(writer); - ok(g_write_len == 0, "got %d\n", g_write_len); + ok(g_write_len == 0, "Unexpected length %lu.\n", g_write_len); } static void test_omitxmldeclaration(void) @@ -656,20 +656,20 @@ static void test_omitxmldeclaration(void) char *ptr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = GetHGlobalFromStream(stream, &hglobal); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ptr = GlobalLock(hglobal); ok(!ptr, "got %p\n", ptr); @@ -677,7 +677,7 @@ static void test_omitxmldeclaration(void) /* one more time */ hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); IStream_Release(stream); @@ -685,35 +685,35 @@ static void test_omitxmldeclaration(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, prologversion); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, prologversion); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, prologversion); /* another attempt to add 'xml' PI */ hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IStream_Release(stream); IXmlWriter_Release(writer); @@ -735,25 +735,25 @@ static void test_bom(void) HRESULT hr; hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_SetOutput(writer, output); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* BOM is on by default */ hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT_RAW(stream, bomW, sizeof(bomW)); @@ -762,19 +762,19 @@ static void test_bom(void) /* start with PI */ hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_SetOutput(writer, output); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT_RAW(stream, piW, sizeof(piW)); @@ -783,19 +783,19 @@ static void test_bom(void) /* start with element */ hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_SetOutput(writer, output); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT_RAW(stream, aopenW, sizeof(aopenW)); @@ -804,24 +804,24 @@ static void test_bom(void) /* WriteElementString */ hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_SetOutput(writer, output); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); writer_set_property(writer, XmlWriterProperty_Indent); hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = GetHGlobalFromStream(stream, &hglobal); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT_RAW(stream, afullW, sizeof(afullW)); @@ -922,65 +922,65 @@ static void test_WriteStartElement(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_start_element(writer, NULL, "a", NULL); - ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); hr = write_start_element(writer, NULL, "a", NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a"); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, NULL, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteProcessingInstruction(writer, aW, aW); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); IStream_Release(stream); IXmlWriter_Release(writer); /* WriteElementString */ hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_element_string(writer, NULL, "b", NULL, "value"); - ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); hr = write_start_element(writer, "prefix", "a", "uri"); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = write_element_string(writer, NULL, "b", NULL, "value"); - ok(hr == S_OK, "Failed to write element string, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write element string, hr %#lx.\n", hr); hr = write_element_string(writer, NULL, "c", NULL, NULL); - ok(hr == S_OK, "Failed to write element string, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write element string, hr %#lx.\n", hr); hr = write_start_element(writer, NULL, "d", "uri"); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = write_start_element(writer, "", "e", "uri"); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = write_start_element(writer, "prefix2", "f", "uri"); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<prefix:a xmlns:prefix=\"uri\">" @@ -1000,24 +1000,24 @@ static void test_WriteStartElement(void) writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "Failed to start document, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start document, hr %#lx.\n", hr); hr = write_start_element(writer, start_element_tests[i].prefix, start_element_tests[i].local, start_element_tests[i].uri); - ok(hr == start_element_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); + ok(hr == start_element_tests[i].hr, "%u: unexpected hr %#lx.\n", i, hr); if (SUCCEEDED(start_element_tests[i].hr)) { hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); check_output(stream, start_element_tests[i].output_partial, start_element_tests[i].todo_partial, __LINE__); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == S_OK, "Failed to end document, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to end document, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); check_output(stream, start_element_tests[i].output, start_element_tests[i].todo, __LINE__); } @@ -1072,54 +1072,54 @@ static void test_WriteElementString(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_element_string(writer, NULL, "b", NULL, "value"); - ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); hr = write_start_element(writer, NULL, "a", NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_element_string(writer, NULL, "b", NULL, "value"); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_element_string(writer, NULL, "b", NULL, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_element_string(writer, "prefix", "b", "uri", NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_start_element(writer, "prefix", "c", "uri"); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = write_element_string(writer, "prefix", "d", NULL, NULL); - ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr); hr = write_element_string(writer, "prefix2", "d", "uri", NULL); - ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr); hr = write_element_string(writer, NULL, "e", "uri", NULL); - ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr); hr = write_element_string(writer, "prefix", "f", "uri2", NULL); - ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr); hr = write_element_string(writer, NULL, "g", "uri3", NULL); - ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr); hr = write_element_string(writer, "prefix", "h", NULL, NULL); - ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr); hr = write_element_string(writer, "prefix_i", "i", NULL, NULL); - ok(hr == WR_E_NSPREFIXWITHEMPTYNSURI, "Failed to write element, hr %#x.\n", hr); + ok(hr == WR_E_NSPREFIXWITHEMPTYNSURI, "Failed to write element, hr %#lx.\n", hr); hr = write_element_string(writer, "", "j", "uri", NULL); - ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>value" @@ -1142,24 +1142,24 @@ static void test_WriteElementString(void) writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "Failed to start document, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start document, hr %#lx.\n", hr); hr = write_element_string(writer, element_string_tests[i].prefix, element_string_tests[i].local, element_string_tests[i].uri, element_string_tests[i].value); - ok(hr == element_string_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); + ok(hr == element_string_tests[i].hr, "%u: unexpected hr %#lx.\n", i, hr); if (SUCCEEDED(element_string_tests[i].hr)) { hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); check_output(stream, element_string_tests[i].output, element_string_tests[i].todo, __LINE__); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == S_OK, "Failed to end document, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to end document, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); check_output(stream, element_string_tests[i].output, element_string_tests[i].todo, __LINE__); } @@ -1177,24 +1177,24 @@ static void test_WriteEndElement(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); hr = write_start_element(writer, NULL, "a", NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_start_element(writer, NULL, "b", NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndElement(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndElement(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a></a>"); @@ -1213,47 +1213,47 @@ static void test_writeenddocument(void) char *ptr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); /* WriteEndDocument resets it to initial state */ hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = GetHGlobalFromStream(stream, &hglobal); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ptr = GlobalLock(hglobal); ok(ptr == NULL, "got %p\n", ptr); /* we still need to flush manually, WriteEndDocument doesn't do that */ hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a></a>"); @@ -1271,35 +1271,35 @@ static void test_WriteComment(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteComment(writer, aW); - ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteComment(writer, aW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteComment(writer, aW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteComment(writer, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteComment(writer, closeW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, ""); @@ -1318,32 +1318,32 @@ static void test_WriteCData(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteCData(writer, aW); - ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteCData(writer, aW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteCData(writer, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteCData(writer, closeW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteCData(writer, close2W); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "" @@ -1367,48 +1367,48 @@ static void test_WriteRaw(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteRaw(writer, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteRaw(writer, rawW); - ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); hr = IXmlWriter_WriteRaw(writer, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteRaw(writer, rawW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteRaw(writer, rawW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteComment(writer, rawW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteRaw(writer, rawW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, aW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteComment(writer, rawW); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteRaw(writer, rawW); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>a<:a<:a<:<a>a</a>"); @@ -1424,7 +1424,7 @@ static void test_writer_state(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* initial state */ check_writer_state(writer, E_UNEXPECTED); @@ -1433,7 +1433,7 @@ static void test_writer_state(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteEndElement(writer); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); IStream_Release(stream); @@ -1442,7 +1442,7 @@ static void test_writer_state(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, aW); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); IStream_Release(stream); @@ -1451,7 +1451,7 @@ static void test_writer_state(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); IStream_Release(stream); @@ -1460,7 +1460,7 @@ static void test_writer_state(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteFullEndElement(writer); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); IStream_Release(stream); @@ -1469,7 +1469,7 @@ static void test_writer_state(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteCData(writer, aW); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); IStream_Release(stream); @@ -1478,7 +1478,7 @@ static void test_writer_state(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteName(writer, aW); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); IStream_Release(stream); @@ -1487,7 +1487,7 @@ static void test_writer_state(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteNmToken(writer, aW); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); IStream_Release(stream); @@ -1496,7 +1496,7 @@ static void test_writer_state(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteString(writer, aW); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); IStream_Release(stream); @@ -1514,7 +1514,7 @@ static void test_indentation(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); @@ -1522,22 +1522,22 @@ static void test_indentation(void) writer_set_property(writer, XmlWriterProperty_Indent); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteComment(writer, commentW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" @@ -1551,19 +1551,19 @@ static void test_indentation(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndElement(writer); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" @@ -1678,7 +1678,7 @@ static void test_WriteAttributeString(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); @@ -1687,26 +1687,26 @@ static void test_WriteAttributeString(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "Failed to start document, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start document, hr %#lx.\n", hr); hr = write_start_element(writer, NULL, "e", NULL); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = write_attribute_string(writer, attribute_tests[i].prefix, attribute_tests[i].local, attribute_tests[i].uri, attribute_tests[i].value); todo_wine_if(attribute_tests[i].todo_hr) - ok(hr == attribute_tests[i].hr, "%u: unexpected hr %#x, expected %#x.\n", i, hr, attribute_tests[i].hr); + ok(hr == attribute_tests[i].hr, "%u: unexpected hr %#lx, expected %#lx.\n", i, hr, attribute_tests[i].hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); check_output(stream, attribute_tests[i].output_partial, attribute_tests[i].todo_partial, __LINE__); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == S_OK, "Failed to end document, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to end document, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); check_output(stream, attribute_tests[i].output, attribute_tests[i].todo, __LINE__); IStream_Release(stream); @@ -1716,41 +1716,41 @@ static void test_WriteAttributeString(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_start_element(writer, "p", "a", "outeruri"); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_attribute_string(writer, "prefix", "local", "uri", "b"); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_attribute_string(writer, NULL, "a", NULL, "b"); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_attribute_string(writer, "xmlns", "prefix", NULL, "uri"); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_attribute_string(writer, "p", "attr", NULL, "value"); - ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write attribute string, hr %#lx.\n", hr); hr = write_attribute_string(writer, "prefix", "local", NULL, "b"); todo_wine - ok(hr == WR_E_DUPLICATEATTRIBUTE, "got 0x%08x\n", hr); + ok(hr == WR_E_DUPLICATEATTRIBUTE, "Unexpected hr %#lx.\n", hr); hr = write_start_element(writer, NULL, "b", NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_attribute_string(writer, NULL, "attr2", "outeruri", "value"); - ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write attribute string, hr %#lx.\n", hr); hr = write_attribute_string(writer, "pr", "attr3", "outeruri", "value"); - ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write attribute string, hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT_TODO(stream, "<p:a prefix:local=\"b\" a=\"b\" xmlns:prefix=\"uri\" p:attr=\"value\" xmlns:p=\"outeruri\">" @@ -1763,22 +1763,22 @@ static void test_WriteAttributeString(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_start_element(writer, NULL, "e", NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_attribute_string(writer, "xmlns", "prefix", NULL, "uri"); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_attribute_string(writer, "prefix", "attr", NULL, "value"); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<e xmlns:prefix=\"uri\" prefix:attr=\"value\" />"); @@ -1796,7 +1796,7 @@ static void test_WriteFullEndElement(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* standalone element */ stream = writer_set_output(writer); @@ -1805,19 +1805,19 @@ static void test_WriteFullEndElement(void) writer_set_property(writer, XmlWriterProperty_Indent); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteFullEndElement(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a></a>"); @@ -1830,22 +1830,22 @@ static void test_WriteFullEndElement(void) writer_set_property(writer, XmlWriterProperty_Indent); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteFullEndElement(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" @@ -1864,7 +1864,7 @@ static void test_WriteCharEntity(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* without indentation */ stream = writer_set_output(writer); @@ -1872,22 +1872,22 @@ static void test_WriteCharEntity(void) writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteCharEntity(writer, 0x100); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>Ā<a /></a>"); @@ -1903,39 +1903,39 @@ static void test_WriteString(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = write_string(writer, "a"); - ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); hr = write_string(writer, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_string(writer, ""); - ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); hr = write_start_element(writer, NULL, "b", NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_string(writer, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_string(writer, ""); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_string(writer, "a"); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* WriteString automatically escapes markup characters */ hr = write_string(writer, "<&\">="); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "a<&\">="); @@ -1944,22 +1944,22 @@ static void test_WriteString(void) stream = writer_set_output(writer); hr = write_start_element(writer, NULL, "b", NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_string(writer, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<b"); hr = write_string(writer, ""); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, ""); @@ -1969,43 +1969,43 @@ static void test_WriteString(void) /* With indentation */ hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL); - ok(hr == S_OK, "Failed to create a writer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create a writer, hr %#lx.\n", hr); stream = writer_set_output(writer); writer_set_property(writer, XmlWriterProperty_Indent); hr = write_start_element(writer, NULL, "a", NULL); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = write_start_element(writer, NULL, "b", NULL); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = write_string(writer, "text"); - ok(hr == S_OK, "Failed to write a string, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write a string, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" " text"); hr = IXmlWriter_WriteFullEndElement(writer); - ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" " text"); hr = IXmlWriter_WriteFullEndElement(writer); - ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" @@ -2017,29 +2017,29 @@ static void test_WriteString(void) stream = writer_set_output(writer); hr = write_start_element(writer, NULL, "a", NULL); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = write_start_element(writer, NULL, "b", NULL); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = IXmlWriter_WriteEndElement(writer); - ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" " "); hr = write_start_element(writer, NULL, "c", NULL); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = write_attribute_string(writer, NULL, "attr", NULL, "value"); - ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write attribute string, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" @@ -2047,10 +2047,10 @@ static void test_WriteString(void) " <c attr=\"value\""); hr = write_string(writer, "text"); - ok(hr == S_OK, "Failed to write a string, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write a string, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" @@ -2058,10 +2058,10 @@ static void test_WriteString(void) " <c attr=\"value\">text"); hr = IXmlWriter_WriteEndElement(writer); - ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" @@ -2069,16 +2069,16 @@ static void test_WriteString(void) " <c attr=\"value\">text</c>"); hr = write_start_element(writer, NULL, "d", NULL); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = write_string(writer, ""); - ok(hr == S_OK, "Failed to write a string, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write a string, hr %#lx.\n", hr); hr = IXmlWriter_WriteEndElement(writer); - ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" @@ -2087,10 +2087,10 @@ static void test_WriteString(void) " <d></d>"); hr = IXmlWriter_WriteEndElement(writer); - ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" @@ -2163,23 +2163,23 @@ static void test_WriteDocType(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL); - ok(hr == S_OK, "Failed to create writer instance, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create writer instance, hr %#lx.\n", hr); stream = writer_set_output(writer); hr = IXmlWriter_WriteDocType(writer, NULL, NULL, NULL, NULL); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteDocType(writer, emptyW, NULL, NULL, NULL); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* Name validation. */ hr = IXmlWriter_WriteDocType(writer, nameW, NULL, NULL, NULL); - ok(hr == WC_E_NAMECHARACTER, "Unexpected hr %#x.\n", hr); + ok(hr == WC_E_NAMECHARACTER, "Unexpected hr %#lx.\n", hr); /* Pubid validation. */ hr = IXmlWriter_WriteDocType(writer, aW, pubidW, NULL, NULL); - ok(hr == WC_E_PUBLICID, "Unexpected hr %#x.\n", hr); + ok(hr == WC_E_PUBLICID, "Unexpected hr %#lx.\n", hr); IStream_Release(stream); @@ -2189,16 +2189,16 @@ static void test_WriteDocType(void) hr = write_doctype(writer, doctype_tests[i].name, doctype_tests[i].pubid, doctype_tests[i].sysid, doctype_tests[i].subset); - ok(hr == S_OK, "%u: failed to write doctype, hr %#x.\n", i, hr); + ok(hr == S_OK, "%u: failed to write doctype, hr %#lx.\n", i, hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); CHECK_OUTPUT(stream, doctype_tests[i].output); hr = write_doctype(writer, doctype_tests[i].name, doctype_tests[i].pubid, doctype_tests[i].sysid, doctype_tests[i].subset); - ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#x.\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); IStream_Release(stream); } -- 2.34.1

1 0

[PATCH] xmllite/tests: Build without WINE_NO_LONG_TYPES.
by Nikolay Sivov Feb. 7, 2022

Feb. 7, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/tests/Makefile.in | 1 - dlls/xmllite/tests/reader.c | 488 +++++++++++------------ dlls/xmllite/tests/writer.c | 694 ++++++++++++++++----------------- 3 files changed, 591 insertions(+), 592 deletions(-) diff --git a/dlls/xmllite/tests/Makefile.in b/dlls/xmllite/tests/Makefile.in index 1548dc50193..6a87e6663aa 100644 --- a/dlls/xmllite/tests/Makefile.in +++ b/dlls/xmllite/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = xmllite.dll IMPORTS = xmllite ole32 diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index c4e53a5c40c..d0d2373aaf1 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -50,7 +50,7 @@ static IStream *create_stream_on_data(const void *data, unsigned int size) memcpy(ptr, data, size); hr = CreateStreamOnHGlobal(hglobal, TRUE, &stream); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(stream != NULL, "Expected non-NULL stream\n"); GlobalUnlock(hglobal); @@ -209,7 +209,7 @@ static void _set_input_string(unsigned line, IXmlReader *reader, const char *xml stream = create_stream_on_data(xml, strlen(xml)); hr = IXmlReader_SetInput(reader, (IUnknown *)stream); - ok_(__FILE__,line)(hr == S_OK, "got %08x\n", hr); + ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); IStream_Release(stream); } @@ -222,9 +222,9 @@ static void _read_node(unsigned line, IXmlReader *reader, XmlNodeType expected_t hr = IXmlReader_Read(reader, &type); if (expected_type == XmlNodeType_None) - ok_(__FILE__,line)(hr == S_FALSE, "Read returned %08x, expected S_FALSE\n", hr); + ok_(__FILE__,line)(hr == S_FALSE, "Read returned %#lx, expected S_FALSE.\n", hr); else - ok_(__FILE__,line)(hr == S_OK, "Read returned %08x\n", hr); + ok_(__FILE__,line)(hr == S_OK, "Read returned %#lx.\n", hr); ok_(__FILE__,line)(type == expected_type, "read type %d, expected %d\n", type, expected_type); } @@ -233,7 +233,7 @@ static void _next_attribute(unsigned line, IXmlReader *reader) { HRESULT hr; hr = IXmlReader_MoveToNextAttribute(reader); - ok_(__FILE__,line)(hr == S_OK, "MoveToNextAttribute returned %08x\n", hr); + ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); } #define move_to_element(a) _move_to_element(__LINE__,a) @@ -241,7 +241,7 @@ static void _move_to_element(unsigned line, IXmlReader *reader) { HRESULT hr; hr = IXmlReader_MoveToElement(reader); - ok_(__FILE__,line)(hr == S_OK, "MoveToElement failed: %08x\n", hr); + ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); } static void test_read_state(IXmlReader *reader, XmlReadState expected, @@ -269,11 +269,11 @@ static void test_read_state(IXmlReader *reader, XmlReadState expected, static const WCHAR *_reader_value(unsigned line, IXmlReader *reader, const WCHAR *expect) { const WCHAR *str = (void*)0xdeadbeef; - ULONG len = 0xdeadbeef; + UINT len = 0xdeadbeef; HRESULT hr; hr = IXmlReader_GetValue(reader, &str, &len); - ok_(__FILE__,line)(hr == S_OK, "GetValue returned %08x\n", hr); + ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len); ok_(__FILE__,line)(!lstrcmpW(str, expect), "value = %s\n", wine_dbgstr_w(str)); return str; @@ -283,12 +283,12 @@ static const WCHAR *_reader_value(unsigned line, IXmlReader *reader, const WCHAR static const WCHAR *_reader_name(unsigned line, IXmlReader *reader, const WCHAR *expect) { const WCHAR *str = (void*)0xdeadbeef; - ULONG len = 0xdeadbeef; + UINT len = 0xdeadbeef; HRESULT hr; hr = IXmlReader_GetLocalName(reader, &str, &len); - ok_(__FILE__,line)(hr == S_OK, "GetLocalName returned %08x\n", hr); - ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len); + ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok_(__FILE__,line)(len == lstrlenW(str), "len = %u.\n", len); ok_(__FILE__,line)(!lstrcmpW(str, expect), "name = %s\n", wine_dbgstr_w(str)); return str; } @@ -297,12 +297,12 @@ static const WCHAR *_reader_name(unsigned line, IXmlReader *reader, const WCHAR static const WCHAR *_reader_prefix(unsigned line, IXmlReader *reader, const WCHAR *expect) { const WCHAR *str = (void*)0xdeadbeef; - ULONG len = 0xdeadbeef; + UINT len = 0xdeadbeef; HRESULT hr; hr = IXmlReader_GetPrefix(reader, &str, &len); - ok_(__FILE__,line)(hr == S_OK, "GetPrefix returned %08x\n", hr); - ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len); + ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok_(__FILE__,line)(len == lstrlenW(str), "len = %u.\n", len); ok_(__FILE__,line)(!lstrcmpW(str, expect), "prefix = %s\n", wine_dbgstr_w(str)); return str; } @@ -311,12 +311,12 @@ static const WCHAR *_reader_prefix(unsigned line, IXmlReader *reader, const WCHA static const WCHAR *_reader_namespace(unsigned line, IXmlReader *reader, const WCHAR *expect) { const WCHAR *str = (void*)0xdeadbeef; - ULONG len = 0xdeadbeef; + UINT len = 0xdeadbeef; HRESULT hr; hr = IXmlReader_GetNamespaceUri(reader, &str, &len); - ok_(__FILE__,line)(hr == S_OK, "GetNamespaceUri returned %08x\n", hr); - ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len); + ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok_(__FILE__,line)(len == lstrlenW(str), "len = %u.\n", len); ok_(__FILE__,line)(!lstrcmpW(str, expect), "namespace = %s\n", wine_dbgstr_w(str)); return str; } @@ -325,12 +325,12 @@ static const WCHAR *_reader_namespace(unsigned line, IXmlReader *reader, const W static const WCHAR *_reader_qname(IXmlReader *reader, const WCHAR *expect, unsigned line) { const WCHAR *str = (void*)0xdeadbeef; - ULONG len = 0xdeadbeef; + UINT len = 0xdeadbeef; HRESULT hr; hr = IXmlReader_GetQualifiedName(reader, &str, &len); - ok_(__FILE__,line)(hr == S_OK, "GetQualifiedName returned %08x\n", hr); - ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len); + ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok_(__FILE__,line)(len == lstrlenW(str), "len = %u.\n", len); ok_(__FILE__,line)(!lstrcmpW(str, expect), "name = %s\n", wine_dbgstr_w(str)); return str; } @@ -343,7 +343,7 @@ static void _read_value_char(IXmlReader *reader, WCHAR expected_char, unsigned l HRESULT hr; hr = IXmlReader_ReadValueChunk(reader, &c, 1, &count); - ok_(__FILE__,line)(hr == S_OK, "got %08x\n", hr); + ok_(__FILE__,line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok_(__FILE__,line)(count == 1, "got %u\n", c); ok_(__FILE__,line)(c == expected_char, "got %x\n", c); } @@ -528,84 +528,84 @@ static void test_reader_create(void) } hr = CreateXmlReader(&IID_IStream, (void **)&unk, NULL); - ok(hr == E_NOINTERFACE, "got %08x\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); hr = CreateXmlReader(&IID_IUnknown, (void **)&unk, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IUnknown_QueryInterface(unk, &IID_IXmlReader, (void **)&reader); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(unk == (IUnknown *)reader, "unexpected interface\n"); IXmlReader_Release(reader); IUnknown_Release(unk); hr = CreateXmlReader(&IID_IUnknown, (void **)&reader, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IXmlReader_Release(reader); hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_READER_STATE(reader, XmlReadState_Closed); nodetype = XmlNodeType_Element; hr = IXmlReader_GetNodeType(reader, &nodetype); - ok(hr == S_FALSE, "got %08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); ok(nodetype == XmlNodeType_None, "got %d\n", nodetype); /* crashes on XP, 2k3, works on newer versions */ if (0) { hr = IXmlReader_GetNodeType(reader, NULL); - ok(hr == E_INVALIDARG, "got %08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); } resolver = (void*)0xdeadbeef; hr = IXmlReader_GetProperty(reader, XmlReaderProperty_XmlResolver, (LONG_PTR*)&resolver); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(resolver == NULL, "got %p\n", resolver); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_XmlResolver, 0); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_XmlResolver, (LONG_PTR)&testresolver); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); resolver = NULL; hr = IXmlReader_GetProperty(reader, XmlReaderProperty_XmlResolver, (LONG_PTR*)&resolver); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(resolver == &testresolver, "got %p\n", resolver); IXmlResolver_Release(resolver); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_XmlResolver, 0); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); dtd = 2; hr = IXmlReader_GetProperty(reader, XmlReaderProperty_DtdProcessing, (LONG_PTR*)&dtd); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(dtd == DtdProcessing_Prohibit, "got %d\n", dtd); dtd = 2; hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, dtd); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, -1); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* Null input pointer, releases previous input */ hr = IXmlReader_SetInput(reader, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_READER_STATE2(reader, XmlReadState_Initial, XmlReadState_Closed); /* test input interface selection sequence */ hr = testinput_createinstance((void**)&input); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (hr == S_OK) { input_iids.count = 0; hr = IXmlReader_SetInput(reader, input); - ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); ok_iids(&input_iids, setinput_full, setinput_full_old, FALSE); IUnknown_Release(input); } @@ -623,71 +623,71 @@ static void test_readerinput(void) LONG ref; hr = CreateXmlReaderInputWithEncodingName(NULL, NULL, NULL, FALSE, NULL, NULL); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = CreateXmlReaderInputWithEncodingName(NULL, NULL, NULL, FALSE, NULL, &reader_input); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ref = IStream_AddRef(stream); - ok(ref == 2, "Expected 2, got %d\n", ref); + ok(ref == 2, "Expected 2, got %ld.\n", ref); IStream_Release(stream); hr = CreateXmlReaderInputWithEncodingName((IUnknown*)stream, NULL, NULL, FALSE, NULL, &reader_input); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IUnknown_QueryInterface(reader_input, &IID_IStream, (void**)&stream2); - ok(hr == E_NOINTERFACE, "Expected S_OK, got %08x\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); hr = IUnknown_QueryInterface(reader_input, &IID_ISequentialStream, (void**)&stream2); - ok(hr == E_NOINTERFACE, "Expected S_OK, got %08x\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); /* IXmlReaderInput grabs a stream reference */ ref = IStream_AddRef(stream); - ok(ref == 3, "Expected 3, got %d\n", ref); + ok(ref == 3, "Expected 3, got %ld.\n", ref); IStream_Release(stream); /* try ::SetInput() with valid IXmlReaderInput */ hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ref = IUnknown_AddRef(reader_input); - ok(ref == 2, "Expected 2, got %d\n", ref); + ok(ref == 2, "Expected 2, got %ld.\n", ref); IUnknown_Release(reader_input); hr = IXmlReader_SetInput(reader, reader_input); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_READER_STATE(reader, XmlReadState_Initial); nodetype = XmlNodeType_Element; hr = IXmlReader_GetNodeType(reader, &nodetype); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(nodetype == XmlNodeType_None, "got %d\n", nodetype); /* IXmlReader grabs a IXmlReaderInput reference */ ref = IUnknown_AddRef(reader_input); - ok(ref == 3, "Expected 3, got %d\n", ref); + ok(ref == 3, "Expected 3, got %ld.\n", ref); IUnknown_Release(reader_input); ref = IStream_AddRef(stream); - ok(ref == 4, "Expected 4, got %d\n", ref); + ok(ref == 4, "Expected 4, got %ld.\n", ref); IStream_Release(stream); /* reset input and check state */ hr = IXmlReader_SetInput(reader, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_READER_STATE2(reader, XmlReadState_Initial, XmlReadState_Closed); IXmlReader_Release(reader); ref = IStream_AddRef(stream); - ok(ref == 3, "Expected 3, got %d\n", ref); + ok(ref == 3, "Expected 3, got %ld.\n", ref); IStream_Release(stream); ref = IUnknown_AddRef(reader_input); - ok(ref == 2, "Expected 2, got %d\n", ref); + ok(ref == 2, "Expected 2, got %ld.\n", ref); IUnknown_Release(reader_input); /* IID_IXmlReaderInput */ @@ -696,9 +696,9 @@ static void test_readerinput(void) Such query will be used only to check if input is really IXmlReaderInput */ obj = (IUnknown*)0xdeadbeef; hr = IUnknown_QueryInterface(reader_input, &IID_IXmlReaderInput, (void**)&obj); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ref = IUnknown_AddRef(reader_input); - ok(ref == 3, "Expected 3, got %d\n", ref); + ok(ref == 3, "Expected 3, got %ld.\n", ref); IUnknown_Release(reader_input); IUnknown_Release(reader_input); @@ -708,59 +708,59 @@ static void test_readerinput(void) /* test input interface selection sequence */ input = NULL; hr = testinput_createinstance((void**)&input); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); input_iids.count = 0; ref = IUnknown_AddRef(input); - ok(ref == 2, "Expected 2, got %d\n", ref); + ok(ref == 2, "Expected 2, got %ld.\n", ref); IUnknown_Release(input); hr = CreateXmlReaderInputWithEncodingName(input, NULL, NULL, FALSE, NULL, &reader_input); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok_iids(&input_iids, empty_seq, NULL, FALSE); /* IXmlReaderInput stores stream interface as IUnknown */ ref = IUnknown_AddRef(input); - ok(ref == 3, "Expected 3, got %d\n", ref); + ok(ref == 3, "Expected 3, got %ld.\n", ref); IUnknown_Release(input); hr = CreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); input_iids.count = 0; ref = IUnknown_AddRef(reader_input); - ok(ref == 2, "Expected 2, got %d\n", ref); + ok(ref == 2, "Expected 2, got %ld.\n", ref); IUnknown_Release(reader_input); ref = IUnknown_AddRef(input); - ok(ref == 3, "Expected 3, got %d\n", ref); + ok(ref == 3, "Expected 3, got %ld.\n", ref); IUnknown_Release(input); hr = IXmlReader_SetInput(reader, reader_input); - ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); ok_iids(&input_iids, setinput_readerinput, NULL, FALSE); TEST_READER_STATE(reader, XmlReadState_Closed); ref = IUnknown_AddRef(input); - ok(ref == 3, "Expected 3, got %d\n", ref); + ok(ref == 3, "Expected 3, got %ld.\n", ref); IUnknown_Release(input); ref = IUnknown_AddRef(reader_input); ok(ref == 3 || broken(ref == 2) /* versions 1.0.x and 1.1.x - XP, Vista */, - "Expected 3, got %d\n", ref); + "Expected 3, got %ld.\n", ref); IUnknown_Release(reader_input); /* repeat another time, no check or caching here */ input_iids.count = 0; hr = IXmlReader_SetInput(reader, reader_input); - ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); ok_iids(&input_iids, setinput_readerinput, NULL, FALSE); /* another reader */ hr = CreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader2, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* resolving from IXmlReaderInput to IStream/ISequentialStream is done at ::SetInput() level, each time it's called */ input_iids.count = 0; hr = IXmlReader_SetInput(reader2, reader_input); - ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); ok_iids(&input_iids, setinput_readerinput, NULL, FALSE); IXmlReader_Release(reader2); @@ -777,11 +777,11 @@ static void test_reader_state(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* invalid arguments */ hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, NULL); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* attempt to read on closed reader */ TEST_READER_STATE(reader, XmlReadState_Closed); @@ -790,7 +790,7 @@ if (0) { /* newer versions crash here, probably because no input was set */ hr = IXmlReader_Read(reader, &nodetype); - ok(hr == S_FALSE, "got %08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); } set_input_string(reader, "xml"); TEST_READER_STATE(reader, XmlReadState_Initial); @@ -798,7 +798,7 @@ if (0) nodetype = XmlNodeType_Element; hr = IXmlReader_Read(reader, &nodetype); todo_wine - ok(FAILED(hr), "got %08x\n", hr); + ok(FAILED(hr), "Unexpected hr %#lx.\n", hr); ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype); todo_wine @@ -807,7 +807,7 @@ if (0) nodetype = XmlNodeType_Element; hr = IXmlReader_Read(reader, &nodetype); todo_wine - ok(FAILED(hr), "got %08x\n", hr); + ok(FAILED(hr), "Unexpected hr %#lx.\n", hr); ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype); IXmlReader_Release(reader); @@ -850,26 +850,26 @@ static void test_read_xmldeclaration(void) const WCHAR *val; hr = CreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); stream = create_stream_on_data(xmldecl_full, sizeof(xmldecl_full)); hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_GetAttributeCount(reader, &count); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count == 0, "got %d\n", count); /* try to move without attributes */ hr = IXmlReader_MoveToElement(reader); - ok(hr == S_FALSE, "got %08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_FALSE, "got %08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_MoveToFirstAttribute(reader); - ok(hr == S_FALSE, "got %08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); TEST_READER_POSITION(reader, 0, 0); @@ -890,7 +890,7 @@ static void test_read_xmldeclaration(void) type = XmlNodeType_None; hr = IXmlReader_GetNodeType(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Attribute, "got %d\n", type); TEST_READER_POSITION2(reader, 1, 7, ~0u, 55); @@ -899,40 +899,40 @@ static void test_read_xmldeclaration(void) next_attribute(reader); next_attribute(reader); hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_FALSE, "got %08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); type = XmlNodeType_None; hr = IXmlReader_GetNodeType(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Attribute, "got %d\n", type); hr = IXmlReader_MoveToFirstAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_READER_POSITION2(reader, 1, 7, ~0u, 55); hr = IXmlReader_GetAttributeCount(reader, NULL); - ok(hr == E_INVALIDARG, "got %08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_GetAttributeCount(reader, &count); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count == 3, "Expected 3, got %d\n", count); for (i = 0; i < count; i++) { len = 0; hr = IXmlReader_GetLocalName(reader, &val, &len); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(len == lstrlenW(name_val[i].name), "expected %u, got %u\n", lstrlenW(name_val[i].name), len); ok(!lstrcmpW(name_val[i].name, val), "expected %s, got %s\n", wine_dbgstr_w(name_val[i].name), wine_dbgstr_w(val)); len = 0; hr = IXmlReader_GetValue(reader, &val, &len); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(len == lstrlenW(name_val[i].val), "expected %u, got %u\n", lstrlenW(name_val[i].val), len); ok(!lstrcmpW(name_val[i].val, val), "expected %s, got %s\n", wine_dbgstr_w(name_val[i].val), wine_dbgstr_w(val)); hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == ((i < count - 1) ? S_OK : S_FALSE), "got %08x\n", hr); + ok(hr == ((i < count - 1) ? S_OK : S_FALSE), "Unexpected hr %#lx.\n", hr); } TEST_DEPTH(reader, 1); @@ -942,7 +942,7 @@ static void test_read_xmldeclaration(void) type = XmlNodeType_None; hr = IXmlReader_GetNodeType(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_XmlDeclaration, "got %d\n", type); type = XmlNodeType_XmlDeclaration; @@ -950,7 +950,7 @@ static void test_read_xmldeclaration(void) /* newer versions return syntax error here cause document is incomplete, it makes more sense than invalid char error */ todo_wine { - ok(hr == WC_E_SYNTAX || broken(hr == WC_E_XMLCHARACTER), "got 0x%08x\n", hr); + ok(hr == WC_E_SYNTAX || broken(hr == WC_E_XMLCHARACTER), "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_None, "got %d\n", type); } IStream_Release(stream); @@ -959,14 +959,14 @@ todo_wine { stream = create_stream_on_data(xmldecl_short, sizeof(xmldecl_short)); hr = IXmlReader_SetInput(reader, (IUnknown *)stream); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); read_node(reader, XmlNodeType_XmlDeclaration); TEST_READER_POSITION2(reader, 1, 3, ~0u, 21); TEST_READER_STATE(reader, XmlReadState_Interactive); hr = IXmlReader_GetAttributeCount(reader, &count); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count == 1, "expected 1, got %d\n", count); ret = IXmlReader_IsEmptyElement(reader); @@ -982,20 +982,20 @@ todo_wine { type = -1; hr = IXmlReader_GetNodeType(reader, &type); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Attribute, "got %d\n", type); TEST_READER_POSITION2(reader, 1, 7, ~0u, 21); /* try to move from last attribute */ hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_FALSE, "expected S_FALSE, got %08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); read_node(reader, XmlNodeType_Element); TEST_READER_POSITION2(reader, 1, 23, ~0u, 40); TEST_READER_STATE(reader, XmlReadState_Interactive); hr = IXmlReader_GetAttributeCount(reader, &count); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count == 0, "expected 0, got %d\n", count); ret = IXmlReader_IsEmptyElement(reader); @@ -1007,7 +1007,7 @@ todo_wine { type = -1; hr = IXmlReader_Read(reader, &type); todo_wine - ok(hr == WC_E_SYNTAX || hr == WC_E_XMLCHARACTER /* XP */, "expected WC_E_SYNTAX, got %08x\n", hr); + ok(hr == WC_E_SYNTAX || hr == WC_E_XMLCHARACTER /* XP */, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type)); TEST_READER_POSITION(reader, 1, 41); todo_wine @@ -1053,7 +1053,7 @@ static void test_read_comment(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); set_input_string(reader, teststr); @@ -1066,7 +1066,7 @@ static void test_read_comment(void) if (type == XmlNodeType_Text || type == XmlNodeType_Comment) { hr = IXmlReader_GetValue(reader, &value, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(*value != 0, "Expected node value\n"); } i++; @@ -1079,9 +1079,9 @@ static void test_read_comment(void) type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); if (test->hr_broken) - ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr || broken(hr == test->hr_broken), "Unexpected hr %#lx, for %s.\n", hr, test->xml); else - ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml); if (hr == S_OK) { const WCHAR *str; @@ -1092,14 +1092,14 @@ static void test_read_comment(void) str = NULL; hr = IXmlReader_GetLocalName(reader, &str, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); reader_qname(reader, L""); str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); /* value */ @@ -1134,7 +1134,7 @@ static void test_read_pi(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); while (test->xml) { @@ -1145,9 +1145,9 @@ static void test_read_pi(void) type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); if (test->hr_broken) - ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr || broken(hr == test->hr_broken), "Unexpected hr %#lx, for %s.\n", hr, test->xml); else - ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml); if (hr == S_OK) { const WCHAR *str; @@ -1160,7 +1160,7 @@ static void test_read_pi(void) len = 0; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(len == lstrlenW(test->name), "got %u\n", len); ok(!lstrcmpW(str, test->name), "got %s\n", wine_dbgstr_w(str)); @@ -1230,7 +1230,7 @@ static void test_read_full(void) int i; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); set_input_string(reader, test->xml); @@ -1257,10 +1257,10 @@ static void test_read_public_dtd(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, DtdProcessing_Parse); - ok(hr == S_OK, "got 0x%8x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); set_input_string(reader, test_public_dtd); @@ -1268,15 +1268,15 @@ static void test_read_public_dtd(void) count = 0; hr = IXmlReader_GetAttributeCount(reader, &count); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count == 2, "got %d\n", count); hr = IXmlReader_MoveToFirstAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); type = XmlNodeType_None; hr = IXmlReader_GetNodeType(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Attribute, "got %d\n", type); reader_name(reader, L"PUBLIC"); @@ -1286,7 +1286,7 @@ static void test_read_public_dtd(void) type = XmlNodeType_None; hr = IXmlReader_GetNodeType(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Attribute, "got %d\n", type); reader_name(reader, L"SYSTEM"); @@ -1298,7 +1298,7 @@ static void test_read_public_dtd(void) len = 0; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); todo_wine { ok(len == lstrlenW(dtdnameW), "got %u\n", len); ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); @@ -1320,10 +1320,10 @@ static void test_read_system_dtd(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, DtdProcessing_Parse); - ok(hr == S_OK, "got 0x%8x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); set_input_string(reader, test_system_dtd); @@ -1331,15 +1331,15 @@ static void test_read_system_dtd(void) count = 0; hr = IXmlReader_GetAttributeCount(reader, &count); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count == 1, "got %d\n", count); hr = IXmlReader_MoveToFirstAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); type = XmlNodeType_None; hr = IXmlReader_GetNodeType(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Attribute, "got %d\n", type); reader_name(reader, L"SYSTEM"); @@ -1351,7 +1351,7 @@ static void test_read_system_dtd(void) len = 0; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); todo_wine { ok(len == lstrlenW(dtdnameW), "got %u\n", len); ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); @@ -1397,7 +1397,7 @@ static void test_read_element(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); while (test->xml) { @@ -1406,10 +1406,10 @@ static void test_read_element(void) type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); if (test->hr_broken) - ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr || broken(hr == test->hr_broken), "Unexpected hr %#lx, for %s.\n", hr, test->xml); else todo_wine_if(test->hr == NC_E_UNDECLAREDPREFIX) - ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml); if (hr == S_OK) { const WCHAR *str; @@ -1420,7 +1420,7 @@ static void test_read_element(void) len = 0; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(len == lstrlenW(test->name), "got %u\n", len); ok(!lstrcmpW(str, test->name), "got %s\n", wine_dbgstr_w(str)); @@ -1444,7 +1444,7 @@ static void test_read_element(void) depth = 123; hr = IXmlReader_GetDepth(reader, &depth); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(depth == depths[i], "%u: got depth %u, expected %u\n", i, depth, depths[i]); if (type == XmlNodeType_Element || type == XmlNodeType_EndElement) @@ -1453,7 +1453,7 @@ static void test_read_element(void) prefix = NULL; hr = IXmlReader_GetPrefix(reader, &prefix, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(prefix != NULL, "got %p\n", prefix); if (!*prefix) @@ -1462,12 +1462,12 @@ static void test_read_element(void) local = NULL; hr = IXmlReader_GetLocalName(reader, &local, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(local != NULL, "got %p\n", local); qname = NULL; hr = IXmlReader_GetQualifiedName(reader, &qname, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(qname != NULL, "got %p\n", qname); ok(local == qname, "expected same pointer\n"); @@ -1478,7 +1478,7 @@ static void test_read_element(void) { count = 1; hr = IXmlReader_GetAttributeCount(reader, &count); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count == 0, "got %u\n", count); } @@ -1486,7 +1486,7 @@ static void test_read_element(void) { count = 0; hr = IXmlReader_GetAttributeCount(reader, &count); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* moving to attributes increases depth */ if (count) @@ -1496,14 +1496,14 @@ static void test_read_element(void) reader_value(reader, L""); hr = IXmlReader_MoveToFirstAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_GetValue(reader, &value, NULL); ok(*value != 0, "Unexpected value %s\n", wine_dbgstr_w(value)); depth = 123; hr = IXmlReader_GetDepth(reader, &depth); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(depth == depths[i] + 1, "%u: got depth %u, expected %u\n", i, depth, depths[i] + 1); move_to_element(reader); @@ -1511,7 +1511,7 @@ static void test_read_element(void) depth = 123; hr = IXmlReader_GetDepth(reader, &depth); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(depth == depths[i], "%u: got depth %u, expected %u\n", i, depth, depths[i]); } } @@ -1526,7 +1526,7 @@ static void test_read_element(void) type = XmlNodeType_Element; hr = IXmlReader_Read(reader, &type); - ok(hr == WC_E_ELEMENTMATCH, "got %08x\n", hr); + ok(hr == WC_E_ELEMENTMATCH, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_None, "got %d\n", type); TEST_READER_STATE(reader, XmlReadState_Error); @@ -1544,16 +1544,16 @@ static void test_read_pending(void) int c; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_SetInput(reader, (IUnknown*)&teststream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* first read call returns incomplete node, second attempt fails with E_PENDING */ stream_readcall = 0; type = XmlNodeType_Element; hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK || broken(hr == E_PENDING), "got 0x%08x\n", hr); + ok(hr == S_OK || broken(hr == E_PENDING), "Unexpected hr %#lx.\n", hr); /* newer versions are happy when it's enough data to detect node type, older versions keep reading until it fails to read more */ todo_wine @@ -1564,7 +1564,7 @@ static void test_read_pending(void) c = stream_readcall; value = (void*)0xdeadbeef; hr = IXmlReader_GetValue(reader, &value, NULL); - ok(hr == E_PENDING, "got 0x%08x\n", hr); + ok(hr == E_PENDING, "Unexpected hr %#lx.\n", hr); ok(value == NULL || broken(value == (void*)0xdeadbeef) /* Win8 sets it to NULL */, "got %p\n", value); ok(c < stream_readcall || broken(c == stream_readcall), "got %d, expected %d\n", stream_readcall, c+1); @@ -1581,12 +1581,12 @@ static void test_readvaluechunk(void) UINT c; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); set_input_string(reader, ""); hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Comment, "type = %u\n", type); read_value_char(reader, ' '); @@ -1599,13 +1599,13 @@ static void test_readvaluechunk(void) c = 0; b = 0; hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c); - ok(hr == S_FALSE, "got %08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); ok(c == 0, "got %u\n", c); ok(b == 0, "got %x\n", b); c = 0xdeadbeef; hr = IXmlReader_ReadValueChunk(reader, buf, 0, &c); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!c, "c = %u\n", c); reader_value(reader, L"omment1 "); @@ -1615,13 +1615,13 @@ static void test_readvaluechunk(void) c = 0xdeadbeef; hr = IXmlReader_ReadValueChunk(reader, buf, 0, &c); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!c, "c = %u\n", c); c = 0xdeadbeef; memset(buf, 0xcc, sizeof(buf)); hr = IXmlReader_ReadValueChunk(reader, buf, ARRAY_SIZE(buf), &c); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(c == 10, "got %u\n", c); ok(buf[c] == 0xcccc, "buffer overflow\n"); buf[c] = 0; @@ -1630,7 +1630,7 @@ static void test_readvaluechunk(void) c = 0xdeadbeef; memset(buf, 0xcc, sizeof(buf)); hr = IXmlReader_ReadValueChunk(reader, buf, ARRAY_SIZE(buf), &c); - ok(hr == S_FALSE, "got %08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); ok(!c, "got %u\n", c); /* portion read as chunk is skipped from resulting node value */ @@ -1640,7 +1640,7 @@ static void test_readvaluechunk(void) c = 0xdeadbeef; b = 0xffff; hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c); - ok(hr == S_FALSE, "got %08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); ok(c == 0, "got %u\n", c); ok(b == 0xffff, "got %x\n", b); @@ -1666,7 +1666,7 @@ static void test_read_cdata(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); while (test->xml) { @@ -1685,9 +1685,9 @@ static void test_read_cdata(void) } if (test->hr_broken) - ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr || broken(hr == test->hr_broken), "Unexpected hr %#lx, for %s.\n", hr, test->xml); else - ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml); if (hr == S_OK) { const WCHAR *str; @@ -1699,19 +1699,19 @@ static void test_read_cdata(void) str = NULL; hr = IXmlReader_GetLocalName(reader, &str, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); len = 1; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(len == 0, "got %u\n", len); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); /* value */ @@ -1740,7 +1740,7 @@ static void test_read_text(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); while (test->xml) { @@ -1757,7 +1757,7 @@ static void test_read_text(void) type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); } - ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml); if (hr == S_OK) { const WCHAR *str; @@ -1769,19 +1769,19 @@ static void test_read_text(void) str = NULL; hr = IXmlReader_GetLocalName(reader, &str, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); len = 1; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(len == 0, "got %u\n", len); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); /* value */ @@ -1812,7 +1812,7 @@ static void test_isemptyelement(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); while (test->xml) { @@ -1823,7 +1823,7 @@ static void test_isemptyelement(void) type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Element, "got %d\n", type); ret = IXmlReader_IsEmptyElement(reader); @@ -1867,7 +1867,7 @@ static void test_read_attribute(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); while (test->xml) { @@ -1878,9 +1878,9 @@ static void test_read_attribute(void) hr = IXmlReader_Read(reader, NULL); if (test->hr_broken) - ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr || broken(hr == test->hr_broken), "Unexpected hr %#lx, for %s.\n", hr, test->xml); else - ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr, "Unexpected hr %#lx, for %s.\n", hr, test->xml); if (hr == S_OK) { const WCHAR *str; @@ -1888,19 +1888,19 @@ static void test_read_attribute(void) type = XmlNodeType_None; hr = IXmlReader_GetNodeType(reader, &type); - ok(hr == S_OK, "Failed to get node type, %#x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Element, "got %d for %s\n", type, test->xml); hr = IXmlReader_MoveToFirstAttribute(reader); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_name(reader, test->name); len = 1; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(len == lstrlenW(test->name), "got %u\n", len); ok(!lstrcmpW(str, test->name), "got %s\n", wine_dbgstr_w(str)); @@ -1921,23 +1921,23 @@ static void test_reader_properties(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); value = 0; hr = IXmlReader_GetProperty(reader, XmlReaderProperty_MaxElementDepth, &value); - ok(hr == S_OK, "GetProperty failed: %08x\n", hr); - ok(value == 256, "Unexpected default max depth value %ld\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == 256, "Unexpected default max depth value %Id.\n", value); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MultiLanguage, 0); - ok(hr == S_OK, "SetProperty failed: %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 0); - ok(hr == S_OK, "SetProperty failed: %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); value = 256; hr = IXmlReader_GetProperty(reader, XmlReaderProperty_MaxElementDepth, &value); - ok(hr == S_OK, "GetProperty failed: %08x\n", hr); - ok(value == 0, "Unexpected max depth value %ld\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == 0, "Unexpected max depth value %Id.\n", value); IXmlReader_Release(reader); } @@ -1960,7 +1960,7 @@ static void test_prefix(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); for (i = 0; i < ARRAY_SIZE(prefix_tests); i++) { XmlNodeType type; @@ -1968,16 +1968,16 @@ static void test_prefix(void) set_input_string(reader, prefix_tests[i].xml); hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "Read() failed, %#x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Element, "Unexpected node type %d.\n", type); reader_prefix(reader, prefix_tests[i].prefix1); hr = IXmlReader_MoveToFirstAttribute(reader); - ok(hr == S_OK, "MoveToFirstAttribute() failed, %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_GetNodeType(reader, &type); - ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Attribute, "Unexpected node type %d.\n", type); reader_prefix(reader, prefix_tests[i].prefix2); @@ -1985,7 +1985,7 @@ static void test_prefix(void) next_attribute(reader); hr = IXmlReader_GetNodeType(reader, &type); - ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Attribute, "Unexpected node type %d.\n", type); reader_prefix(reader, prefix_tests[i].prefix3); @@ -2035,7 +2035,7 @@ static void test_namespaceuri(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); for (i = 0; i < ARRAY_SIZE(uri_tests); i++) { unsigned int j = 0; @@ -2059,13 +2059,13 @@ static void test_namespaceuri(void) local = NULL; length = 0; hr = IXmlReader_GetLocalName(reader, &local, &length); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(local != NULL, "Unexpected NULL local name pointer\n"); qname = NULL; length2 = 0; hr = IXmlReader_GetQualifiedName(reader, &qname, &length2); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(qname != NULL, "Unexpected NULL qualified name pointer\n"); if (type == XmlNodeType_Element || @@ -2100,28 +2100,28 @@ static void test_read_charref(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); set_input_string(reader, testA); hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Element, "Unexpected node type %d\n", type); hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Text, "Unexpected node type %d\n", type); hr = IXmlReader_GetValue(reader, &value, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!lstrcmpW(value, chardataW), "Text value : %s\n", wine_dbgstr_w(value)); hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_EndElement, "Unexpected node type %d\n", type); hr = IXmlReader_Read(reader, &type); - ok(hr == S_FALSE, "got %08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_None, "Unexpected node type %d\n", type); IXmlReader_Release(reader); @@ -2154,7 +2154,7 @@ static void test_encoding_detection(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* there's no way to query detected encoding back, so just verify that document is browsable */ @@ -2164,7 +2164,7 @@ static void test_encoding_detection(void) type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type != XmlNodeType_None, "Unexpected node type %d\n", type); } @@ -2173,11 +2173,11 @@ static void test_encoding_detection(void) stream = create_stream_on_data(encoding_testsW[i].text, lstrlenW(encoding_testsW[i].text) * sizeof(WCHAR)); hr = IXmlReader_SetInput(reader, (IUnknown *)stream); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "%u: got %08x\n", i, hr); + ok(hr == S_OK, "%u: unexpected hr %#lx.\n", i, hr); ok(type != XmlNodeType_None, "%u: unexpected node type %d\n", i, type); IStream_Release(stream); @@ -2193,8 +2193,8 @@ static void test_eof_state(IXmlReader *reader, BOOL eof) ok(IXmlReader_IsEOF(reader) == eof, "Unexpected IsEOF() result\n"); hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, &state); - ok(hr == S_OK, "GetProperty() failed, %#x\n", hr); - ok((state == XmlReadState_EndOfFile) == eof, "Unexpected EndOfFile state %ld\n", state); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok((state == XmlReadState_EndOfFile) == eof, "Unexpected EndOfFile state %Id.\n", state); } static void test_endoffile(void) @@ -2204,7 +2204,7 @@ static void test_endoffile(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); test_eof_state(reader, FALSE); @@ -2214,46 +2214,46 @@ static void test_endoffile(void) type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Element, "Unexpected type %d\n", type); test_eof_state(reader, FALSE); type = XmlNodeType_Element; hr = IXmlReader_Read(reader, &type); - ok(hr == S_FALSE, "got %#x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_None, "Unexpected type %d\n", type); test_eof_state(reader, TRUE); hr = IXmlReader_SetInput(reader, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); test_eof_state(reader, FALSE); IXmlReader_Release(reader); hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); set_input_string(reader, "<a/>text"); type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Element, "Unexpected type %d\n", type); test_eof_state(reader, FALSE); type = XmlNodeType_Element; hr = IXmlReader_Read(reader, &type); - ok(hr == WC_E_SYNTAX, "got %#x\n", hr); + ok(hr == WC_E_SYNTAX, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_None, "Unexpected type %d\n", type); test_eof_state(reader, FALSE); hr = IXmlReader_SetInput(reader, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IXmlReader_Release(reader); } @@ -2274,37 +2274,37 @@ static void test_max_element_depth(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); set_input_string(reader, xml); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 2); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_DEPTH(reader, 0); hr = IXmlReader_Read(reader, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_DEPTH(reader, 0); hr = IXmlReader_Read(reader, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_DEPTH(reader, 1); TEST_READER_STATE(reader, XmlReadState_Interactive); hr = IXmlReader_Read(reader, NULL); - ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr); + ok(hr == SC_E_MAXELEMENTDEPTH, "Unexpected hr %#lx.\n", hr); TEST_DEPTH2(reader, 0, 2); TEST_READER_STATE(reader, XmlReadState_Error); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 10); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_Read(reader, NULL); - ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr); + ok(hr == SC_E_MAXELEMENTDEPTH, "Unexpected hr %#lx.\n", hr); TEST_DEPTH2(reader, 0, 2); TEST_READER_STATE(reader, XmlReadState_Error); @@ -2313,34 +2313,34 @@ static void test_max_element_depth(void) set_input_string(reader, xml); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 2); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_DEPTH(reader, 0); hr = IXmlReader_Read(reader, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_DEPTH(reader, 0); hr = IXmlReader_Read(reader, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_DEPTH(reader, 1); hr = IXmlReader_MoveToFirstAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_DEPTH(reader, 2); TEST_READER_STATE(reader, XmlReadState_Interactive); nodetype = 123; hr = IXmlReader_Read(reader, &nodetype); - ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr); + ok(hr == SC_E_MAXELEMENTDEPTH, "Unexpected hr %#lx.\n", hr); ok(nodetype == XmlNodeType_None, "got node type %d\n", nodetype); nodetype = 123; hr = IXmlReader_Read(reader, &nodetype); - ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr); + ok(hr == SC_E_MAXELEMENTDEPTH, "Unexpected hr %#lx.\n", hr); ok(nodetype == XmlNodeType_None, "got node type %d\n", nodetype); TEST_DEPTH2(reader, 0, 2); @@ -2350,7 +2350,7 @@ static void test_max_element_depth(void) set_input_string(reader, xml); hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 0); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); count = 0; while (IXmlReader_Read(reader, NULL) == S_OK) @@ -2370,25 +2370,25 @@ static void test_reader_position(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_READER_STATE(reader, XmlReadState_Closed); /* position methods with Null args */ hr = IXmlReader_GetLineNumber(reader, NULL); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_GetLinePosition(reader, NULL); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); position = 123; hr = IXmlReader_GetLinePosition(reader, &position); - ok(hr == S_FALSE, "got %#x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); ok(position == 0, "got %u\n", position); position = 123; hr = IXmlReader_GetLineNumber(reader, &position); - ok(hr == S_FALSE, "got %#x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); ok(position == 0, "got %u\n", position); set_input_string(reader, xml); @@ -2396,7 +2396,7 @@ static void test_reader_position(void) TEST_READER_STATE(reader, XmlReadState_Initial); TEST_READER_POSITION(reader, 0, 0); hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Element, "got type %d\n", type); TEST_READER_POSITION2(reader, 1, 2, ~0u, 34); @@ -2410,17 +2410,17 @@ static void test_reader_position(void) TEST_READER_POSITION2(reader, 1, 2, ~0u, 34); hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_Whitespace, "got type %d\n", type); TEST_READER_POSITION2(reader, 1, 35, 2, 6); hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(type == XmlNodeType_EndElement, "got type %d\n", type); TEST_READER_POSITION2(reader, 2, 3, 2, 6); hr = IXmlReader_SetInput(reader, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); TEST_READER_STATE2(reader, XmlReadState_Initial, XmlReadState_Closed); TEST_READER_POSITION(reader, 0, 0); @@ -2434,7 +2434,7 @@ static void test_string_pointers(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); set_input_string(reader, "<elem xmlns=\"myns\">myns<elem2 /></elem>"); @@ -2565,67 +2565,67 @@ static void test_attribute_by_name(void) HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); - ok(hr == S_OK, "Failed to create reader, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); set_input_string(reader, xml); hr = IXmlReader_MoveToAttributeByName(reader, NULL, NULL); - ok(hr == E_INVALIDARG || broken(hr == S_FALSE) /* WinXP */, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG || broken(hr == S_FALSE) /* WinXP */, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_MoveToAttributeByName(reader, emptyW, NULL); - ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); read_node(reader, XmlNodeType_Element); hr = IXmlReader_MoveToAttributeByName(reader, emptyW, NULL); - ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); read_node(reader, XmlNodeType_Element); hr = IXmlReader_MoveToAttributeByName(reader, NULL, NULL); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_MoveToAttributeByName(reader, NULL, xmlns_uriW); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_MoveToAttributeByName(reader, emptyW, xmlns_uriW); - ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_MoveToAttributeByName(reader, xmlnsW, NULL); - ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_MoveToAttributeByName(reader, xmlnsW, xmlns_uriW); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"myns"); hr = IXmlReader_MoveToAttributeByName(reader, aW, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"value a"); hr = IXmlReader_MoveToAttributeByName(reader, bW, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"value b"); hr = IXmlReader_MoveToAttributeByName(reader, aW, mynsW); - ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_MoveToAttributeByName(reader, nsW, NULL); - ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); hr = IXmlReader_MoveToAttributeByName(reader, nsW, xmlns_uriW); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"ns uri"); hr = IXmlReader_MoveToAttributeByName(reader, bW, emptyW); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"value b"); hr = IXmlReader_MoveToAttributeByName(reader, cW, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"value c2"); hr = IXmlReader_MoveToAttributeByName(reader, cW, nsuriW); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"value c"); IXmlReader_Release(reader); diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index c69aa42598d..bfcea5d15de 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -41,7 +41,7 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) ULONG refcount; IUnknown_AddRef(obj); refcount = IUnknown_Release(obj); - ok_(__FILE__, line)(refcount == ref, "expected refcount %d, got %d\n", ref, refcount); + ok_(__FILE__, line)(refcount == ref, "expected refcount %lu, got %lu.\n", ref, refcount); } static void check_output_raw(IStream *stream, const void *expected, SIZE_T size, int line) @@ -52,10 +52,10 @@ static void check_output_raw(IStream *stream, const void *expected, SIZE_T size, WCHAR *ptr; hr = GetHGlobalFromStream(stream, &hglobal); - ok_(__FILE__, line)(hr == S_OK, "Failed to get the stream handle, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get the stream handle, hr %#lx.\n", hr); content_size = GlobalSize(hglobal); - ok_(__FILE__, line)(size == content_size, "Unexpected test output size %ld.\n", content_size); + ok_(__FILE__, line)(size == content_size, "Unexpected test output size %Id.\n", content_size); ptr = GlobalLock(hglobal); if (size <= content_size) ok_(__FILE__, line)(!memcmp(expected, ptr, size), "Unexpected output content.\n"); @@ -73,7 +73,7 @@ static void check_output(IStream *stream, const char *expected, BOOL todo, int l char *ptr; hr = GetHGlobalFromStream(stream, &hglobal); - ok_(__FILE__, line)(hr == S_OK, "got 0x%08x\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); size = GlobalSize(hglobal); ptr = GlobalLock(hglobal); @@ -111,7 +111,7 @@ static void writer_set_property(IXmlWriter *writer, XmlWriterProperty property) HRESULT hr; hr = IXmlWriter_SetProperty(writer, property, TRUE); - ok(hr == S_OK, "Failed to set writer property, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set writer property, hr %#lx.\n", hr); } /* used to test all Write* methods for consistent error state */ @@ -123,67 +123,67 @@ static void check_writer_state(IXmlWriter *writer, HRESULT exp_hr) /* FIXME: add WriteAttributes */ hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, aW); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteCData(writer, aW); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteCharEntity(writer, aW[0]); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteChars(writer, aW, 1); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteComment(writer, aW); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteDocType(writer, aW, NULL, NULL, NULL); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, aW); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteEndElement(writer); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteEntityRef(writer, aW); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteFullEndElement(writer); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteName(writer, aW); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteNmToken(writer, aW); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); /* FIXME: add WriteNode */ /* FIXME: add WriteNodeShallow */ hr = IXmlWriter_WriteProcessingInstruction(writer, aW, aW); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteQualifiedName(writer, aW, NULL); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteRaw(writer, aW); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteRawChars(writer, aW, 1); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteString(writer, aW); - ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr); /* FIXME: add WriteSurrogateCharEntity */ /* FIXME: add WriteWhitespace */ @@ -195,10 +195,10 @@ static IStream *writer_set_output(IXmlWriter *writer) HRESULT hr; hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); return stream; } @@ -295,39 +295,39 @@ static void test_writer_create(void) } hr = CreateXmlWriter(&IID_IStream, (void **)&unk, NULL); - ok(hr == E_NOINTERFACE, "got %08x\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); hr = CreateXmlWriter(&IID_IUnknown, (void **)&unk, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IUnknown_QueryInterface(unk, &IID_IXmlWriter, (void **)&writer); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(unk == (IUnknown *)writer, "unexpected interface pointer\n"); IUnknown_Release(unk); IXmlWriter_Release(writer); hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* check default properties values */ value = 0; hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_ByteOrderMark, &value); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(value == TRUE, "got %ld\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == TRUE, "got %Id.\n", value); value = TRUE; hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_Indent, &value); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(value == FALSE, "got %ld\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == FALSE, "got %Id.\n", value); value = TRUE; hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, &value); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(value == FALSE, "got %ld\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == FALSE, "got %Id.\n", value); value = XmlConformanceLevel_Auto; hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_ConformanceLevel, &value); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(value == XmlConformanceLevel_Document, "got %ld\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == XmlConformanceLevel_Document, "got %Id.\n", value); IXmlWriter_Release(writer); } @@ -337,78 +337,78 @@ static void test_invalid_output_encoding(IXmlWriter *writer, IUnknown *output) HRESULT hr; hr = IXmlWriter_SetOutput(writer, output); - ok(hr == S_OK, "Failed to set output, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set output, hr %#lx.\n", hr); /* TODO: WriteAttributes */ hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, aW); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteCData(writer, aW); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteCharEntity(writer, 0x100); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteChars(writer, aW, 1); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteComment(writer, aW); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteDocType(writer, aW, NULL, NULL, NULL); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, NULL); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndElement(writer); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEntityRef(writer, aW); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteFullEndElement(writer); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteName(writer, aW); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteNmToken(writer, aW); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); /* TODO: WriteNode */ /* TODO: WriteNodeShallow */ hr = IXmlWriter_WriteProcessingInstruction(writer, aW, aW); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteQualifiedName(writer, aW, NULL); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteRaw(writer, aW); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteRawChars(writer, aW, 1); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteString(writer, aW); - ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); /* TODO: WriteSurrogateCharEntity */ - /* ًُُTODO: WriteWhitespace */ + /* TODO: WriteWhitespace */ hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); } static void test_writeroutput(void) @@ -425,15 +425,15 @@ static void test_writeroutput(void) output = NULL; hr = CreateXmlWriterOutputWithEncodingName(&testoutput, NULL, NULL, &output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); EXPECT_REF(output, 1); IUnknown_Release(output); hr = CreateXmlWriterOutputWithEncodingName(&testoutput, NULL, utf16W, &output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); unk = NULL; hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&unk); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); todo_wine ok(unk != NULL && unk != output, "got %p, output %p\n", unk, output); EXPECT_REF(output, 2); @@ -444,14 +444,14 @@ static void test_writeroutput(void) output = NULL; hr = CreateXmlWriterOutputWithEncodingCodePage(&testoutput, NULL, ~0u, &output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IUnknown_Release(output); hr = CreateXmlWriterOutputWithEncodingCodePage(&testoutput, NULL, CP_UTF8, &output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); unk = NULL; hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&unk); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(unk != NULL, "got %p\n", unk); /* releasing 'unk' crashes on native */ IUnknown_Release(output); @@ -460,27 +460,27 @@ static void test_writeroutput(void) /* create with us-ascii */ output = NULL; hr = CreateXmlWriterOutputWithEncodingName(&testoutput, NULL, usasciiW, &output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IUnknown_Release(output); /* Output with codepage 1200. */ hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL); - ok(hr == S_OK, "Failed to create writer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create writer, hr %#lx.\n", hr); hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "Failed to create stream, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create stream, hr %#lx.\n", hr); hr = CreateXmlWriterOutputWithEncodingCodePage((IUnknown *)stream, NULL, 1200, &output); - ok(hr == S_OK, "Failed to create writer output, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create writer output, hr %#lx.\n", hr); hr = IXmlWriter_SetOutput(writer, output); - ok(hr == S_OK, "Failed to set writer output, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set writer output, hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == S_OK, "Write failed, hr %#x.\n", hr); + ok(hr == S_OK, "Write failed, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); CHECK_OUTPUT_RAW(stream, utf16_outputW, sizeof(utf16_outputW)); @@ -489,11 +489,11 @@ static void test_writeroutput(void) /* Create output with meaningless code page value. */ hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "Failed to create stream, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create stream, hr %#lx.\n", hr); output = NULL; hr = CreateXmlWriterOutputWithEncodingCodePage((IUnknown *)stream, NULL, ~0u, &output); - ok(hr == S_OK, "Failed to create writer output, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create writer output, hr %#lx.\n", hr); test_invalid_output_encoding(writer, output); CHECK_OUTPUT(stream, ""); @@ -503,11 +503,11 @@ static void test_writeroutput(void) /* Same, with invalid encoding name. */ hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); output = NULL; hr = CreateXmlWriterOutputWithEncodingName((IUnknown *)stream, NULL, dummyW, &output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); test_invalid_output_encoding(writer, output); CHECK_OUTPUT(stream, ""); @@ -532,55 +532,55 @@ static void test_writestartdocument(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* output not set */ hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); - ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); /* nothing written yet */ hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, fullprolog); /* one more time */ hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); IStream_Release(stream); /* now add PI manually, and try to start a document */ stream = writer_set_output(writer); hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); /* another attempt to add 'xml' PI */ hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, prologversion); @@ -589,23 +589,23 @@ static void test_writestartdocument(void) /* create with us-ascii */ hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); output = NULL; hr = CreateXmlWriterOutputWithEncodingName((IUnknown *)stream, NULL, usasciiW, &output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_SetOutput(writer, output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, prologversion2); @@ -620,28 +620,28 @@ static void test_flush(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_SetOutput(writer, (IUnknown*)&teststream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); g_write_len = 0; hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(g_write_len > 0, "got %d\n", g_write_len); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(g_write_len > 0, "Unexpected length %lu.\n", g_write_len); g_write_len = 1; hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(g_write_len == 0, "got %d\n", g_write_len); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(g_write_len == 0, "Unexpected length %lu.\n", g_write_len); /* Release() flushes too */ g_write_len = 1; IXmlWriter_Release(writer); - ok(g_write_len == 0, "got %d\n", g_write_len); + ok(g_write_len > 0, "Unexpected length %lu.\n", g_write_len); } static void test_omitxmldeclaration(void) @@ -656,20 +656,20 @@ static void test_omitxmldeclaration(void) char *ptr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = GetHGlobalFromStream(stream, &hglobal); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ptr = GlobalLock(hglobal); ok(!ptr, "got %p\n", ptr); @@ -677,7 +677,7 @@ static void test_omitxmldeclaration(void) /* one more time */ hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); IStream_Release(stream); @@ -685,35 +685,35 @@ static void test_omitxmldeclaration(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, prologversion); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, prologversion); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, prologversion); /* another attempt to add 'xml' PI */ hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IStream_Release(stream); IXmlWriter_Release(writer); @@ -735,25 +735,25 @@ static void test_bom(void) HRESULT hr; hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_SetOutput(writer, output); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* BOM is on by default */ hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT_RAW(stream, bomW, sizeof(bomW)); @@ -762,19 +762,19 @@ static void test_bom(void) /* start with PI */ hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_SetOutput(writer, output); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT_RAW(stream, piW, sizeof(piW)); @@ -783,19 +783,19 @@ static void test_bom(void) /* start with element */ hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_SetOutput(writer, output); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT_RAW(stream, aopenW, sizeof(aopenW)); @@ -804,24 +804,24 @@ static void test_bom(void) /* WriteElementString */ hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_SetOutput(writer, output); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); writer_set_property(writer, XmlWriterProperty_Indent); hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = GetHGlobalFromStream(stream, &hglobal); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT_RAW(stream, afullW, sizeof(afullW)); @@ -922,65 +922,65 @@ static void test_WriteStartElement(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_start_element(writer, NULL, "a", NULL); - ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); hr = write_start_element(writer, NULL, "a", NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a"); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, NULL, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteProcessingInstruction(writer, aW, aW); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); IStream_Release(stream); IXmlWriter_Release(writer); /* WriteElementString */ hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_element_string(writer, NULL, "b", NULL, "value"); - ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); hr = write_start_element(writer, "prefix", "a", "uri"); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = write_element_string(writer, NULL, "b", NULL, "value"); - ok(hr == S_OK, "Failed to write element string, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write element string, hr %#lx.\n", hr); hr = write_element_string(writer, NULL, "c", NULL, NULL); - ok(hr == S_OK, "Failed to write element string, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write element string, hr %#lx.\n", hr); hr = write_start_element(writer, NULL, "d", "uri"); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = write_start_element(writer, "", "e", "uri"); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = write_start_element(writer, "prefix2", "f", "uri"); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<prefix:a xmlns:prefix=\"uri\">" @@ -1000,24 +1000,24 @@ static void test_WriteStartElement(void) writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "Failed to start document, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start document, hr %#lx.\n", hr); hr = write_start_element(writer, start_element_tests[i].prefix, start_element_tests[i].local, start_element_tests[i].uri); - ok(hr == start_element_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); + ok(hr == start_element_tests[i].hr, "%u: unexpected hr %#lx.\n", i, hr); if (SUCCEEDED(start_element_tests[i].hr)) { hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); check_output(stream, start_element_tests[i].output_partial, start_element_tests[i].todo_partial, __LINE__); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == S_OK, "Failed to end document, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to end document, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); check_output(stream, start_element_tests[i].output, start_element_tests[i].todo, __LINE__); } @@ -1072,54 +1072,54 @@ static void test_WriteElementString(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_element_string(writer, NULL, "b", NULL, "value"); - ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); hr = write_start_element(writer, NULL, "a", NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_element_string(writer, NULL, "b", NULL, "value"); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_element_string(writer, NULL, "b", NULL, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_element_string(writer, "prefix", "b", "uri", NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_start_element(writer, "prefix", "c", "uri"); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = write_element_string(writer, "prefix", "d", NULL, NULL); - ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr); hr = write_element_string(writer, "prefix2", "d", "uri", NULL); - ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr); hr = write_element_string(writer, NULL, "e", "uri", NULL); - ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr); hr = write_element_string(writer, "prefix", "f", "uri2", NULL); - ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr); hr = write_element_string(writer, NULL, "g", "uri3", NULL); - ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr); hr = write_element_string(writer, "prefix", "h", NULL, NULL); - ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr); hr = write_element_string(writer, "prefix_i", "i", NULL, NULL); - ok(hr == WR_E_NSPREFIXWITHEMPTYNSURI, "Failed to write element, hr %#x.\n", hr); + ok(hr == WR_E_NSPREFIXWITHEMPTYNSURI, "Failed to write element, hr %#lx.\n", hr); hr = write_element_string(writer, "", "j", "uri", NULL); - ok(hr == S_OK, "Failed to write element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>value" @@ -1142,24 +1142,24 @@ static void test_WriteElementString(void) writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "Failed to start document, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start document, hr %#lx.\n", hr); hr = write_element_string(writer, element_string_tests[i].prefix, element_string_tests[i].local, element_string_tests[i].uri, element_string_tests[i].value); - ok(hr == element_string_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); + ok(hr == element_string_tests[i].hr, "%u: unexpected hr %#lx.\n", i, hr); if (SUCCEEDED(element_string_tests[i].hr)) { hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); check_output(stream, element_string_tests[i].output, element_string_tests[i].todo, __LINE__); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == S_OK, "Failed to end document, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to end document, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); check_output(stream, element_string_tests[i].output, element_string_tests[i].todo, __LINE__); } @@ -1177,24 +1177,24 @@ static void test_WriteEndElement(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); hr = write_start_element(writer, NULL, "a", NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_start_element(writer, NULL, "b", NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndElement(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndElement(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a></a>"); @@ -1213,47 +1213,47 @@ static void test_writeenddocument(void) char *ptr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); /* WriteEndDocument resets it to initial state */ hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = GetHGlobalFromStream(stream, &hglobal); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ptr = GlobalLock(hglobal); ok(ptr == NULL, "got %p\n", ptr); /* we still need to flush manually, WriteEndDocument doesn't do that */ hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a></a>"); @@ -1271,35 +1271,35 @@ static void test_WriteComment(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteComment(writer, aW); - ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteComment(writer, aW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteComment(writer, aW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteComment(writer, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteComment(writer, closeW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, ""); @@ -1318,32 +1318,32 @@ static void test_WriteCData(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteCData(writer, aW); - ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteCData(writer, aW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteCData(writer, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteCData(writer, closeW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteCData(writer, close2W); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "" @@ -1367,48 +1367,48 @@ static void test_WriteRaw(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteRaw(writer, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteRaw(writer, rawW); - ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); hr = IXmlWriter_WriteRaw(writer, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteRaw(writer, rawW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteRaw(writer, rawW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteComment(writer, rawW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteRaw(writer, rawW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, aW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteComment(writer, rawW); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteRaw(writer, rawW); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>a<:a<:a<:<a>a</a>"); @@ -1424,7 +1424,7 @@ static void test_writer_state(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* initial state */ check_writer_state(writer, E_UNEXPECTED); @@ -1433,7 +1433,7 @@ static void test_writer_state(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteEndElement(writer); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); IStream_Release(stream); @@ -1442,7 +1442,7 @@ static void test_writer_state(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, aW); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); IStream_Release(stream); @@ -1451,7 +1451,7 @@ static void test_writer_state(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); IStream_Release(stream); @@ -1460,7 +1460,7 @@ static void test_writer_state(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteFullEndElement(writer); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); IStream_Release(stream); @@ -1469,7 +1469,7 @@ static void test_writer_state(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteCData(writer, aW); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); IStream_Release(stream); @@ -1478,7 +1478,7 @@ static void test_writer_state(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteName(writer, aW); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); IStream_Release(stream); @@ -1487,7 +1487,7 @@ static void test_writer_state(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteNmToken(writer, aW); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); IStream_Release(stream); @@ -1496,7 +1496,7 @@ static void test_writer_state(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteString(writer, aW); - ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); IStream_Release(stream); @@ -1514,7 +1514,7 @@ static void test_indentation(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); @@ -1522,22 +1522,22 @@ static void test_indentation(void) writer_set_property(writer, XmlWriterProperty_Indent); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteComment(writer, commentW); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" @@ -1551,19 +1551,19 @@ static void test_indentation(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndElement(writer); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" @@ -1678,7 +1678,7 @@ static void test_WriteAttributeString(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); @@ -1687,26 +1687,26 @@ static void test_WriteAttributeString(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "Failed to start document, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start document, hr %#lx.\n", hr); hr = write_start_element(writer, NULL, "e", NULL); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = write_attribute_string(writer, attribute_tests[i].prefix, attribute_tests[i].local, attribute_tests[i].uri, attribute_tests[i].value); todo_wine_if(attribute_tests[i].todo_hr) - ok(hr == attribute_tests[i].hr, "%u: unexpected hr %#x, expected %#x.\n", i, hr, attribute_tests[i].hr); + ok(hr == attribute_tests[i].hr, "%u: unexpected hr %#lx, expected %#lx.\n", i, hr, attribute_tests[i].hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); check_output(stream, attribute_tests[i].output_partial, attribute_tests[i].todo_partial, __LINE__); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == S_OK, "Failed to end document, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to end document, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); check_output(stream, attribute_tests[i].output, attribute_tests[i].todo, __LINE__); IStream_Release(stream); @@ -1716,41 +1716,41 @@ static void test_WriteAttributeString(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_start_element(writer, "p", "a", "outeruri"); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_attribute_string(writer, "prefix", "local", "uri", "b"); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_attribute_string(writer, NULL, "a", NULL, "b"); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_attribute_string(writer, "xmlns", "prefix", NULL, "uri"); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_attribute_string(writer, "p", "attr", NULL, "value"); - ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write attribute string, hr %#lx.\n", hr); hr = write_attribute_string(writer, "prefix", "local", NULL, "b"); todo_wine - ok(hr == WR_E_DUPLICATEATTRIBUTE, "got 0x%08x\n", hr); + ok(hr == WR_E_DUPLICATEATTRIBUTE, "Unexpected hr %#lx.\n", hr); hr = write_start_element(writer, NULL, "b", NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_attribute_string(writer, NULL, "attr2", "outeruri", "value"); - ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write attribute string, hr %#lx.\n", hr); hr = write_attribute_string(writer, "pr", "attr3", "outeruri", "value"); - ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write attribute string, hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT_TODO(stream, "<p:a prefix:local=\"b\" a=\"b\" xmlns:prefix=\"uri\" p:attr=\"value\" xmlns:p=\"outeruri\">" @@ -1763,22 +1763,22 @@ static void test_WriteAttributeString(void) stream = writer_set_output(writer); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_start_element(writer, NULL, "e", NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_attribute_string(writer, "xmlns", "prefix", NULL, "uri"); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_attribute_string(writer, "prefix", "attr", NULL, "value"); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<e xmlns:prefix=\"uri\" prefix:attr=\"value\" />"); @@ -1796,7 +1796,7 @@ static void test_WriteFullEndElement(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* standalone element */ stream = writer_set_output(writer); @@ -1805,19 +1805,19 @@ static void test_WriteFullEndElement(void) writer_set_property(writer, XmlWriterProperty_Indent); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteFullEndElement(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a></a>"); @@ -1830,22 +1830,22 @@ static void test_WriteFullEndElement(void) writer_set_property(writer, XmlWriterProperty_Indent); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteFullEndElement(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" @@ -1864,7 +1864,7 @@ static void test_WriteCharEntity(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* without indentation */ stream = writer_set_output(writer); @@ -1872,22 +1872,22 @@ static void test_WriteCharEntity(void) writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteCharEntity(writer, 0x100); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>Ā<a /></a>"); @@ -1903,39 +1903,39 @@ static void test_WriteString(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = write_string(writer, "a"); - ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); hr = write_string(writer, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_string(writer, ""); - ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); hr = write_start_element(writer, NULL, "b", NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_string(writer, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_string(writer, ""); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_string(writer, "a"); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* WriteString automatically escapes markup characters */ hr = write_string(writer, "<&\">="); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "a<&\">="); @@ -1944,22 +1944,22 @@ static void test_WriteString(void) stream = writer_set_output(writer); hr = write_start_element(writer, NULL, "b", NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = write_string(writer, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<b"); hr = write_string(writer, ""); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_OUTPUT(stream, ""); @@ -1969,43 +1969,43 @@ static void test_WriteString(void) /* With indentation */ hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL); - ok(hr == S_OK, "Failed to create a writer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create a writer, hr %#lx.\n", hr); stream = writer_set_output(writer); writer_set_property(writer, XmlWriterProperty_Indent); hr = write_start_element(writer, NULL, "a", NULL); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = write_start_element(writer, NULL, "b", NULL); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = write_string(writer, "text"); - ok(hr == S_OK, "Failed to write a string, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write a string, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" " text"); hr = IXmlWriter_WriteFullEndElement(writer); - ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" " text"); hr = IXmlWriter_WriteFullEndElement(writer); - ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" @@ -2017,29 +2017,29 @@ static void test_WriteString(void) stream = writer_set_output(writer); hr = write_start_element(writer, NULL, "a", NULL); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = write_start_element(writer, NULL, "b", NULL); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = IXmlWriter_WriteEndElement(writer); - ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" " "); hr = write_start_element(writer, NULL, "c", NULL); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = write_attribute_string(writer, NULL, "attr", NULL, "value"); - ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write attribute string, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" @@ -2047,10 +2047,10 @@ static void test_WriteString(void) " <c attr=\"value\""); hr = write_string(writer, "text"); - ok(hr == S_OK, "Failed to write a string, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write a string, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" @@ -2058,10 +2058,10 @@ static void test_WriteString(void) " <c attr=\"value\">text"); hr = IXmlWriter_WriteEndElement(writer); - ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" @@ -2069,16 +2069,16 @@ static void test_WriteString(void) " <c attr=\"value\">text</c>"); hr = write_start_element(writer, NULL, "d", NULL); - ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = write_string(writer, ""); - ok(hr == S_OK, "Failed to write a string, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to write a string, hr %#lx.\n", hr); hr = IXmlWriter_WriteEndElement(writer); - ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" @@ -2087,10 +2087,10 @@ static void test_WriteString(void) " <d></d>"); hr = IXmlWriter_WriteEndElement(writer); - ok(hr == S_OK, "Failed to end element, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to end element, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); CHECK_OUTPUT(stream, "<a>\r\n" @@ -2163,23 +2163,23 @@ static void test_WriteDocType(void) HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL); - ok(hr == S_OK, "Failed to create writer instance, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create writer instance, hr %#lx.\n", hr); stream = writer_set_output(writer); hr = IXmlWriter_WriteDocType(writer, NULL, NULL, NULL, NULL); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteDocType(writer, emptyW, NULL, NULL, NULL); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* Name validation. */ hr = IXmlWriter_WriteDocType(writer, nameW, NULL, NULL, NULL); - ok(hr == WC_E_NAMECHARACTER, "Unexpected hr %#x.\n", hr); + ok(hr == WC_E_NAMECHARACTER, "Unexpected hr %#lx.\n", hr); /* Pubid validation. */ hr = IXmlWriter_WriteDocType(writer, aW, pubidW, NULL, NULL); - ok(hr == WC_E_PUBLICID, "Unexpected hr %#x.\n", hr); + ok(hr == WC_E_PUBLICID, "Unexpected hr %#lx.\n", hr); IStream_Release(stream); @@ -2189,16 +2189,16 @@ static void test_WriteDocType(void) hr = write_doctype(writer, doctype_tests[i].name, doctype_tests[i].pubid, doctype_tests[i].sysid, doctype_tests[i].subset); - ok(hr == S_OK, "%u: failed to write doctype, hr %#x.\n", i, hr); + ok(hr == S_OK, "%u: failed to write doctype, hr %#lx.\n", i, hr); hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to flush, hr %#lx.\n", hr); CHECK_OUTPUT(stream, doctype_tests[i].output); hr = write_doctype(writer, doctype_tests[i].name, doctype_tests[i].pubid, doctype_tests[i].sysid, doctype_tests[i].subset); - ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#x.\n", hr); + ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); IStream_Release(stream); } -- 2.34.1

2 1

[PATCH 1/2] dwrite/tests: Add some tests for Segoe UI font family. (Resend)
by Dmitry Timoshkov Feb. 7, 2022

Feb. 7, 2022

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/dwrite/tests/layout.c | 139 +++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 3fe149927ca..c242155cce3 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -6489,6 +6489,144 @@ if (SUCCEEDED(hr)) IDWriteFactory_Release(factory); } +#define get_font_name(a, b, c) get_font_name_(a, b, c, __LINE__) +static void get_font_name_(IDWriteFont *font, WCHAR *name, UINT32 size, int line) +{ + HRESULT hr; + IDWriteFontFamily *family; + IDWriteLocalizedStrings *names; + UINT32 index; + BOOL exists; + + hr = IDWriteFont_GetFontFamily(font, &family); + ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteLocalizedStrings_FindLocaleName(names, L"en-us", &index, &exists); + ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr); + ok_(__FILE__, line)(index != UINT_MAX && exists, "name was not found\n"); + hr = IDWriteLocalizedStrings_GetString(names, index, name, size); + ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr); + + IDWriteLocalizedStrings_Release(names); + IDWriteFontFamily_Release(family); +} + +static void test_SegoeUI(void) +{ + static const WCHAR *families[] = { L"Tahoma", L"Segoe UI", NULL }; + static const WCHAR text[] = { 0x25d4, 0 }; + HRESULT hr; + IDWriteFactory2 *factory; + IDWriteFontCollection *collection; + IDWriteFontFamily *family; + IDWriteFont *font; + IDWriteFontFallback *fallback; + UINT32 index, count, i, mappedlength; + WCHAR name[256]; + BOOL exists, found; + FLOAT scale; + + hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IDWriteFactory2, (IUnknown **)&factory); + if (hr != S_OK) + { + win_skip("IDWriteFactory2 is not supported\n"); + return; + } + + hr = IDWriteFactory2_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteFontCollection_FindFamilyName(collection, L"Segoe UI", &index, &exists); + ok(hr == S_OK, "got %#x\n", hr); + if (!exists) + { + skip("Segoe UI is not installed\n"); + IDWriteFontCollection_Release(collection); + IDWriteFactory2_Release(factory); + return; + } + ok(index != UINT_MAX && exists, "Segoe UI was not found\n"); + + hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); + ok(hr == S_OK, "got %#x\n", hr); + + count = IDWriteFontFamily_GetFontCount(family); + trace("family Segoe UI has %u fonts\n", count); + + found = FALSE; + + for (i = 0; i < count; i++) + { + hr = IDWriteFontFamily_GetFont(family, i, &font); + ok(hr == S_OK, "got %#x\n", hr); + + get_font_name(font, name, ARRAY_SIZE(name)); + if (!wcscmp(name, L"Segoe UI Symbol")) + found = TRUE; + + hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists); + ok(hr == S_OK, "got %#x\n", hr); + ok(!exists, "%u: %s has character 0x25d4\n", i, wine_dbgstr_w(name)); + + IDWriteFont_Release(font); + } + + ok(!found, "Segoe UI Symbol should not be part of Segoe UI family\n"); + + IDWriteFontFamily_Release(family); + + hr = IDWriteFactory2_GetSystemFontFallback(factory, &fallback); + ok(hr == S_OK, "got %#x\n", hr); + + g_source = text; + + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, collection, L"Segoe UI", DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); + ok(hr == S_OK, "got %#x\n", hr); + ok(mappedlength == 1, "got %u\n", mappedlength); + ok(scale == 1.0f, "got %f\n", scale); + + get_font_name(font, name, ARRAY_SIZE(name)); +todo_wine + ok(!wcscmp(name, L"Segoe UI Symbol"), "got %s\n", wine_dbgstr_w(name)); + + hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(exists, "%s should have character 0x25d4\n", wine_dbgstr_w(name)); + + IDWriteFont_Release(font); + + for (i = 0; i < ARRAY_SIZE(families); i++) + { + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, collection, families[i], DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); +todo_wine_if(families[i] == NULL) + ok(hr == S_OK, "%u: %s - got %#x\n", i, wine_dbgstr_w(families[i]), hr); + if (hr != S_OK) continue; + ok(mappedlength == 1, "got %u\n", mappedlength); + ok(scale == 1.0f, "got %f\n", scale); + + get_font_name(font, name, ARRAY_SIZE(name)); +todo_wine + ok(!wcscmp(name, L"Segoe UI Symbol"), "got %s\n", wine_dbgstr_w(name)); + + hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(exists, "%s should have character 0x25d4\n", wine_dbgstr_w(name)); + + IDWriteFont_Release(font); + } + + IDWriteFontFallback_Release(fallback); + IDWriteFontCollection_Release(collection); + IDWriteFactory2_Release(factory); +} + START_TEST(layout) { IDWriteFactory *factory; @@ -6544,6 +6682,7 @@ START_TEST(layout) test_text_format_axes(); test_layout_range_length(); test_HitTestTextRange(); + test_SegoeUI(); IDWriteFactory_Release(factory); } -- 2.34.1

2 7

[PATCH 1/3] comctl32/tests: Print id value as decimal. (Resend)
by Dmitry Timoshkov Feb. 7, 2022

Feb. 7, 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 3

[PATCH] user32/tests: Move test_mdi early in the test list.
by Rémi Bernon Feb. 7, 2022

Feb. 7, 2022

The test gets spurious GetScrollInfo SB_HORZ failures if some other windows were created before using CW_USEDEFAULT positions, for instance the window from test_capture_4. This happened on some Win10 VMs, and was thought to be fixed with 9b5346df86bf1a85336ed03a67a630970ce08e9f, but it then broke the test on some other VMs. This is hopefully a better fix, and it reverts the previous one too. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=52507 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/tests/win.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 8ec6d8af064..8614a048c4d 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2256,7 +2256,7 @@ static void test_mdi(void) mdi_hwndMain = CreateWindowExA(0, "MDI_parent_Class", "MDI parent window", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX /*| WS_VISIBLE*/, - 200, 100, CW_USEDEFAULT, CW_USEDEFAULT, + 100, 100, CW_USEDEFAULT, CW_USEDEFAULT, GetDesktopWindow(), 0, GetModuleHandleA(NULL), NULL); assert(mdi_hwndMain); @@ -12644,6 +12644,10 @@ START_TEST(win) our_pid = GetWindowThreadProcessId(hwndMain, NULL); + /* This test is sensitive to other windows created with + * CW_USEDEFAULT position, execute it early too */ + test_mdi(); + /* Add the tests below this line */ test_child_window_from_point(); test_window_from_point(argv[0]); @@ -12665,7 +12669,6 @@ START_TEST(win) test_parent_owner(); test_enum_thread_windows(); - test_mdi(); test_icons(); test_SetWindowPos(hwndMain, hwndMain2); test_SetMenu(hwndMain); -- 2.34.1

2 1

[PATCH] rtworkq/tests: Build without WINE_NO_LONG_TYPES.
by Nikolay Sivov Feb. 7, 2022

Feb. 7, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/rtworkq/tests/Makefile.in | 1 - dlls/rtworkq/tests/rtworkq.c | 32 ++++++++++++++++---------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/rtworkq/tests/Makefile.in b/dlls/rtworkq/tests/Makefile.in index 7a2f6db51c7..8354cd810d1 100644 --- a/dlls/rtworkq/tests/Makefile.in +++ b/dlls/rtworkq/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = rtworkq.dll IMPORTS = rtworkq ole32 diff --git a/dlls/rtworkq/tests/rtworkq.c b/dlls/rtworkq/tests/rtworkq.c index 627e024d761..2ff74d57b84 100644 --- a/dlls/rtworkq/tests/rtworkq.c +++ b/dlls/rtworkq/tests/rtworkq.c @@ -33,72 +33,72 @@ static void test_platform_init(void) /* Startup initializes MTA. */ hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#lx.\n", hr); hr = RtwqStartup(); - ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) ok(apttype == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); hr = RtwqShutdown(); - ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#lx.\n", hr); /* Try with STA initialized before startup. */ hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to initialize, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(apttype == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); hr = RtwqStartup(); - ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(apttype == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); hr = RtwqShutdown(); - ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); CoUninitialize(); /* Startup -> init main STA -> uninitialize -> shutdown */ hr = RtwqStartup(); - ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK || broken(FAILED(hr)) /* Win8 */, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) ok(apttype == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to initialize, hr %#lx.\n", hr); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(apttype == APTTYPE_MAINSTA && qualifier == APTTYPEQUALIFIER_NONE, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); CoUninitialize(); hr = CoGetApartmentType(&apttype, &qualifier); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(apttype == APTTYPE_MTA && qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, "Unexpected apartment type %d, qualifier %d.\n", apttype, qualifier); hr = RtwqShutdown(); - ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); } START_TEST(rtworkq) -- 2.34.1

1 0

[PATCH 1/6] dinput/tests: Merge dinput8.c tests with dinput.c.
by Rémi Bernon Feb. 7, 2022

Feb. 7, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/Makefile.in | 1 - dlls/dinput/tests/dinput.c | 1110 ++++++++++++++++++++++----------- dlls/dinput/tests/dinput8.c | 728 --------------------- 3 files changed, 730 insertions(+), 1109 deletions(-) delete mode 100644 dlls/dinput/tests/dinput8.c diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in index 00295fed60f..b34afde882a 100644 --- a/dlls/dinput/tests/Makefile.in +++ b/dlls/dinput/tests/Makefile.in @@ -9,7 +9,6 @@ SOURCES = \ device.c \ device8.c \ dinput.c \ - dinput8.c \ driver_hid.c \ driver_hid.spec \ force_feedback.c \ diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 10da888fdd4..795a9ed39c6 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -30,37 +30,53 @@ HINSTANCE hInstance; -enum directinput_versions -{ - DIRECTINPUT_VERSION_300 = 0x0300, - DIRECTINPUT_VERSION_500 = 0x0500, - DIRECTINPUT_VERSION_50A = 0x050A, - DIRECTINPUT_VERSION_5B2 = 0x05B2, - DIRECTINPUT_VERSION_602 = 0x0602, - DIRECTINPUT_VERSION_61A = 0x061A, - DIRECTINPUT_VERSION_700 = 0x0700, -}; - -static const DWORD directinput_version_list[] = -{ - DIRECTINPUT_VERSION_300, - DIRECTINPUT_VERSION_500, - DIRECTINPUT_VERSION_50A, - DIRECTINPUT_VERSION_5B2, - DIRECTINPUT_VERSION_602, - DIRECTINPUT_VERSION_61A, - DIRECTINPUT_VERSION_700, -}; - static HRESULT (WINAPI *pDirectInputCreateEx)(HINSTANCE, DWORD, REFIID, LPVOID *, LPUNKNOWN); +static const DWORD dinput_versions[] = +{ + 0x0300, + 0x0500, + 0x050A, + 0x05B2, + 0x0602, + 0x061A, + 0x0700, + 0x0800, +}; + +static REFIID dinput7_interfaces[] = +{ + &IID_IDirectInputA, + &IID_IDirectInputW, + &IID_IDirectInput2A, + &IID_IDirectInput2W, + &IID_IDirectInput7A, + &IID_IDirectInput7W, +}; + +static REFIID dinput8_interfaces[] = +{ + &IID_IDirectInput8A, + &IID_IDirectInput8W, + &IID_IDirectInputJoyConfig8, +}; + +static HRESULT direct_input_create( DWORD version, IDirectInputA **out ) +{ + HRESULT hr; + if (version < 0x800) hr = DirectInputCreateA( hInstance, version, out, NULL ); + else hr = DirectInput8Create( hInstance, version, &IID_IDirectInput8A, (void **)out, NULL ); + if (FAILED(hr)) win_skip( "Failed to instantiate a IDirectInput instance, hr %#x\n", hr ); + return hr; +} + static BOOL CALLBACK dummy_callback(const DIDEVICEINSTANCEA *instance, void *context) { ok(0, "Callback was invoked with parameters (%p, %p)\n", instance, context); return DIENUM_STOP; } -static void test_preinitialization(void) +static void test_CoCreateInstance( DWORD version ) { static const struct { @@ -83,7 +99,6 @@ static void test_preinitialization(void) LPDIENUMDEVICESCALLBACKA lpCallback; DWORD dwFlags; HRESULT expected_hr; - int todo; } enum_devices_tests[] = { {0, NULL, 0, DIERR_INVALIDPARAM}, @@ -96,122 +111,159 @@ static void test_preinitialization(void) {0xdeadbeef, dummy_callback, ~0u, DIERR_INVALIDPARAM}, }; - IDirectInputA *pDI; + IDirectInputDeviceA *device; + IDirectInputA *dinput; HRESULT hr; + LONG ref; int i; - IDirectInputDeviceA *pDID; - hr = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInputA, (void **)&pDI); + if (version < 0x800) hr = CoCreateInstance( &CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectInputA, (void **)&dinput ); + else hr = CoCreateInstance( &CLSID_DirectInput8, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectInput8A, (void **)&dinput ); if (FAILED(hr)) { - skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); + win_skip( "Failed to instantiate a IDirectInput instance, hr %#x\n", hr ); return; } for (i = 0; i < ARRAY_SIZE(create_device_tests); i++) { - if (create_device_tests[i].pdev) pDID = (void *)0xdeadbeef; - hr = IDirectInput_CreateDevice(pDI, create_device_tests[i].rguid, - create_device_tests[i].pdev ? &pDID : NULL, - NULL); - ok(hr == create_device_tests[i].expected_hr, "[%d] IDirectInput_CreateDevice returned 0x%08x\n", i, hr); - if (create_device_tests[i].pdev) - ok(pDID == NULL, "[%d] Output interface pointer is %p\n", i, pDID); + winetest_push_context( "%u", i ); + if (create_device_tests[i].pdev) device = (void *)0xdeadbeef; + hr = IDirectInput_CreateDevice( dinput, create_device_tests[i].rguid, + create_device_tests[i].pdev ? &device : NULL, NULL ); + ok( hr == create_device_tests[i].expected_hr, "CreateDevice returned %#x\n", hr ); + if (create_device_tests[i].pdev) ok( device == NULL, "got device %p\n", device ); + winetest_pop_context(); } for (i = 0; i < ARRAY_SIZE(enum_devices_tests); i++) { - hr = IDirectInput_EnumDevices(pDI, enum_devices_tests[i].dwDevType, - enum_devices_tests[i].lpCallback, - NULL, - enum_devices_tests[i].dwFlags); - todo_wine_if(enum_devices_tests[i].todo) - ok(hr == enum_devices_tests[i].expected_hr, "[%d] IDirectInput_EnumDevice returned 0x%08x\n", i, hr); + winetest_push_context( "%u", i ); + hr = IDirectInput_EnumDevices( dinput, enum_devices_tests[i].dwDevType, + enum_devices_tests[i].lpCallback, NULL, enum_devices_tests[i].dwFlags ); + ok( hr == enum_devices_tests[i].expected_hr, "EnumDevice returned %#x\n", hr ); + winetest_pop_context(); } - hr = IDirectInput_GetDeviceStatus(pDI, NULL); - ok(hr == E_POINTER, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr); + hr = IDirectInput_GetDeviceStatus( dinput, NULL ); + ok( hr == E_POINTER, "GetDeviceStatus returned %#x\n", hr ); - hr = IDirectInput_GetDeviceStatus(pDI, &GUID_Unknown); - ok(hr == DIERR_NOTINITIALIZED, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr); + hr = IDirectInput_GetDeviceStatus( dinput, &GUID_Unknown ); + ok( hr == DIERR_NOTINITIALIZED, "GetDeviceStatus returned %#x\n", hr ); - hr = IDirectInput_GetDeviceStatus(pDI, &GUID_SysMouse); - ok(hr == DIERR_NOTINITIALIZED, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr); + hr = IDirectInput_GetDeviceStatus( dinput, &GUID_SysMouse ); + ok( hr == DIERR_NOTINITIALIZED, "GetDeviceStatus returned %#x\n", hr ); - hr = IDirectInput_RunControlPanel(pDI, NULL, 0); - ok(hr == DIERR_NOTINITIALIZED, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + hr = IDirectInput_RunControlPanel( dinput, NULL, 0 ); + ok( hr == DIERR_NOTINITIALIZED, "RunControlPanel returned %#x\n", hr ); - hr = IDirectInput_RunControlPanel(pDI, NULL, ~0u); - ok(hr == DIERR_INVALIDPARAM, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + hr = IDirectInput_RunControlPanel( dinput, NULL, ~0u ); + ok( hr == DIERR_INVALIDPARAM, "RunControlPanel returned %#x\n", hr ); - hr = IDirectInput_RunControlPanel(pDI, (HWND)0xdeadbeef, 0); - ok(hr == E_HANDLE, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + hr = IDirectInput_RunControlPanel( dinput, (HWND)0xdeadbeef, 0 ); + ok( hr == E_HANDLE, "RunControlPanel returned %#x\n", hr ); - hr = IDirectInput_RunControlPanel(pDI, (HWND)0xdeadbeef, ~0u); - ok(hr == E_HANDLE, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + hr = IDirectInput_RunControlPanel( dinput, (HWND)0xdeadbeef, ~0u ); + ok( hr == E_HANDLE, "RunControlPanel returned %#x\n", hr ); - IDirectInput_Release(pDI); + ref = IDirectInput_Release( dinput ); + ok( ref == 0, "Release returned %d\n", ref ); } -static void test_DirectInputCreateEx(void) +static void test_DirectInputCreate( DWORD version ) { - static const struct + IUnknown *unknown; + struct { - BOOL hinst; - DWORD dwVersion; - REFIID riid; - BOOL ppdi; + HMODULE instance; + DWORD version; + REFIID iid; + IUnknown **out; + IUnknown *expect_out; HRESULT expected_hr; - IUnknown *expected_ppdi; - } invalid_param_list[] = + } create_tests[] = { - {FALSE, 0, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, - {FALSE, 0, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, - {FALSE, 0, &IID_IDirectInputA, FALSE, E_POINTER}, - {FALSE, 0, &IID_IDirectInputA, TRUE, DIERR_INVALIDPARAM, NULL}, - {FALSE, DIRECTINPUT_VERSION, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, - {FALSE, DIRECTINPUT_VERSION, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, - {FALSE, DIRECTINPUT_VERSION, &IID_IDirectInputA, FALSE, E_POINTER}, - {FALSE, DIRECTINPUT_VERSION, &IID_IDirectInputA, TRUE, DIERR_INVALIDPARAM, NULL}, - {FALSE, DIRECTINPUT_VERSION - 1, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, - {FALSE, DIRECTINPUT_VERSION - 1, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, - {FALSE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, FALSE, E_POINTER}, - {FALSE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, TRUE, DIERR_INVALIDPARAM, NULL}, - {FALSE, DIRECTINPUT_VERSION + 1, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, - {FALSE, DIRECTINPUT_VERSION + 1, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, - {FALSE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, FALSE, E_POINTER}, - {FALSE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, TRUE, DIERR_INVALIDPARAM, NULL}, - {TRUE, 0, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, - {TRUE, 0, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, - {TRUE, 0, &IID_IDirectInputA, FALSE, E_POINTER}, - {TRUE, 0, &IID_IDirectInputA, TRUE, DIERR_NOTINITIALIZED, NULL}, - {TRUE, DIRECTINPUT_VERSION, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, - {TRUE, DIRECTINPUT_VERSION, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, - {TRUE, DIRECTINPUT_VERSION, &IID_IDirectInputA, FALSE, E_POINTER}, - {TRUE, DIRECTINPUT_VERSION - 1, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, - {TRUE, DIRECTINPUT_VERSION - 1, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, - {TRUE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, FALSE, E_POINTER}, - {TRUE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, TRUE, DIERR_BETADIRECTINPUTVERSION, NULL}, - {TRUE, DIRECTINPUT_VERSION + 1, &IID_IUnknown, FALSE, DIERR_NOINTERFACE}, - {TRUE, DIRECTINPUT_VERSION + 1, &IID_IUnknown, TRUE, DIERR_NOINTERFACE, (void *)0xdeadbeef}, - {TRUE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, FALSE, E_POINTER}, - {TRUE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, TRUE, DIERR_OLDDIRECTINPUTVERSION, NULL}, + {NULL, 0, NULL, NULL, (void *)0xdeadbeef, E_POINTER}, + {NULL, 0, NULL, &unknown, NULL, DIERR_INVALIDPARAM}, + {NULL, version, NULL, NULL, (void *)0xdeadbeef, E_POINTER}, + {NULL, version, NULL, &unknown, NULL, version == 0x300 ? DI_OK : DIERR_INVALIDPARAM}, + {NULL, version - 1, NULL, NULL, (void *)0xdeadbeef, E_POINTER}, + {NULL, version - 1, NULL, &unknown, NULL, DIERR_INVALIDPARAM}, + {NULL, version + 1, NULL, NULL, (void *)0xdeadbeef, E_POINTER}, + {NULL, version + 1, NULL, &unknown, NULL, DIERR_INVALIDPARAM}, + {hInstance, 0, NULL, NULL, (void *)0xdeadbeef, E_POINTER}, + {hInstance, 0, NULL, &unknown, NULL, DIERR_NOTINITIALIZED}, + {hInstance, version, NULL, NULL, (void *)0xdeadbeef, E_POINTER}, + {hInstance, version - 1, NULL, NULL, (void *)0xdeadbeef, E_POINTER}, + {hInstance, version - 1, NULL, &unknown, NULL, version <= 0x700 ? DIERR_BETADIRECTINPUTVERSION : DIERR_OLDDIRECTINPUTVERSION}, + {hInstance, version + 1, NULL, NULL, (void *)0xdeadbeef, E_POINTER}, + {hInstance, version + 1, NULL, &unknown, NULL, version < 0x700 ? DIERR_BETADIRECTINPUTVERSION : DIERR_OLDDIRECTINPUTVERSION}, }; - - static REFIID no_interface_list[] = {&IID_IUnknown, &IID_IDirectInput8A, - &IID_IDirectInput8W, &IID_IDirectInputDeviceA, - &IID_IDirectInputDeviceW, &IID_IDirectInputDevice2A, - &IID_IDirectInputDevice2W, &IID_IDirectInputDevice7A, - &IID_IDirectInputDevice7W, &IID_IDirectInputDevice8A, - &IID_IDirectInputDevice8W, &IID_IDirectInputEffect}; - - static REFIID iid_list[] = {&IID_IDirectInputA, &IID_IDirectInputW, - &IID_IDirectInput2A, &IID_IDirectInput2W, - &IID_IDirectInput7A, &IID_IDirectInput7W}; - - int i, j; - IUnknown *pUnk; HRESULT hr; + int i; + + for (i = 0; i < ARRAY_SIZE(create_tests); i++) + { + winetest_push_context( "%u", i ); + unknown = (void *)0xdeadbeef; + hr = DirectInputCreateW( create_tests[i].instance, create_tests[i].version, (IDirectInputW **)create_tests[i].out, NULL ); + todo_wine_if(i == 3 && version == 0x300) + ok( hr == create_tests[i].expected_hr, "DirectInputCreateEx returned %#x\n", hr ); + if (SUCCEEDED(hr)) IUnknown_Release( unknown ); + else ok( unknown == create_tests[i].expect_out, "got IUnknown %p\n", unknown ); + winetest_pop_context(); + } +} + +static void test_DirectInputCreateEx( DWORD version ) +{ + IUnknown *unknown; + struct + { + HMODULE instance; + DWORD version; + REFIID iid; + IUnknown **out; + IUnknown *expect_out; + HRESULT expected_hr; + } create_tests[] = + { + {NULL, 0, &IID_IUnknown, NULL, (void *)0xdeadbeef, DIERR_NOINTERFACE}, + {NULL, 0, &IID_IUnknown, &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE}, + {NULL, 0, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER}, + {NULL, 0, &IID_IDirectInputA, &unknown, NULL, DIERR_INVALIDPARAM}, + {NULL, version, &IID_IUnknown, NULL, (void *)0xdeadbeef, DIERR_NOINTERFACE}, + {NULL, version, &IID_IUnknown, &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE}, + {NULL, version, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER}, + {NULL, version, &IID_IDirectInputA, &unknown, NULL, version == 0x300 ? DI_OK : DIERR_INVALIDPARAM}, + {NULL, version - 1, &IID_IUnknown, NULL, (void *)0xdeadbeef, DIERR_NOINTERFACE}, + {NULL, version - 1, &IID_IUnknown, &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE}, + {NULL, version - 1, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER}, + {NULL, version - 1, &IID_IDirectInputA, &unknown, NULL, DIERR_INVALIDPARAM}, + {NULL, version + 1, &IID_IUnknown, NULL, (void *)0xdeadbeef, DIERR_NOINTERFACE}, + {NULL, version + 1, &IID_IUnknown, &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE}, + {NULL, version + 1, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER}, + {NULL, version + 1, &IID_IDirectInputA, &unknown, NULL, DIERR_INVALIDPARAM}, + {hInstance, 0, &IID_IUnknown, NULL, (void *)0xdeadbeef, DIERR_NOINTERFACE}, + {hInstance, 0, &IID_IUnknown, &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE}, + {hInstance, 0, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER}, + {hInstance, 0, &IID_IDirectInputA, &unknown, NULL, DIERR_NOTINITIALIZED}, + {hInstance, version, &IID_IUnknown, NULL, (void *)0xdeadbeef, DIERR_NOINTERFACE}, + {hInstance, version, &IID_IUnknown, &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE}, + {hInstance, version, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER}, + {hInstance, version - 1, &IID_IUnknown, NULL, (void *)0xdeadbeef, DIERR_NOINTERFACE}, + {hInstance, version - 1, &IID_IUnknown, &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE}, + {hInstance, version - 1, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER}, + {hInstance, version - 1, &IID_IDirectInputA, &unknown, NULL, version <= 0x700 ? DIERR_BETADIRECTINPUTVERSION : DIERR_OLDDIRECTINPUTVERSION}, + {hInstance, version + 1, &IID_IUnknown, NULL, (void *)0xdeadbeef, DIERR_NOINTERFACE}, + {hInstance, version + 1, &IID_IUnknown, &unknown, (void *)0xdeadbeef, DIERR_NOINTERFACE}, + {hInstance, version + 1, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER}, + {hInstance, version + 1, &IID_IDirectInputA, &unknown, NULL, version < 0x700 ? DIERR_BETADIRECTINPUTVERSION : DIERR_OLDDIRECTINPUTVERSION}, + }; + HRESULT hr; + int i; if (!pDirectInputCreateEx) { @@ -219,391 +271,485 @@ static void test_DirectInputCreateEx(void) return; } - for (i = 0; i < ARRAY_SIZE(invalid_param_list); i++) + for (i = 0; i < ARRAY_SIZE(create_tests); i++) { - if (invalid_param_list[i].ppdi) pUnk = (void *)0xdeadbeef; - hr = pDirectInputCreateEx(invalid_param_list[i].hinst ? hInstance : NULL, - invalid_param_list[i].dwVersion, - invalid_param_list[i].riid, - invalid_param_list[i].ppdi ? (void **)&pUnk : NULL, - NULL); - ok(hr == invalid_param_list[i].expected_hr, "[%d] DirectInputCreateEx returned 0x%08x\n", i, hr); - if (invalid_param_list[i].ppdi) - ok(pUnk == invalid_param_list[i].expected_ppdi, "[%d] Output interface pointer is %p\n", i, pUnk); + winetest_push_context( "%u", i ); + unknown = (void *)0xdeadbeef; + hr = pDirectInputCreateEx( create_tests[i].instance, create_tests[i].version, create_tests[i].iid, + (void **)create_tests[i].out, NULL ); + todo_wine_if( version == 0x300 && i == 7 ) + ok( hr == create_tests[i].expected_hr, "DirectInputCreateEx returned %#x\n", hr ); + if (SUCCEEDED(hr)) IUnknown_Release( unknown ); + else ok( unknown == create_tests[i].expect_out, "got IUnknown %p\n", unknown ); + winetest_pop_context(); } - for (i = 0; i < ARRAY_SIZE(no_interface_list); i++) + for (i = 0; i < ARRAY_SIZE(dinput8_interfaces); i++) { - pUnk = (void *)0xdeadbeef; - hr = pDirectInputCreateEx(hInstance, DIRECTINPUT_VERSION, no_interface_list[i], (void **)&pUnk, NULL); - ok(hr == DIERR_NOINTERFACE, "[%d] DirectInputCreateEx returned 0x%08x\n", i, hr); - ok(pUnk == (void *)0xdeadbeef, "[%d] Output interface pointer is %p\n", i, pUnk); + winetest_push_context( "%u", i ); + unknown = (void *)0xdeadbeef; + hr = pDirectInputCreateEx( hInstance, version, dinput8_interfaces[i], (void **)&unknown, NULL ); + ok( hr == DIERR_NOINTERFACE, "DirectInputCreateEx returned %#x\n", hr ); + ok( unknown == (void *)0xdeadbeef, "got IUnknown %p\n", unknown ); + winetest_pop_context(); } - for (i = 0; i < ARRAY_SIZE(iid_list); i++) + for (i = 0; i < ARRAY_SIZE(dinput7_interfaces); i++) { - pUnk = NULL; - hr = pDirectInputCreateEx(hInstance, DIRECTINPUT_VERSION, iid_list[i], (void **)&pUnk, NULL); - ok(hr == DI_OK, "[%d] DirectInputCreateEx returned 0x%08x\n", i, hr); - ok(pUnk != NULL, "[%d] Output interface pointer is NULL\n", i); - if (pUnk) - IUnknown_Release(pUnk); - } - - /* Examine combinations of requested interfaces and version numbers. */ - for (i = 0; i < ARRAY_SIZE(directinput_version_list); i++) - { - for (j = 0; j < ARRAY_SIZE(iid_list); j++) - { - pUnk = NULL; - hr = pDirectInputCreateEx(hInstance, directinput_version_list[i], iid_list[j], (void **)&pUnk, NULL); - ok(hr == DI_OK, "[%d/%d] DirectInputCreateEx returned 0x%08x\n", i, j, hr); - ok(pUnk != NULL, "[%d] Output interface pointer is NULL\n", i); - if (pUnk) - IUnknown_Release(pUnk); - } + winetest_push_context( "%u", i ); + unknown = NULL; + hr = pDirectInputCreateEx( hInstance, version, dinput7_interfaces[i], (void **)&unknown, NULL ); + if (version < 0x800) ok( hr == DI_OK, "DirectInputCreateEx returned %#x\n", hr ); + else ok( hr == DIERR_OLDDIRECTINPUTVERSION, "DirectInputCreateEx returned %#x\n", hr ); + if (version < 0x800) ok( unknown != NULL, "got IUnknown NULL\n" ); + else ok( unknown == NULL, "got IUnknown %p\n", unknown ); + if (unknown) IUnknown_Release( unknown ); + winetest_pop_context(); } } -static void test_QueryInterface(void) +static void test_DirectInput8Create( DWORD version ) { - static REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInputA, &IID_IDirectInputW, - &IID_IDirectInput2A, &IID_IDirectInput2W, - &IID_IDirectInput7A, &IID_IDirectInput7W}; - - static REFIID no_interface_list[] = + IUnknown *unknown; + struct { - &IID_IDirectInput8A, - &IID_IDirectInput8W, - &IID_IDirectInputDeviceA, - &IID_IDirectInputDeviceW, - &IID_IDirectInputDevice2A, - &IID_IDirectInputDevice2W, - &IID_IDirectInputDevice7A, - &IID_IDirectInputDevice7W, - &IID_IDirectInputDevice8A, - &IID_IDirectInputDevice8W, - &IID_IDirectInputEffect, + HMODULE instance; + DWORD version; + REFIID iid; + IUnknown **out; + IUnknown *expect_out; + HRESULT expected_hr; + } create_tests[] = + { + {NULL, 0, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER}, + {NULL, 0, &IID_IDirectInputA, &unknown, NULL, DIERR_NOINTERFACE}, + {NULL, 0, &IID_IDirectInput8A, NULL, (void *)0xdeadbeef, E_POINTER}, + {NULL, 0, &IID_IDirectInput8A, &unknown, NULL, DIERR_INVALIDPARAM}, + {NULL, version, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER}, + {NULL, version, &IID_IDirectInputA, &unknown, NULL, DIERR_NOINTERFACE}, + {NULL, version, &IID_IDirectInput8A, NULL, (void *)0xdeadbeef, E_POINTER}, + {NULL, version, &IID_IDirectInput8A, &unknown, NULL, DIERR_INVALIDPARAM}, + {NULL, version - 1, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER}, + {NULL, version - 1, &IID_IDirectInputA, &unknown, NULL, DIERR_NOINTERFACE}, + {NULL, version - 1, &IID_IDirectInput8A, NULL, (void *)0xdeadbeef, E_POINTER}, + {NULL, version - 1, &IID_IDirectInput8A, &unknown, NULL, DIERR_INVALIDPARAM}, + {NULL, version + 1, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER}, + {NULL, version + 1, &IID_IDirectInputA, &unknown, NULL, DIERR_NOINTERFACE}, + {NULL, version + 1, &IID_IDirectInput8A, NULL, (void *)0xdeadbeef, E_POINTER}, + {NULL, version + 1, &IID_IDirectInput8A, &unknown, NULL, DIERR_INVALIDPARAM}, + {hInstance, 0, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER}, + {hInstance, 0, &IID_IDirectInputA, &unknown, NULL, DIERR_NOINTERFACE}, + {hInstance, 0, &IID_IDirectInput8A, NULL, (void *)0xdeadbeef, E_POINTER}, + {hInstance, 0, &IID_IDirectInput8A, &unknown, NULL, DIERR_NOTINITIALIZED}, + {hInstance, version, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER}, + {hInstance, version, &IID_IDirectInputA, &unknown, NULL, DIERR_NOINTERFACE}, + {hInstance, version, &IID_IDirectInput8A, NULL, (void *)0xdeadbeef, E_POINTER}, + {hInstance, version - 1, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER}, + {hInstance, version - 1, &IID_IDirectInputA, &unknown, NULL, DIERR_NOINTERFACE}, + {hInstance, version - 1, &IID_IDirectInput8A, NULL, (void *)0xdeadbeef, E_POINTER}, + {hInstance, version - 1, &IID_IDirectInput8A, &unknown, NULL, DIERR_BETADIRECTINPUTVERSION}, + {hInstance, version + 1, &IID_IDirectInputA, NULL, (void *)0xdeadbeef, E_POINTER}, + {hInstance, version + 1, &IID_IDirectInputA, &unknown, NULL, DIERR_NOINTERFACE}, + {hInstance, version + 1, &IID_IDirectInput8A, NULL, (void *)0xdeadbeef, E_POINTER}, + {hInstance, version + 1, &IID_IDirectInput8A, &unknown, NULL, version <= 0x700 ? DIERR_BETADIRECTINPUTVERSION : DIERR_OLDDIRECTINPUTVERSION}, }; - - IDirectInputA *pDI; HRESULT hr; - IUnknown *pUnk, *iface, *tmp_iface; int i; - hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); - if (FAILED(hr)) + for (i = 0; i < ARRAY_SIZE(create_tests); i++) { - win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); - return; + winetest_push_context( "%u", i ); + unknown = (void *)0xdeadbeef; + hr = DirectInput8Create( create_tests[i].instance, create_tests[i].version, create_tests[i].iid, + (void **)create_tests[i].out, NULL ); + ok( hr == create_tests[i].expected_hr, "DirectInput8Create returned %#x\n", hr ); + if (SUCCEEDED(hr)) IUnknown_Release( unknown ); + else ok( unknown == create_tests[i].expect_out, "got IUnknown %p\n", unknown ); + winetest_pop_context(); } - hr = IDirectInput_QueryInterface(pDI, NULL, NULL); - ok(hr == E_POINTER, "IDirectInput_QueryInterface returned 0x%08x\n", hr); - - pUnk = (void *)0xdeadbeef; - hr = IDirectInput_QueryInterface(pDI, NULL, (void **)&pUnk); - ok(hr == E_POINTER, "IDirectInput_QueryInterface returned 0x%08x\n", hr); - ok(pUnk == (void *)0xdeadbeef, "Output interface pointer is %p\n", pUnk); - - hr = IDirectInput_QueryInterface(pDI, &IID_IUnknown, NULL); - ok(hr == E_POINTER, "IDirectInput_QueryInterface returned 0x%08x\n", hr); - - for (i = 0; i < ARRAY_SIZE(iid_list); i++) + for (i = 0; i < ARRAY_SIZE(dinput7_interfaces); i++) { - pUnk = NULL; - hr = IDirectInput_QueryInterface(pDI, iid_list[i], (void **)&pUnk); - ok(hr == S_OK, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr); - ok(pUnk != NULL, "[%d] Output interface pointer is NULL\n", i); - if (pUnk) IUnknown_Release(pUnk); + winetest_push_context( "%u", i ); + unknown = (void *)0xdeadbeef; + hr = DirectInput8Create( hInstance, version, dinput7_interfaces[i], (void **)&unknown, NULL ); + ok( hr == DIERR_NOINTERFACE, "DirectInput8Create returned %#x\n", hr ); + ok( unknown == NULL, "got IUnknown %p\n", unknown ); + winetest_pop_context(); } - for (i = 0; i < ARRAY_SIZE(no_interface_list); i++) + for (i = 0; i < ARRAY_SIZE(dinput8_interfaces); i++) { - pUnk = (void *)0xdeadbeef; - hr = IDirectInput_QueryInterface(pDI, no_interface_list[i], (void **)&pUnk); - ok(hr == E_NOINTERFACE, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr); - ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); + winetest_push_context( "%u", i ); + unknown = NULL; + hr = DirectInput8Create( hInstance, version, dinput8_interfaces[i], (void **)&unknown, NULL ); + if (i == 2) ok( hr == DIERR_NOINTERFACE, "DirectInput8Create returned %#x\n", hr ); + else if (version == 0x800) ok( hr == DI_OK, "DirectInput8Create returned %#x\n", hr ); + else ok( hr == DIERR_BETADIRECTINPUTVERSION, "DirectInput8Create returned %#x\n", hr ); + if (i == 2) ok( unknown == NULL, "got IUnknown %p\n", unknown ); + else if (version == 0x800) ok( unknown != NULL, "got NULL IUnknown\n" ); + else ok( unknown == NULL, "got IUnknown %p\n", unknown ); + if (unknown) IUnknown_Release( unknown ); + winetest_pop_context(); } - - hr = IUnknown_QueryInterface( pDI, &IID_IDirectInputA, (void **)&iface ); - ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInputA) failed: %08x\n", hr ); - hr = IUnknown_QueryInterface( pDI, &IID_IDirectInput2A, (void **)&tmp_iface ); - ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput2A) failed: %08x\n", hr ); - ok( tmp_iface == iface, "IID_IDirectInput2A iface differs from IID_IDirectInputA\n" ); - IUnknown_Release( tmp_iface ); - hr = IUnknown_QueryInterface( pDI, &IID_IDirectInput7A, (void **)&tmp_iface ); - ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput7A) failed: %08x\n", hr ); - ok( tmp_iface == iface, "IID_IDirectInput7A iface differs from IID_IDirectInputA\n" ); - IUnknown_Release( tmp_iface ); - IUnknown_Release( iface ); - - hr = IUnknown_QueryInterface( pDI, &IID_IUnknown, (void **)&iface ); - ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IUnknown) failed: %08x\n", hr ); - hr = IUnknown_QueryInterface( pDI, &IID_IDirectInputW, (void **)&tmp_iface ); - ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInputW) failed: %08x\n", hr ); - ok( tmp_iface == iface, "IID_IDirectInputW iface differs from IID_IUnknown\n" ); - IUnknown_Release( tmp_iface ); - hr = IUnknown_QueryInterface( pDI, &IID_IDirectInput2W, (void **)&tmp_iface ); - ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput2W) failed: %08x\n", hr ); - ok( tmp_iface == iface, "IID_IDirectInput2W iface differs from IID_IUnknown\n" ); - IUnknown_Release( tmp_iface ); - hr = IUnknown_QueryInterface( pDI, &IID_IDirectInput7W, (void **)&tmp_iface ); - ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput7W) failed: %08x\n", hr ); - ok( tmp_iface == iface, "IID_IDirectInput7W iface differs from IID_IUnknown\n" ); - IUnknown_Release( tmp_iface ); - IUnknown_Release( iface ); - - IDirectInput_Release(pDI); } -static void test_CreateDevice(void) +static void test_QueryInterface( DWORD version ) { - IDirectInputA *pDI; + IUnknown *iface, *tmp_iface; + IDirectInputA *dinput; HRESULT hr; - IDirectInputDeviceA *pDID; + ULONG ref; + int i; - hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); - if (FAILED(hr)) + if (FAILED(hr = direct_input_create( version, &dinput ))) return; + + hr = IDirectInput_QueryInterface( dinput, NULL, NULL ); + ok( hr == E_POINTER, "QueryInterface returned 0x%08x\n", hr ); + + iface = (void *)0xdeadbeef; + hr = IDirectInput_QueryInterface( dinput, NULL, (void **)&iface ); + ok( hr == E_POINTER, "QueryInterface returned 0x%08x\n", hr ); + ok( iface == (void *)0xdeadbeef, "Output interface pointer is %p\n", iface ); + + hr = IDirectInput_QueryInterface( dinput, &IID_IUnknown, NULL ); + ok( hr == E_POINTER, "QueryInterface returned 0x%08x\n", hr ); + + hr = IDirectInput_QueryInterface( dinput, &IID_IUnknown, (void **)&iface ); + ok( hr == S_OK, "QueryInterface returned 0x%08x\n", hr ); + ok( iface != NULL, "got iface NULL\n" ); + ref = IUnknown_Release( iface ); + ok( ref == 1, "Release returned %u\n", ref ); + + for (i = 0; i < ARRAY_SIZE(dinput7_interfaces); i++) { - win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); - return; + winetest_push_context("%u", i); + iface = (void *)0xdeadbeef; + hr = IDirectInput_QueryInterface( dinput, dinput7_interfaces[i], (void **)&iface ); + if (version >= 0x800) + { + ok( hr == E_NOINTERFACE, "QueryInterface returned 0x%08x\n", hr ); + ok( iface == NULL, "got iface %p\n", iface ); + } + else + { + ok( hr == S_OK, "QueryInterface returned 0x%08x\n", hr ); + ok( iface != NULL, "got iface NULL\n" ); + ref = IUnknown_Release( iface ); + ok( ref == 1, "Release returned %u\n", ref ); + } + winetest_pop_context(); } - hr = IDirectInput_CreateDevice(pDI, NULL, NULL, NULL); - ok(hr == E_POINTER, "IDirectInput_CreateDevice returned 0x%08x\n", hr); + for (i = 0; i < ARRAY_SIZE(dinput8_interfaces); i++) + { + winetest_push_context("%u", i); + iface = (void *)0xdeadbeef; + hr = IDirectInput_QueryInterface( dinput, dinput8_interfaces[i], (void **)&iface ); + if (version < 0x800) + { + todo_wine_if(i == 2) + ok( hr == E_NOINTERFACE, "QueryInterface returned 0x%08x\n", hr ); + todo_wine_if(i == 2) + ok( iface == NULL, "got iface %p\n", iface ); + } + else + { + ok( hr == S_OK, "QueryInterface returned 0x%08x\n", hr ); + ok( iface != NULL, "got iface NULL\n" ); + ref = IUnknown_Release( iface ); + ok( ref == 1, "Release returned %u\n", ref ); + } + winetest_pop_context(); + } - pDID = (void *)0xdeadbeef; - hr = IDirectInput_CreateDevice(pDI, NULL, &pDID, NULL); - ok(hr == E_POINTER, "IDirectInput_CreateDevice returned 0x%08x\n", hr); - ok(pDID == NULL, "Output interface pointer is %p\n", pDID); + if (version < 0x800) + { + hr = IUnknown_QueryInterface( dinput, &IID_IDirectInputA, (void **)&iface ); + ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInputA) failed: %08x\n", hr ); + hr = IUnknown_QueryInterface( dinput, &IID_IDirectInput2A, (void **)&tmp_iface ); + ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput2A) failed: %08x\n", hr ); + ok( tmp_iface == iface, "IID_IDirectInput2A iface differs from IID_IDirectInputA\n" ); + IUnknown_Release( tmp_iface ); + hr = IUnknown_QueryInterface( dinput, &IID_IDirectInput7A, (void **)&tmp_iface ); + ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput7A) failed: %08x\n", hr ); + ok( tmp_iface == iface, "IID_IDirectInput7A iface differs from IID_IDirectInputA\n" ); + IUnknown_Release( tmp_iface ); + IUnknown_Release( iface ); - hr = IDirectInput_CreateDevice(pDI, &GUID_Unknown, NULL, NULL); - ok(hr == E_POINTER, "IDirectInput_CreateDevice returned 0x%08x\n", hr); + hr = IUnknown_QueryInterface( dinput, &IID_IUnknown, (void **)&iface ); + ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IUnknown) failed: %08x\n", hr ); + hr = IUnknown_QueryInterface( dinput, &IID_IDirectInputW, (void **)&tmp_iface ); + ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInputW) failed: %08x\n", hr ); + ok( tmp_iface == iface, "IID_IDirectInputW iface differs from IID_IUnknown\n" ); + IUnknown_Release( tmp_iface ); + hr = IUnknown_QueryInterface( dinput, &IID_IDirectInput2W, (void **)&tmp_iface ); + ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput2W) failed: %08x\n", hr ); + ok( tmp_iface == iface, "IID_IDirectInput2W iface differs from IID_IUnknown\n" ); + IUnknown_Release( tmp_iface ); + hr = IUnknown_QueryInterface( dinput, &IID_IDirectInput7W, (void **)&tmp_iface ); + ok( SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInput7W) failed: %08x\n", hr ); + ok( tmp_iface == iface, "IID_IDirectInput7W iface differs from IID_IUnknown\n" ); + IUnknown_Release( tmp_iface ); + IUnknown_Release( iface ); + } - pDID = (void *)0xdeadbeef; - hr = IDirectInput_CreateDevice(pDI, &GUID_Unknown, &pDID, NULL); - ok(hr == DIERR_DEVICENOTREG, "IDirectInput_CreateDevice returned 0x%08x\n", hr); - ok(pDID == NULL, "Output interface pointer is %p\n", pDID); + ref = IDirectInput_Release( dinput ); + todo_wine_if( version < 0x800 ) + ok( ref == 0, "Release returned %u\n", ref ); +} - hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, NULL, NULL); - ok(hr == E_POINTER, "IDirectInput_CreateDevice returned 0x%08x\n", hr); +static void test_CreateDevice( DWORD version ) +{ + IDirectInputDeviceA *device; + IDirectInputA *dinput; + HRESULT hr; + ULONG ref; - hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pDID, NULL); - ok(hr == DI_OK, "IDirectInput_CreateDevice returned 0x%08x\n", hr); + if (FAILED(hr = direct_input_create( version, &dinput ))) return; - IDirectInputDevice_Release(pDID); - IDirectInput_Release(pDI); + hr = IDirectInput_CreateDevice( dinput, NULL, NULL, NULL ); + ok( hr == E_POINTER, "CreateDevice returned 0x%08x\n", hr ); + + device = (void *)0xdeadbeef; + hr = IDirectInput_CreateDevice( dinput, NULL, &device, NULL ); + ok( hr == E_POINTER, "CreateDevice returned 0x%08x\n", hr ); + ok( device == NULL, "Output interface pointer is %p\n", device ); + + hr = IDirectInput_CreateDevice( dinput, &GUID_Unknown, NULL, NULL ); + ok( hr == E_POINTER, "CreateDevice returned 0x%08x\n", hr ); + + device = (void *)0xdeadbeef; + hr = IDirectInput_CreateDevice( dinput, &GUID_Unknown, &device, NULL ); + ok( hr == DIERR_DEVICENOTREG, "CreateDevice returned 0x%08x\n", hr ); + ok( device == NULL, "Output interface pointer is %p\n", device ); + + hr = IDirectInput_CreateDevice( dinput, &GUID_SysMouse, NULL, NULL ); + ok( hr == E_POINTER, "CreateDevice returned 0x%08x\n", hr ); + + hr = IDirectInput_CreateDevice( dinput, &GUID_SysMouse, &device, NULL ); + ok( hr == DI_OK, "CreateDevice returned 0x%08x\n", hr ); + + ref = IDirectInputDevice_Release( device ); + ok( ref == 0, "Release returned %u\n", ref ); + ref = IDirectInput_Release( dinput ); + ok( ref == 0, "Release returned %u\n", ref ); } struct enum_devices_test { unsigned int device_count; BOOL return_value; + DWORD version; }; +DEFINE_GUID( pidvid_product_guid, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 'P', 'I', 'D', 'V', 'I', 'D' ); + static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, void *context) { + BYTE type = GET_DIDEVICE_TYPE( instance->dwDevType ); struct enum_devices_test *enum_test = context; - if ((instance->dwDevType & 0xff) == DIDEVTYPE_KEYBOARD || - (instance->dwDevType & 0xff) == DIDEVTYPE_MOUSE) { - const char *device = ((instance->dwDevType & 0xff) == - DIDEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse"; - ok(IsEqualGUID(&instance->guidInstance, &instance->guidProduct), - "%s guidInstance (%s) does not match guidProduct (%s)\n", - device, wine_dbgstr_guid(&instance->guidInstance), - wine_dbgstr_guid(&instance->guidProduct)); + if (winetest_debug > 1) + { + trace( "---- Device Information ----\n" + "Product Name : %s\n" + "Instance Name : %s\n" + "devType : 0x%08x\n" + "GUID Product : %s\n" + "GUID Instance : %s\n" + "HID Page : 0x%04x\n" + "HID Usage : 0x%04x\n", + instance->tszProductName, instance->tszInstanceName, instance->dwDevType, + wine_dbgstr_guid( &instance->guidProduct ), + wine_dbgstr_guid( &instance->guidInstance ), instance->wUsagePage, instance->wUsage ); } - if ((instance->dwDevType & 0xff) == DIDEVTYPE_KEYBOARD) - ok(IsEqualGUID(&instance->guidProduct, &GUID_SysKeyboard), - "Keyboard guidProduct (%s) does not match GUID_SysKeyboard (%s)\n", - wine_dbgstr_guid(&instance->guidProduct), - wine_dbgstr_guid(&GUID_SysMouse)); - else if ((instance->dwDevType & 0xff) == DIDEVTYPE_MOUSE) - ok(IsEqualGUID(&instance->guidProduct, &GUID_SysMouse), - "Mouse guidProduct (%s) does not match GUID_SysMouse (%s)\n", - wine_dbgstr_guid(&instance->guidProduct), - wine_dbgstr_guid(&GUID_SysMouse)); - else { - /* Non-keyboard/mouse devices use the "PIDVID" guidProduct */ - static const GUID pidvid_product_guid = { /* device_pidvid-0000-0000-0000-504944564944 "PIDVID" */ - 0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} - }; + if (enum_test->version >= 0x800) + { + if (type == DI8DEVTYPE_KEYBOARD || type == DI8DEVTYPE_MOUSE) + { + const char *device = (type == DI8DEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse"; + ok( IsEqualGUID( &instance->guidInstance, &instance->guidProduct ), + "%s guidInstance (%s) does not match guidProduct (%s)\n", device, + wine_dbgstr_guid( &instance->guidInstance ), wine_dbgstr_guid( &instance->guidProduct ) ); + } + } + else + { + if (type == DIDEVTYPE_KEYBOARD || type == DIDEVTYPE_MOUSE) + { + const char *device = (type == DIDEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse"; + ok( IsEqualGUID( &instance->guidInstance, &instance->guidProduct ), + "%s guidInstance (%s) does not match guidProduct (%s)\n", device, + wine_dbgstr_guid( &instance->guidInstance ), wine_dbgstr_guid( &instance->guidProduct ) ); + } - ok(instance->guidProduct.Data2 == pidvid_product_guid.Data2, - "guidProduct.Data2 is %04x\n", instance->guidProduct.Data2); - ok(instance->guidProduct.Data3 == pidvid_product_guid.Data3, - "guidProduct.Data3 is %04x\n", instance->guidProduct.Data3); - ok(!memcmp(instance->guidProduct.Data4, pidvid_product_guid.Data4, sizeof(pidvid_product_guid.Data4)), - "guidProduct.Data4 does not match: %s\n", wine_dbgstr_guid(&instance->guidProduct)); + if (type == DIDEVTYPE_KEYBOARD) + ok( IsEqualGUID( &instance->guidProduct, &GUID_SysKeyboard ), + "Keyboard guidProduct (%s) does not match GUID_SysKeyboard (%s)\n", + wine_dbgstr_guid( &instance->guidProduct ), wine_dbgstr_guid( &GUID_SysMouse ) ); + else if (type == DIDEVTYPE_MOUSE) + ok( IsEqualGUID( &instance->guidProduct, &GUID_SysMouse ), + "Mouse guidProduct (%s) does not match GUID_SysMouse (%s)\n", + wine_dbgstr_guid( &instance->guidProduct ), wine_dbgstr_guid( &GUID_SysMouse ) ); + else + { + ok( instance->guidProduct.Data2 == pidvid_product_guid.Data2, + "guidProduct.Data2 is %04x\n", instance->guidProduct.Data2 ); + ok( instance->guidProduct.Data3 == pidvid_product_guid.Data3, + "guidProduct.Data3 is %04x\n", instance->guidProduct.Data3 ); + ok( !memcmp( instance->guidProduct.Data4, pidvid_product_guid.Data4, + sizeof(pidvid_product_guid.Data4) ), + "guidProduct.Data4 does not match: %s\n", wine_dbgstr_guid( &instance->guidProduct ) ); + } } enum_test->device_count++; return enum_test->return_value; } -static void test_EnumDevices(void) +static void test_EnumDevices( DWORD version ) { - IDirectInputA *pDI; + struct enum_devices_test enum_test = {.version = version}, enum_test_return = {.version = version}; + IDirectInputA *dinput; HRESULT hr; - struct enum_devices_test enum_test, enum_test_return; + ULONG ref; - hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); - if (FAILED(hr)) - { - win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); - return; - } + if (FAILED(hr = direct_input_create( version, &dinput ))) return; - hr = IDirectInput_EnumDevices(pDI, 0, NULL, NULL, 0); - ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + hr = IDirectInput_EnumDevices( dinput, 0, NULL, NULL, 0 ); + ok( hr == DIERR_INVALIDPARAM, "EnumDevices returned 0x%08x\n", hr ); - hr = IDirectInput_EnumDevices(pDI, 0, NULL, NULL, ~0u); - ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + hr = IDirectInput_EnumDevices( dinput, 0, NULL, NULL, ~0u ); + ok( hr == DIERR_INVALIDPARAM, "EnumDevices returned 0x%08x\n", hr ); /* Test crashes on Wine. */ if (0) { - hr = IDirectInput_EnumDevices(pDI, 0, enum_devices_callback, NULL, ~0u); - ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + hr = IDirectInput_EnumDevices( dinput, 0, enum_devices_callback, NULL, ~0u ); + ok( hr == DIERR_INVALIDPARAM, "EnumDevices returned 0x%08x\n", hr ); } - hr = IDirectInput_EnumDevices(pDI, 0xdeadbeef, NULL, NULL, 0); - ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + hr = IDirectInput_EnumDevices( dinput, 0xdeadbeef, NULL, NULL, 0 ); + ok( hr == DIERR_INVALIDPARAM, "EnumDevices returned 0x%08x\n", hr ); - hr = IDirectInput_EnumDevices(pDI, 0xdeadbeef, NULL, NULL, ~0u); - ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + hr = IDirectInput_EnumDevices( dinput, 0xdeadbeef, NULL, NULL, ~0u ); + ok( hr == DIERR_INVALIDPARAM, "EnumDevices returned 0x%08x\n", hr ); - hr = IDirectInput_EnumDevices(pDI, 0xdeadbeef, enum_devices_callback, NULL, 0); - ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + hr = IDirectInput_EnumDevices( dinput, 0xdeadbeef, enum_devices_callback, NULL, 0 ); + ok( hr == DIERR_INVALIDPARAM, "EnumDevices returned 0x%08x\n", hr ); - hr = IDirectInput_EnumDevices(pDI, 0xdeadbeef, enum_devices_callback, NULL, ~0u); - ok(hr == DIERR_INVALIDPARAM, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + hr = IDirectInput_EnumDevices( dinput, 0xdeadbeef, enum_devices_callback, NULL, ~0u ); + ok( hr == DIERR_INVALIDPARAM, "EnumDevices returned 0x%08x\n", hr ); enum_test.device_count = 0; enum_test.return_value = DIENUM_CONTINUE; - hr = IDirectInput_EnumDevices(pDI, 0, enum_devices_callback, &enum_test, 0); - ok(hr == DI_OK, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + hr = IDirectInput_EnumDevices( dinput, 0, enum_devices_callback, &enum_test, 0 ); + ok( hr == DI_OK, "EnumDevices returned 0x%08x\n", hr ); ok(enum_test.device_count != 0, "Device count is %u\n", enum_test.device_count); /* Enumeration only stops with an explicit DIENUM_STOP. */ enum_test_return.device_count = 0; enum_test_return.return_value = 42; - hr = IDirectInput_EnumDevices(pDI, 0, enum_devices_callback, &enum_test_return, 0); - ok(hr == DI_OK, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + hr = IDirectInput_EnumDevices( dinput, 0, enum_devices_callback, &enum_test_return, 0 ); + ok( hr == DI_OK, "EnumDevices returned 0x%08x\n", hr ); ok(enum_test_return.device_count == enum_test.device_count, "Device count is %u vs. %u\n", enum_test_return.device_count, enum_test.device_count); enum_test.device_count = 0; enum_test.return_value = DIENUM_STOP; - hr = IDirectInput_EnumDevices(pDI, 0, enum_devices_callback, &enum_test, 0); - ok(hr == DI_OK, "IDirectInput_EnumDevices returned 0x%08x\n", hr); + hr = IDirectInput_EnumDevices( dinput, 0, enum_devices_callback, &enum_test, 0 ); + ok( hr == DI_OK, "EnumDevices returned 0x%08x\n", hr ); ok(enum_test.device_count == 1, "Device count is %u\n", enum_test.device_count); - IDirectInput_Release(pDI); + ref = IDirectInput_Release( dinput ); + ok( ref == 0, "Release returned %u\n", ref ); } -static void test_GetDeviceStatus(void) +static void test_GetDeviceStatus( DWORD version ) { - IDirectInputA *pDI; + IDirectInputA *dinput; HRESULT hr; + ULONG ref; - hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); - if (FAILED(hr)) - { - win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); - return; - } + if (FAILED(hr = direct_input_create( version, &dinput ))) return; - hr = IDirectInput_GetDeviceStatus(pDI, NULL); - ok(hr == E_POINTER, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr); + hr = IDirectInput_GetDeviceStatus( dinput, NULL ); + ok( hr == E_POINTER, "GetDeviceStatus returned %#x\n", hr ); - hr = IDirectInput_GetDeviceStatus(pDI, &GUID_Unknown); + hr = IDirectInput_GetDeviceStatus( dinput, &GUID_Unknown ); todo_wine - ok(hr == DIERR_DEVICENOTREG, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr); + ok( hr == DIERR_DEVICENOTREG, "GetDeviceStatus returned %#x\n", hr ); - hr = IDirectInput_GetDeviceStatus(pDI, &GUID_SysMouse); - ok(hr == DI_OK, "IDirectInput_GetDeviceStatus returned 0x%08x\n", hr); + hr = IDirectInput_GetDeviceStatus( dinput, &GUID_SysMouse ); + ok( hr == DI_OK, "GetDeviceStatus returned %#x\n", hr ); - IDirectInput_Release(pDI); + ref = IDirectInput_Release( dinput ); + ok( ref == 0, "Release returned %u\n", ref ); } -static void test_Initialize(void) +static void test_Initialize( DWORD version ) { - IDirectInputA *pDI; + IDirectInputA *dinput; HRESULT hr; - int i; + ULONG ref; - hr = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInputA, (void **)&pDI); - if (FAILED(hr)) - { - win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); - return; - } + if (FAILED(hr = direct_input_create( version, &dinput ))) return; - hr = IDirectInput_Initialize(pDI, NULL, 0); - ok(hr == DIERR_INVALIDPARAM, "IDirectInput_Initialize returned 0x%08x\n", hr); + hr = IDirectInput_Initialize( dinput, NULL, 0 ); + ok( hr == DIERR_INVALIDPARAM, "Initialize returned %#x\n", hr ); - hr = IDirectInput_Initialize(pDI, NULL, DIRECTINPUT_VERSION); - ok(hr == DIERR_INVALIDPARAM, "IDirectInput_Initialize returned 0x%08x\n", hr); + hr = IDirectInput_Initialize( dinput, NULL, version ); + if (version == 0x300) todo_wine ok( hr == S_OK, "Initialize returned %#x\n", hr ); + else ok( hr == DIERR_INVALIDPARAM, "Initialize returned %#x\n", hr ); - hr = IDirectInput_Initialize(pDI, hInstance, 0); - ok(hr == DIERR_NOTINITIALIZED, "IDirectInput_Initialize returned 0x%08x\n", hr); + hr = IDirectInput_Initialize( dinput, hInstance, 0 ); + ok( hr == DIERR_NOTINITIALIZED, "Initialize returned %#x\n", hr ); - /* Invalid DirectInput versions less than 0x0700 yield DIERR_BETADIRECTINPUTVERSION. */ - hr = IDirectInput_Initialize(pDI, hInstance, 0x0123); - ok(hr == DIERR_BETADIRECTINPUTVERSION, "IDirectInput_Initialize returned 0x%08x\n", hr); + hr = IDirectInput_Initialize( dinput, hInstance, version - 1 ); + ok( hr == DIERR_BETADIRECTINPUTVERSION, "Initialize returned %#x\n", hr ); - /* Invalid DirectInput versions greater than 0x0700 yield DIERR_BETADIRECTINPUTVERSION. */ - hr = IDirectInput_Initialize(pDI, hInstance, 0xcafe); - ok(hr == DIERR_OLDDIRECTINPUTVERSION, "IDirectInput_Initialize returned 0x%08x\n", hr); - - for (i = 0; i < ARRAY_SIZE(directinput_version_list); i++) - { - hr = IDirectInput_Initialize(pDI, hInstance, directinput_version_list[i]); - ok(hr == DI_OK, "IDirectInput_Initialize returned 0x%08x\n", hr); - } + hr = IDirectInput_Initialize( dinput, hInstance, version + 1 ); + if (version >= 0x700) ok( hr == DIERR_OLDDIRECTINPUTVERSION, "Initialize returned %#x\n", hr ); + else ok( hr == DIERR_BETADIRECTINPUTVERSION, "Initialize returned %#x\n", hr ); /* Parameters are still validated after successful initialization. */ - hr = IDirectInput_Initialize(pDI, hInstance, 0); - ok(hr == DIERR_NOTINITIALIZED, "IDirectInput_Initialize returned 0x%08x\n", hr); + hr = IDirectInput_Initialize( dinput, hInstance, 0 ); + ok( hr == DIERR_NOTINITIALIZED, "Initialize returned %#x\n", hr ); - IDirectInput_Release(pDI); + ref = IDirectInput_Release( dinput ); + ok( ref == 0, "Release returned %u\n", ref ); } -static void test_RunControlPanel(void) +static void test_RunControlPanel( DWORD version ) { - IDirectInputA *pDI; + IDirectInputA *dinput; HRESULT hr; + ULONG ref; - hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); - if (FAILED(hr)) - { - win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); - return; - } + if (FAILED(hr = direct_input_create( version, &dinput ))) return; if (winetest_interactive) { - hr = IDirectInput_RunControlPanel(pDI, NULL, 0); - ok(hr == S_OK, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + hr = IDirectInput_RunControlPanel( dinput, NULL, 0 ); + ok( hr == S_OK, "RunControlPanel returned %#x\n", hr ); - hr = IDirectInput_RunControlPanel(pDI, GetDesktopWindow(), 0); - ok(hr == S_OK, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + hr = IDirectInput_RunControlPanel( dinput, GetDesktopWindow(), 0 ); + ok( hr == S_OK, "RunControlPanel returned %#x\n", hr ); } - hr = IDirectInput_RunControlPanel(pDI, NULL, ~0u); - ok(hr == DIERR_INVALIDPARAM, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + hr = IDirectInput_RunControlPanel( dinput, NULL, ~0u ); + ok( hr == DIERR_INVALIDPARAM, "RunControlPanel returned %#x\n", hr ); - hr = IDirectInput_RunControlPanel(pDI, (HWND)0xdeadbeef, 0); - ok(hr == E_HANDLE, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + hr = IDirectInput_RunControlPanel( dinput, (HWND)0xdeadbeef, 0 ); + ok( hr == E_HANDLE, "RunControlPanel returned %#x\n", hr ); - hr = IDirectInput_RunControlPanel(pDI, (HWND)0xdeadbeef, ~0u); - ok(hr == E_HANDLE, "IDirectInput_RunControlPanel returned 0x%08x\n", hr); + hr = IDirectInput_RunControlPanel( dinput, (HWND)0xdeadbeef, ~0u ); + ok( hr == E_HANDLE, "RunControlPanel returned %#x\n", hr ); - IDirectInput_Release(pDI); + ref = IDirectInput_Release( dinput ); + ok( ref == 0, "Release returned %u\n", ref ); } static void test_DirectInputJoyConfig8(void) @@ -644,7 +790,7 @@ static void test_DirectInputJoyConfig8(void) if (SUCCEEDED(hr)) { hr = IDirectInput_CreateDevice(pDI, &info.guidInstance, &pDID, NULL); - ok (SUCCEEDED(hr), "IDirectInput_CreateDevice failed with guid from GetConfig hr = 0x%08x\n", hr); + ok( SUCCEEDED(hr), "CreateDevice failed with guid from GetConfig hr = 0x%08x\n", hr ); IDirectInputDevice_Release(pDID); } } @@ -653,23 +799,227 @@ static void test_DirectInputJoyConfig8(void) IDirectInput_Release(pDI); } +struct enum_semantics_test +{ + unsigned int device_count; + DWORD first_remaining; + BOOL mouse; + BOOL keyboard; + DIACTIONFORMATA *action_format; + const char *username; +}; + +static DIACTIONA actionMapping[] = { + /* axis */ + {0, 0x01008A01 /* DIAXIS_DRIVINGR_STEER */, 0, {"Steer.\0"}}, + /* button */ + {1, 0x01000C01 /* DIBUTTON_DRIVINGR_SHIFTUP */, 0, {"Upshift.\0"}}, + /* keyboard key */ + {2, DIKEYBOARD_SPACE, 0, {"Missile.\0"}}, + /* mouse button */ + {3, DIMOUSE_BUTTON0, 0, {"Select\0"}}, + /* mouse axis */ + {4, DIMOUSE_YAXIS, 0, {"Y Axis\0"}}}; +/* By placing the memory pointed to by lptszActionName right before memory with PAGE_NOACCESS + * one can find out that the regular ansi string termination is not respected by + * EnumDevicesBySemantics. Adding a double termination, making it a valid wide string termination, + * made the test succeed. Therefore it looks like ansi version of EnumDevicesBySemantics forwards + * the string to the wide variant without conversation. */ + +static BOOL CALLBACK enum_semantics_callback( const DIDEVICEINSTANCEA *lpddi, IDirectInputDevice8A *lpdid, + DWORD dwFlags, DWORD dwRemaining, void *context ) +{ + struct enum_semantics_test *data = context; + + if (context == NULL) return DIENUM_STOP; + + if (!data->device_count) + { + data->first_remaining = dwRemaining; + } + ok( dwRemaining == data->first_remaining - data->device_count, + "enum semantics remaining devices is wrong, expected %d, had %d\n", + data->first_remaining - data->device_count, dwRemaining ); + data->device_count++; + + if (IsEqualGUID( &lpddi->guidInstance, &GUID_SysKeyboard )) data->keyboard = TRUE; + + if (IsEqualGUID( &lpddi->guidInstance, &GUID_SysMouse )) data->mouse = TRUE; + + return DIENUM_CONTINUE; +} + +static BOOL CALLBACK set_action_map_callback( const DIDEVICEINSTANCEA *lpddi, IDirectInputDevice8A *lpdid, + DWORD dwFlags, DWORD dwRemaining, void *context ) +{ + HRESULT hr; + struct enum_semantics_test *data = context; + + /* Building and setting an action map */ + /* It should not use any pre-stored mappings so we use DIDBAM_INITIALIZE */ + hr = IDirectInputDevice8_BuildActionMap( lpdid, data->action_format, NULL, DIDBAM_INITIALIZE ); + ok( SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr ); + + hr = IDirectInputDevice8_SetActionMap( lpdid, data->action_format, data->username, 0 ); + ok( SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr ); + + return DIENUM_CONTINUE; +} + +static void test_EnumDevicesBySemantics(void) +{ + DIACTIONFORMATA action_format; + const GUID ACTION_MAPPING_GUID = {0x1, 0x2, 0x3, {0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb}}; + struct enum_semantics_test data = {0, 0, FALSE, FALSE, &action_format, NULL}; + IDirectInput8A *dinput; + int device_total = 0; + HRESULT hr; + + hr = DirectInput8Create( hInstance, 0x800, &IID_IDirectInput8A, (void **)&dinput, NULL ); + if (FAILED(hr)) + { + win_skip( "Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr ); + return; + } + + memset( &action_format, 0, sizeof(action_format) ); + action_format.dwSize = sizeof(action_format); + action_format.dwActionSize = sizeof(DIACTIONA); + action_format.dwNumActions = ARRAY_SIZE(actionMapping); + action_format.dwDataSize = 4 * action_format.dwNumActions; + action_format.rgoAction = actionMapping; + action_format.guidActionMap = ACTION_MAPPING_GUID; + action_format.dwGenre = 0x01000000; /* DIVIRTUAL_DRIVING_RACE */ + action_format.dwBufferSize = 32; + + /* Test enumerating all attached and installed devices */ + data.keyboard = FALSE; + data.mouse = FALSE; + data.device_count = 0; + hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, enum_semantics_callback, + &data, DIEDBSFL_ATTACHEDONLY ); + ok( data.device_count > 0, "EnumDevicesBySemantics did not call the callback hr=%08x\n", hr ); + ok( data.keyboard, "EnumDevicesBySemantics should enumerate the keyboard\n" ); + ok( data.mouse, "EnumDevicesBySemantics should enumerate the mouse\n" ); + + /* Enumerate Force feedback devices. We should get no mouse nor keyboard */ + data.keyboard = FALSE; + data.mouse = FALSE; + data.device_count = 0; + hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, enum_semantics_callback, + &data, DIEDBSFL_FORCEFEEDBACK ); + ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr ); + ok( !data.keyboard, "Keyboard should not be enumerated when asking for forcefeedback\n" ); + ok( !data.mouse, "Mouse should not be enumerated when asking for forcefeedback\n" ); + + /* Enumerate available devices. That is devices not owned by any user. + Before setting the action map for all devices we still have them available. */ + data.device_count = 0; + hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, enum_semantics_callback, + &data, DIEDBSFL_AVAILABLEDEVICES ); + ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr ); + ok( data.device_count > 0, + "There should be devices available before action mapping available=%d\n", data.device_count ); + + /* Keep the device total */ + device_total = data.device_count; + + /* There should be no devices for any user. No device should be enumerated with DIEDBSFL_THISUSER. + MSDN defines that all unowned devices are also enumerated but this doesn't seem to be happening. */ + data.device_count = 0; + hr = IDirectInput8_EnumDevicesBySemantics( dinput, "Sh4d0w M4g3", &action_format, + enum_semantics_callback, &data, DIEDBSFL_THISUSER ); + ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr ); + ok( data.device_count == 0, "No devices should be assigned for this user assigned=%d\n", data.device_count ); + + /* This enumeration builds and sets the action map for all devices with a NULL username */ + hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, set_action_map_callback, + &data, DIEDBSFL_ATTACHEDONLY ); + ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr ); + + /* After a successful action mapping we should have no devices available */ + data.device_count = 0; + hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, enum_semantics_callback, + &data, DIEDBSFL_AVAILABLEDEVICES ); + ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr ); + ok( data.device_count == 0, "No device should be available after action mapping available=%d\n", + data.device_count ); + + /* Now we'll give all the devices to a specific user */ + data.username = "Sh4d0w M4g3"; + hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, set_action_map_callback, + &data, DIEDBSFL_ATTACHEDONLY ); + ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr ); + + /* Testing with the default user, DIEDBSFL_THISUSER has no effect */ + data.device_count = 0; + hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, + enum_semantics_callback, &data, DIEDBSFL_THISUSER ); + ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr ); + ok( data.device_count == device_total, "THISUSER has no effect with NULL username owned=%d, expected=%d\n", + data.device_count, device_total ); + + /* Using an empty user string is the same as passing NULL, DIEDBSFL_THISUSER has no effect */ + data.device_count = 0; + hr = IDirectInput8_EnumDevicesBySemantics( dinput, "", &action_format, enum_semantics_callback, &data, DIEDBSFL_THISUSER ); + ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr ); + ok( data.device_count == device_total, "THISUSER has no effect with \"\" as username owned=%d, expected=%d\n", + data.device_count, device_total ); + + /* Testing with a user with no ownership of the devices */ + data.device_count = 0; + hr = IDirectInput8_EnumDevicesBySemantics( dinput, "Ninja Brian", &action_format, + enum_semantics_callback, &data, DIEDBSFL_THISUSER ); + ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr ); + ok( data.device_count == 0, "This user should own no devices owned=%d\n", data.device_count ); + + /* Sh4d0w M4g3 has ownership of all devices */ + data.device_count = 0; + hr = IDirectInput8_EnumDevicesBySemantics( dinput, "Sh4d0w M4g3", &action_format, + enum_semantics_callback, &data, DIEDBSFL_THISUSER ); + ok( SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr ); + ok( data.device_count == device_total, "This user should own %d devices owned=%d\n", + device_total, data.device_count ); + + /* The call fails with a zeroed GUID */ + memset( &action_format.guidActionMap, 0, sizeof(GUID) ); + data.device_count = 0; + hr = IDirectInput8_EnumDevicesBySemantics( dinput, NULL, &action_format, enum_semantics_callback, NULL, 0 ); + todo_wine + ok( FAILED(hr), "EnumDevicesBySemantics succeeded with invalid GUID hr=%08x\n", hr ); + + IDirectInput8_Release( dinput ); +} + START_TEST(dinput) { HMODULE dinput_mod = GetModuleHandleA("dinput.dll"); + DWORD i; hInstance = GetModuleHandleA(NULL); pDirectInputCreateEx = (void *)GetProcAddress(dinput_mod, "DirectInputCreateEx"); - CoInitialize(NULL); - test_preinitialization(); - test_DirectInputCreateEx(); - test_QueryInterface(); - test_CreateDevice(); - test_EnumDevices(); - test_GetDeviceStatus(); - test_Initialize(); - test_RunControlPanel(); - test_DirectInputJoyConfig8(); + CoInitialize( NULL ); + test_CoCreateInstance( 0x700 ); + test_CoCreateInstance( 0x800 ); CoUninitialize(); + + for (i = 0; i < ARRAY_SIZE(dinput_versions); i++) + { + winetest_push_context( "%#x", dinput_versions[i] ); + test_DirectInputCreate( dinput_versions[i] ); + test_DirectInputCreateEx( dinput_versions[i] ); + test_DirectInput8Create( dinput_versions[i] ); + test_QueryInterface( dinput_versions[i] ); + test_CreateDevice( dinput_versions[i] ); + test_EnumDevices( dinput_versions[i] ); + test_GetDeviceStatus( dinput_versions[i] ); + test_RunControlPanel( dinput_versions[i] ); + test_Initialize( dinput_versions[i] ); + winetest_pop_context(); + } + + test_DirectInputJoyConfig8(); + test_EnumDevicesBySemantics(); } diff --git a/dlls/dinput/tests/dinput8.c b/dlls/dinput/tests/dinput8.c deleted file mode 100644 index 81aeb8191f6..00000000000 --- a/dlls/dinput/tests/dinput8.c +++ /dev/null @@ -1,728 +0,0 @@ -/* - * Copyright (c) 2011 Andrew Nguyen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#define DIRECTINPUT_VERSION 0x0800 - -#define COBJMACROS -#include <windows.h> -#include <objidl.h> - -#include <dinput.h> -#include <dinputd.h> - -#include "wine/test.h" - -static HINSTANCE hInstance; - -static BOOL CALLBACK dummy_callback(const DIDEVICEINSTANCEA *instance, void *context) -{ - ok(0, "Callback was invoked with parameters (%p, %p)\n", instance, context); - return DIENUM_STOP; -} - -static void test_preinitialization(void) -{ - static const struct - { - REFGUID rguid; - BOOL pdev; - HRESULT expected_hr; - } create_device_tests[] = - { - {NULL, FALSE, E_POINTER}, - {NULL, TRUE, E_POINTER}, - {&GUID_Unknown, FALSE, E_POINTER}, - {&GUID_Unknown, TRUE, DIERR_NOTINITIALIZED}, - {&GUID_SysMouse, FALSE, E_POINTER}, - {&GUID_SysMouse, TRUE, DIERR_NOTINITIALIZED}, - }; - - static const struct - { - DWORD dwDevType; - LPDIENUMDEVICESCALLBACKA lpCallback; - DWORD dwFlags; - HRESULT expected_hr; - int todo; - } enum_devices_tests[] = - { - {0, NULL, 0, DIERR_INVALIDPARAM}, - {0, NULL, ~0u, DIERR_INVALIDPARAM}, - {0, dummy_callback, 0, DIERR_NOTINITIALIZED}, - {0, dummy_callback, ~0u, DIERR_INVALIDPARAM}, - {0xdeadbeef, NULL, 0, DIERR_INVALIDPARAM}, - {0xdeadbeef, NULL, ~0u, DIERR_INVALIDPARAM}, - {0xdeadbeef, dummy_callback, 0, DIERR_INVALIDPARAM}, - {0xdeadbeef, dummy_callback, ~0u, DIERR_INVALIDPARAM}, - }; - - IDirectInput8A *pDI; - HRESULT hr; - int i; - IDirectInputDevice8A *pDID; - - hr = CoCreateInstance(&CLSID_DirectInput8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInput8A, (void **)&pDI); - if (FAILED(hr)) - { - skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); - return; - } - - for (i = 0; i < ARRAY_SIZE(create_device_tests); i++) - { - if (create_device_tests[i].pdev) pDID = (void *)0xdeadbeef; - hr = IDirectInput8_CreateDevice(pDI, create_device_tests[i].rguid, - create_device_tests[i].pdev ? &pDID : NULL, - NULL); - ok(hr == create_device_tests[i].expected_hr, "[%d] IDirectInput8_CreateDevice returned 0x%08x\n", i, hr); - if (create_device_tests[i].pdev) - ok(pDID == NULL, "[%d] Output interface pointer is %p\n", i, pDID); - } - - for (i = 0; i < ARRAY_SIZE(enum_devices_tests); i++) - { - hr = IDirectInput8_EnumDevices(pDI, enum_devices_tests[i].dwDevType, - enum_devices_tests[i].lpCallback, - NULL, - enum_devices_tests[i].dwFlags); - todo_wine_if(enum_devices_tests[i].todo) - ok(hr == enum_devices_tests[i].expected_hr, "[%d] IDirectInput8_EnumDevice returned 0x%08x\n", i, hr); - } - - hr = IDirectInput8_GetDeviceStatus(pDI, NULL); - ok(hr == E_POINTER, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr); - - hr = IDirectInput8_GetDeviceStatus(pDI, &GUID_Unknown); - ok(hr == DIERR_NOTINITIALIZED, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr); - - hr = IDirectInput8_GetDeviceStatus(pDI, &GUID_SysMouse); - ok(hr == DIERR_NOTINITIALIZED, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr); - - hr = IDirectInput8_RunControlPanel(pDI, NULL, 0); - ok(hr == DIERR_NOTINITIALIZED, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr); - - hr = IDirectInput8_RunControlPanel(pDI, NULL, ~0u); - ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr); - - hr = IDirectInput8_RunControlPanel(pDI, (HWND)0xdeadbeef, 0); - ok(hr == E_HANDLE, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr); - - hr = IDirectInput8_RunControlPanel(pDI, (HWND)0xdeadbeef, ~0u); - ok(hr == E_HANDLE, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr); - - IDirectInput8_Release(pDI); -} - -static void test_DirectInput8Create(void) -{ - static const struct - { - BOOL hinst; - DWORD dwVersion; - REFIID riid; - BOOL ppdi; - HRESULT expected_hr; - } invalid_param_list[] = - { - {FALSE, 0, &IID_IDirectInputA, FALSE, E_POINTER}, - {FALSE, 0, &IID_IDirectInputA, TRUE, DIERR_NOINTERFACE}, - {FALSE, 0, &IID_IDirectInput8A, FALSE, E_POINTER}, - {FALSE, 0, &IID_IDirectInput8A, TRUE, DIERR_INVALIDPARAM}, - {FALSE, DIRECTINPUT_VERSION, &IID_IDirectInputA, FALSE, E_POINTER}, - {FALSE, DIRECTINPUT_VERSION, &IID_IDirectInputA, TRUE, DIERR_NOINTERFACE}, - {FALSE, DIRECTINPUT_VERSION, &IID_IDirectInput8A, FALSE, E_POINTER}, - {FALSE, DIRECTINPUT_VERSION, &IID_IDirectInput8A, TRUE, DIERR_INVALIDPARAM}, - {FALSE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, FALSE, E_POINTER}, - {FALSE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, TRUE, DIERR_NOINTERFACE}, - {FALSE, DIRECTINPUT_VERSION - 1, &IID_IDirectInput8A, FALSE, E_POINTER}, - {FALSE, DIRECTINPUT_VERSION - 1, &IID_IDirectInput8A, TRUE, DIERR_INVALIDPARAM}, - {FALSE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, FALSE, E_POINTER}, - {FALSE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, TRUE, DIERR_NOINTERFACE}, - {FALSE, DIRECTINPUT_VERSION + 1, &IID_IDirectInput8A, FALSE, E_POINTER}, - {FALSE, DIRECTINPUT_VERSION + 1, &IID_IDirectInput8A, TRUE, DIERR_INVALIDPARAM}, - {TRUE, 0, &IID_IDirectInputA, FALSE, E_POINTER}, - {TRUE, 0, &IID_IDirectInputA, TRUE, DIERR_NOINTERFACE}, - {TRUE, 0, &IID_IDirectInput8A, FALSE, E_POINTER}, - {TRUE, 0, &IID_IDirectInput8A, TRUE, DIERR_NOTINITIALIZED}, - {TRUE, DIRECTINPUT_VERSION, &IID_IDirectInputA, FALSE, E_POINTER}, - {TRUE, DIRECTINPUT_VERSION, &IID_IDirectInputA, TRUE, DIERR_NOINTERFACE}, - {TRUE, DIRECTINPUT_VERSION, &IID_IDirectInput8A, FALSE, E_POINTER}, - {TRUE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, FALSE, E_POINTER}, - {TRUE, DIRECTINPUT_VERSION - 1, &IID_IDirectInputA, TRUE, DIERR_NOINTERFACE}, - {TRUE, DIRECTINPUT_VERSION - 1, &IID_IDirectInput8A, FALSE, E_POINTER}, - {TRUE, DIRECTINPUT_VERSION - 1, &IID_IDirectInput8A, TRUE, DIERR_BETADIRECTINPUTVERSION}, - {TRUE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, FALSE, E_POINTER}, - {TRUE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, TRUE, DIERR_NOINTERFACE}, - {TRUE, DIRECTINPUT_VERSION + 1, &IID_IDirectInput8A, FALSE, E_POINTER}, - {TRUE, DIRECTINPUT_VERSION + 1, &IID_IDirectInput8A, TRUE, DIERR_OLDDIRECTINPUTVERSION}, - }; - - static REFIID no_interface_list[] = {&IID_IDirectInputA, &IID_IDirectInputW, - &IID_IDirectInput2A, &IID_IDirectInput2W, - &IID_IDirectInput7A, &IID_IDirectInput7W, - &IID_IDirectInputDeviceA, &IID_IDirectInputDeviceW, - &IID_IDirectInputDevice2A, &IID_IDirectInputDevice2W, - &IID_IDirectInputDevice7A, &IID_IDirectInputDevice7W, - &IID_IDirectInputDevice8A, &IID_IDirectInputDevice8W, - &IID_IDirectInputEffect}; - - static REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInput8A, &IID_IDirectInput8W}; - - int i; - IUnknown *pUnk; - HRESULT hr; - - for (i = 0; i < ARRAY_SIZE(invalid_param_list); i++) - { - if (invalid_param_list[i].ppdi) pUnk = (void *)0xdeadbeef; - hr = DirectInput8Create(invalid_param_list[i].hinst ? hInstance : NULL, - invalid_param_list[i].dwVersion, - invalid_param_list[i].riid, - invalid_param_list[i].ppdi ? (void **)&pUnk : NULL, - NULL); - ok(hr == invalid_param_list[i].expected_hr, "[%d] DirectInput8Create returned 0x%08x\n", i, hr); - if (invalid_param_list[i].ppdi) - ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); - } - - for (i = 0; i < ARRAY_SIZE(no_interface_list); i++) - { - pUnk = (void *)0xdeadbeef; - hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, no_interface_list[i], (void **)&pUnk, NULL); - ok(hr == DIERR_NOINTERFACE, "[%d] DirectInput8Create returned 0x%08x\n", i, hr); - ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); - } - - for (i = 0; i < ARRAY_SIZE(iid_list); i++) - { - pUnk = NULL; - hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, iid_list[i], (void **)&pUnk, NULL); - ok(hr == DI_OK, "[%d] DirectInput8Create returned 0x%08x\n", i, hr); - ok(pUnk != NULL, "[%d] Output interface pointer is NULL\n", i); - if (pUnk) - IUnknown_Release(pUnk); - } -} - -static void test_QueryInterface(void) -{ - static REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInput8A, &IID_IDirectInput8W, &IID_IDirectInputJoyConfig8}; - - static REFIID no_interface_list[] = - { - &IID_IDirectInputA, - &IID_IDirectInputW, - &IID_IDirectInput2A, - &IID_IDirectInput2W, - &IID_IDirectInput7A, - &IID_IDirectInput7W, - &IID_IDirectInputDeviceA, - &IID_IDirectInputDeviceW, - &IID_IDirectInputDevice2A, - &IID_IDirectInputDevice2W, - &IID_IDirectInputDevice7A, - &IID_IDirectInputDevice7W, - &IID_IDirectInputDevice8A, - &IID_IDirectInputDevice8W, - &IID_IDirectInputEffect, - }; - - IDirectInput8A *pDI; - HRESULT hr; - IUnknown *pUnk; - int i; - - hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, &IID_IDirectInput8A, (void **)&pDI, NULL); - if (FAILED(hr)) - { - win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); - return; - } - - hr = IDirectInput8_QueryInterface(pDI, NULL, NULL); - ok(hr == E_POINTER, "IDirectInput8_QueryInterface returned 0x%08x\n", hr); - - pUnk = (void *)0xdeadbeef; - hr = IDirectInput8_QueryInterface(pDI, NULL, (void **)&pUnk); - ok(hr == E_POINTER, "IDirectInput8_QueryInterface returned 0x%08x\n", hr); - ok(pUnk == (void *)0xdeadbeef, "Output interface pointer is %p\n", pUnk); - - hr = IDirectInput8_QueryInterface(pDI, &IID_IUnknown, NULL); - ok(hr == E_POINTER, "IDirectInput8_QueryInterface returned 0x%08x\n", hr); - - for (i = 0; i < ARRAY_SIZE(iid_list); i++) - { - pUnk = NULL; - hr = IDirectInput8_QueryInterface(pDI, iid_list[i], (void **)&pUnk); - ok(hr == S_OK, "[%d] IDirectInput8_QueryInterface returned 0x%08x\n", i, hr); - ok(pUnk != NULL, "[%d] Output interface pointer is NULL\n", i); - if (pUnk) - { - int j; - for (j = 0; j < ARRAY_SIZE(iid_list); j++) - { - IUnknown *pUnk1 = NULL; - hr = IDirectInput8_QueryInterface(pUnk, iid_list[j], (void **)&pUnk1); - ok(hr == S_OK, "[%d] IDirectInput8_QueryInterface(pUnk) returned 0x%08x\n", j, hr); - ok(pUnk1 != NULL, "[%d] Output interface pointer is NULL\n", i); - if (pUnk1) IUnknown_Release(pUnk1); - } - IUnknown_Release(pUnk); - } - } - - for (i = 0; i < ARRAY_SIZE(no_interface_list); i++) - { - pUnk = (void *)0xdeadbeef; - hr = IDirectInput8_QueryInterface(pDI, no_interface_list[i], (void **)&pUnk); - - ok(hr == E_NOINTERFACE, "[%d] IDirectInput8_QueryInterface returned 0x%08x\n", i, hr); - ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); - } - - IDirectInput8_Release(pDI); -} - -static void test_CreateDevice(void) -{ - IDirectInput8A *pDI; - HRESULT hr; - IDirectInputDevice8A *pDID; - - hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, &IID_IDirectInput8A, (void **)&pDI, NULL); - if (FAILED(hr)) - { - win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); - return; - } - - hr = IDirectInput8_CreateDevice(pDI, NULL, NULL, NULL); - ok(hr == E_POINTER, "IDirectInput8_CreateDevice returned 0x%08x\n", hr); - - pDID = (void *)0xdeadbeef; - hr = IDirectInput8_CreateDevice(pDI, NULL, &pDID, NULL); - ok(hr == E_POINTER, "IDirectInput8_CreateDevice returned 0x%08x\n", hr); - ok(pDID == NULL, "Output interface pointer is %p\n", pDID); - - hr = IDirectInput8_CreateDevice(pDI, &GUID_Unknown, NULL, NULL); - ok(hr == E_POINTER, "IDirectInput8_CreateDevice returned 0x%08x\n", hr); - - pDID = (void *)0xdeadbeef; - hr = IDirectInput8_CreateDevice(pDI, &GUID_Unknown, &pDID, NULL); - ok(hr == DIERR_DEVICENOTREG, "IDirectInput8_CreateDevice returned 0x%08x\n", hr); - ok(pDID == NULL, "Output interface pointer is %p\n", pDID); - - hr = IDirectInput8_CreateDevice(pDI, &GUID_SysMouse, NULL, NULL); - ok(hr == E_POINTER, "IDirectInput8_CreateDevice returned 0x%08x\n", hr); - - hr = IDirectInput8_CreateDevice(pDI, &GUID_SysMouse, &pDID, NULL); - ok(hr == DI_OK, "IDirectInput8_CreateDevice returned 0x%08x\n", hr); - - IDirectInputDevice_Release(pDID); - IDirectInput8_Release(pDI); -} - -struct enum_devices_test -{ - unsigned int device_count; - BOOL return_value; -}; - -static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, void *context) -{ - struct enum_devices_test *enum_test = context; - - trace("---- Device Information ----\n" - "Product Name : %s\n" - "Instance Name : %s\n" - "devType : 0x%08x\n" - "GUID Product : %s\n" - "GUID Instance : %s\n" - "HID Page : 0x%04x\n" - "HID Usage : 0x%04x\n", - instance->tszProductName, - instance->tszInstanceName, - instance->dwDevType, - wine_dbgstr_guid(&instance->guidProduct), - wine_dbgstr_guid(&instance->guidInstance), - instance->wUsagePage, - instance->wUsage); - - if ((instance->dwDevType & 0xff) == DI8DEVTYPE_KEYBOARD || - (instance->dwDevType & 0xff) == DI8DEVTYPE_MOUSE) { - const char *device = ((instance->dwDevType & 0xff) == - DI8DEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse"; - ok(IsEqualGUID(&instance->guidInstance, &instance->guidProduct), - "%s guidInstance (%s) does not match guidProduct (%s)\n", - device, wine_dbgstr_guid(&instance->guidInstance), - wine_dbgstr_guid(&instance->guidProduct)); - } - - enum_test->device_count++; - return enum_test->return_value; -} - -static void test_EnumDevices(void) -{ - IDirectInput8A *pDI; - HRESULT hr; - struct enum_devices_test enum_test, enum_test_return; - - hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, &IID_IDirectInput8A, (void **)&pDI, NULL); - if (FAILED(hr)) - { - win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); - return; - } - - hr = IDirectInput8_EnumDevices(pDI, 0, NULL, NULL, 0); - ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_EnumDevices returned 0x%08x\n", hr); - - hr = IDirectInput8_EnumDevices(pDI, 0, NULL, NULL, ~0u); - ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_EnumDevices returned 0x%08x\n", hr); - - /* Test crashes on Wine. */ - if (0) - { - hr = IDirectInput8_EnumDevices(pDI, 0, enum_devices_callback, NULL, ~0u); - ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_EnumDevices returned 0x%08x\n", hr); - } - - hr = IDirectInput8_EnumDevices(pDI, 0xdeadbeef, NULL, NULL, 0); - ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_EnumDevices returned 0x%08x\n", hr); - - hr = IDirectInput8_EnumDevices(pDI, 0xdeadbeef, NULL, NULL, ~0u); - ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_EnumDevices returned 0x%08x\n", hr); - - hr = IDirectInput8_EnumDevices(pDI, 0xdeadbeef, enum_devices_callback, NULL, 0); - ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_EnumDevices returned 0x%08x\n", hr); - - hr = IDirectInput8_EnumDevices(pDI, 0xdeadbeef, enum_devices_callback, NULL, ~0u); - ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_EnumDevices returned 0x%08x\n", hr); - - enum_test.device_count = 0; - enum_test.return_value = DIENUM_CONTINUE; - hr = IDirectInput8_EnumDevices(pDI, 0, enum_devices_callback, &enum_test, 0); - ok(hr == DI_OK, "IDirectInput8_EnumDevices returned 0x%08x\n", hr); - ok(enum_test.device_count != 0, "Device count is %u\n", enum_test.device_count); - - /* Enumeration only stops with an explicit DIENUM_STOP. */ - enum_test_return.device_count = 0; - enum_test_return.return_value = 42; - hr = IDirectInput8_EnumDevices(pDI, 0, enum_devices_callback, &enum_test_return, 0); - ok(hr == DI_OK, "IDirectInput8_EnumDevices returned 0x%08x\n", hr); - ok(enum_test_return.device_count == enum_test.device_count, - "Device count is %u vs. %u\n", enum_test_return.device_count, enum_test.device_count); - - enum_test.device_count = 0; - enum_test.return_value = DIENUM_STOP; - hr = IDirectInput8_EnumDevices(pDI, 0, enum_devices_callback, &enum_test, 0); - ok(hr == DI_OK, "IDirectInput8_EnumDevices returned 0x%08x\n", hr); - ok(enum_test.device_count == 1, "Device count is %u\n", enum_test.device_count); - - IDirectInput8_Release(pDI); -} - -struct enum_semantics_test -{ - unsigned int device_count; - DWORD first_remaining; - BOOL mouse; - BOOL keyboard; - DIACTIONFORMATA *lpdiaf; - const char* username; -}; - -static DIACTIONA actionMapping[]= -{ - /* axis */ - { 0, 0x01008A01 /* DIAXIS_DRIVINGR_STEER */, 0, { "Steer.\0" } }, - /* button */ - { 1, 0x01000C01 /* DIBUTTON_DRIVINGR_SHIFTUP */, 0, { "Upshift.\0" } }, - /* keyboard key */ - { 2, DIKEYBOARD_SPACE, 0, { "Missile.\0" } }, - /* mouse button */ - { 3, DIMOUSE_BUTTON0, 0, { "Select\0" } }, - /* mouse axis */ - { 4, DIMOUSE_YAXIS, 0, { "Y Axis\0" } } -}; -/* By placing the memory pointed to by lptszActionName right before memory with PAGE_NOACCESS - * one can find out that the regular ansi string termination is not respected by EnumDevicesBySemantics. - * Adding a double termination, making it a valid wide string termination, made the test succeed. - * Therefore it looks like ansi version of EnumDevicesBySemantics forwards the string to - * the wide variant without conversation. */ - -static BOOL CALLBACK enum_semantics_callback(const DIDEVICEINSTANCEA *lpddi, IDirectInputDevice8A *lpdid, DWORD dwFlags, DWORD dwRemaining, void *context) -{ - struct enum_semantics_test *data = context; - - if (context == NULL) return DIENUM_STOP; - - if (!data->device_count) { - data->first_remaining = dwRemaining; - } - ok (dwRemaining == data->first_remaining - data->device_count, - "enum semantics remaining devices is wrong, expected %d, had %d\n", - data->first_remaining - data->device_count, dwRemaining); - data->device_count++; - - if (IsEqualGUID(&lpddi->guidInstance, &GUID_SysKeyboard)) data->keyboard = TRUE; - - if (IsEqualGUID(&lpddi->guidInstance, &GUID_SysMouse)) data->mouse = TRUE; - - return DIENUM_CONTINUE; -} - -static BOOL CALLBACK set_action_map_callback(const DIDEVICEINSTANCEA *lpddi, IDirectInputDevice8A *lpdid, DWORD dwFlags, DWORD dwRemaining, void *context) -{ - HRESULT hr; - struct enum_semantics_test *data = context; - - /* Building and setting an action map */ - /* It should not use any pre-stored mappings so we use DIDBAM_INITIALIZE */ - hr = IDirectInputDevice8_BuildActionMap(lpdid, data->lpdiaf, NULL, DIDBAM_INITIALIZE); - ok (SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr); - - hr = IDirectInputDevice8_SetActionMap(lpdid, data->lpdiaf, data->username, 0); - ok (SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr); - - return DIENUM_CONTINUE; -} - -static void test_EnumDevicesBySemantics(void) -{ - IDirectInput8A *pDI; - HRESULT hr; - DIACTIONFORMATA diaf; - const GUID ACTION_MAPPING_GUID = { 0x1, 0x2, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } }; - struct enum_semantics_test data = { 0, 0, FALSE, FALSE, &diaf, NULL }; - int device_total = 0; - - hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, &IID_IDirectInput8A, (void **)&pDI, NULL); - if (FAILED(hr)) - { - win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); - return; - } - - memset (&diaf, 0, sizeof(diaf)); - diaf.dwSize = sizeof(diaf); - diaf.dwActionSize = sizeof(DIACTIONA); - diaf.dwNumActions = ARRAY_SIZE(actionMapping); - diaf.dwDataSize = 4 * diaf.dwNumActions; - diaf.rgoAction = actionMapping; - diaf.guidActionMap = ACTION_MAPPING_GUID; - diaf.dwGenre = 0x01000000; /* DIVIRTUAL_DRIVING_RACE */ - diaf.dwBufferSize = 32; - - /* Test enumerating all attached and installed devices */ - data.keyboard = FALSE; - data.mouse = FALSE; - data.device_count = 0; - hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, enum_semantics_callback, &data, DIEDBSFL_ATTACHEDONLY); - ok (data.device_count > 0, "EnumDevicesBySemantics did not call the callback hr=%08x\n", hr); - ok (data.keyboard, "EnumDevicesBySemantics should enumerate the keyboard\n"); - ok (data.mouse, "EnumDevicesBySemantics should enumerate the mouse\n"); - - /* Enumerate Force feedback devices. We should get no mouse nor keyboard */ - data.keyboard = FALSE; - data.mouse = FALSE; - data.device_count = 0; - hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, enum_semantics_callback, &data, DIEDBSFL_FORCEFEEDBACK); - ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr); - ok (!data.keyboard, "Keyboard should not be enumerated when asking for forcefeedback\n"); - ok (!data.mouse, "Mouse should not be enumerated when asking for forcefeedback\n"); - - /* Enumerate available devices. That is devices not owned by any user. - Before setting the action map for all devices we still have them available. */ - data.device_count = 0; - hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, enum_semantics_callback, &data, DIEDBSFL_AVAILABLEDEVICES); - ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr); - ok (data.device_count > 0, "There should be devices available before action mapping available=%d\n", data.device_count); - - /* Keep the device total */ - device_total = data.device_count; - - /* There should be no devices for any user. No device should be enumerated with DIEDBSFL_THISUSER. - MSDN defines that all unowned devices are also enumerated but this doesn't seem to be happening. */ - data.device_count = 0; - hr = IDirectInput8_EnumDevicesBySemantics(pDI, "Sh4d0w M4g3", &diaf, enum_semantics_callback, &data, DIEDBSFL_THISUSER); - ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr); - ok (data.device_count == 0, "No devices should be assigned for this user assigned=%d\n", data.device_count); - - /* This enumeration builds and sets the action map for all devices with a NULL username */ - hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, set_action_map_callback, &data, DIEDBSFL_ATTACHEDONLY); - ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr); - - /* After a successful action mapping we should have no devices available */ - data.device_count = 0; - hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, enum_semantics_callback, &data, DIEDBSFL_AVAILABLEDEVICES); - ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr); - ok (data.device_count == 0, "No device should be available after action mapping available=%d\n", data.device_count); - - /* Now we'll give all the devices to a specific user */ - data.username = "Sh4d0w M4g3"; - hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, set_action_map_callback, &data, DIEDBSFL_ATTACHEDONLY); - ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr); - - /* Testing with the default user, DIEDBSFL_THISUSER has no effect */ - data.device_count = 0; - hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, enum_semantics_callback, &data, DIEDBSFL_THISUSER); - ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr); - ok (data.device_count == device_total, "THISUSER has no effect with NULL username owned=%d, expected=%d\n", data.device_count, device_total); - - /* Using an empty user string is the same as passing NULL, DIEDBSFL_THISUSER has no effect */ - data.device_count = 0; - hr = IDirectInput8_EnumDevicesBySemantics(pDI, "", &diaf, enum_semantics_callback, &data, DIEDBSFL_THISUSER); - ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr); - ok (data.device_count == device_total, "THISUSER has no effect with \"\" as username owned=%d, expected=%d\n", data.device_count, device_total); - - /* Testing with a user with no ownership of the devices */ - data.device_count = 0; - hr = IDirectInput8_EnumDevicesBySemantics(pDI, "Ninja Brian", &diaf, enum_semantics_callback, &data, DIEDBSFL_THISUSER); - ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr); - ok (data.device_count == 0, "This user should own no devices owned=%d\n", data.device_count); - - /* Sh4d0w M4g3 has ownership of all devices */ - data.device_count = 0; - hr = IDirectInput8_EnumDevicesBySemantics(pDI, "Sh4d0w M4g3", &diaf, enum_semantics_callback, &data, DIEDBSFL_THISUSER); - ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr); - ok (data.device_count == device_total, "This user should own %d devices owned=%d\n", device_total, data.device_count); - - /* The call fails with a zeroed GUID */ - memset(&diaf.guidActionMap, 0, sizeof(GUID)); - data.device_count = 0; - hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &diaf, enum_semantics_callback, NULL, 0); - todo_wine ok(FAILED(hr), "EnumDevicesBySemantics succeeded with invalid GUID hr=%08x\n", hr); - - IDirectInput8_Release(pDI); -} - -static void test_GetDeviceStatus(void) -{ - IDirectInput8A *pDI; - HRESULT hr; - - hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, &IID_IDirectInput8A, (void **)&pDI, NULL); - if (FAILED(hr)) - { - win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); - return; - } - - hr = IDirectInput8_GetDeviceStatus(pDI, NULL); - ok(hr == E_POINTER, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr); - - hr = IDirectInput8_GetDeviceStatus(pDI, &GUID_Unknown); - todo_wine - ok(hr == DIERR_DEVICENOTREG, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr); - - hr = IDirectInput8_GetDeviceStatus(pDI, &GUID_SysMouse); - ok(hr == DI_OK, "IDirectInput8_GetDeviceStatus returned 0x%08x\n", hr); - - IDirectInput8_Release(pDI); -} - -static void test_RunControlPanel(void) -{ - IDirectInput8A *pDI; - HRESULT hr; - - hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, &IID_IDirectInput8A, (void **)&pDI, NULL); - if (FAILED(hr)) - { - win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); - return; - } - - if (winetest_interactive) - { - hr = IDirectInput8_RunControlPanel(pDI, NULL, 0); - ok(hr == S_OK, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr); - - hr = IDirectInput8_RunControlPanel(pDI, GetDesktopWindow(), 0); - ok(hr == S_OK, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr); - } - - hr = IDirectInput8_RunControlPanel(pDI, NULL, ~0u); - ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr); - - hr = IDirectInput8_RunControlPanel(pDI, (HWND)0xdeadbeef, 0); - ok(hr == E_HANDLE, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr); - - hr = IDirectInput8_RunControlPanel(pDI, (HWND)0xdeadbeef, ~0u); - ok(hr == E_HANDLE, "IDirectInput8_RunControlPanel returned 0x%08x\n", hr); - - IDirectInput8_Release(pDI); -} - -static void test_Initialize(void) -{ - IDirectInput8A *pDI; - HRESULT hr; - - hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, &IID_IDirectInput8A, (void **)&pDI, NULL); - if (FAILED(hr)) - { - win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); - return; - } - - hr = IDirectInput8_Initialize(pDI, NULL, 0); - ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_Initialize returned 0x%08x\n", hr); - - hr = IDirectInput8_Initialize(pDI, NULL, DIRECTINPUT_VERSION); - ok(hr == DIERR_INVALIDPARAM, "IDirectInput8_Initialize returned 0x%08x\n", hr); - - hr = IDirectInput8_Initialize(pDI, hInstance, 0); - ok(hr == DIERR_NOTINITIALIZED, "IDirectInput8_Initialize returned 0x%08x\n", hr); - - /* Invalid DirectInput versions less than DIRECTINPUT_VERSION yield DIERR_BETADIRECTINPUTVERSION. */ - hr = IDirectInput8_Initialize(pDI, hInstance, DIRECTINPUT_VERSION - 1); - ok(hr == DIERR_BETADIRECTINPUTVERSION, "IDirectInput8_Initialize returned 0x%08x\n", hr); - - /* Invalid DirectInput versions greater than DIRECTINPUT_VERSION yield DIERR_BETADIRECTINPUTVERSION. */ - hr = IDirectInput8_Initialize(pDI, hInstance, DIRECTINPUT_VERSION + 1); - ok(hr == DIERR_OLDDIRECTINPUTVERSION, "IDirectInput8_Initialize returned 0x%08x\n", hr); - - hr = IDirectInput8_Initialize(pDI, hInstance, DIRECTINPUT_VERSION); - ok(hr == DI_OK, "IDirectInput8_Initialize returned 0x%08x\n", hr); - - /* Parameters are still validated after successful initialization. */ - hr = IDirectInput8_Initialize(pDI, hInstance, 0); - ok(hr == DIERR_NOTINITIALIZED, "IDirectInput8_Initialize returned 0x%08x\n", hr); - - IDirectInput8_Release(pDI); -} - -START_TEST(dinput8) -{ - hInstance = GetModuleHandleA(NULL); - - CoInitialize(NULL); - test_preinitialization(); - test_DirectInput8Create(); - test_QueryInterface(); - test_CreateDevice(); - test_EnumDevices(); - test_EnumDevicesBySemantics(); - test_GetDeviceStatus(); - test_RunControlPanel(); - test_Initialize(); - CoUninitialize(); -} -- 2.34.1

1 5

[PATCH 2/2] comctl32/treeview: Use DFCS_MONO style for item check boxes.
by Zhiyi Zhang Feb. 7, 2022

Feb. 7, 2022

Keep it consistent with Windows. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/treeview.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 6e9f6dd6d1b..84fde215ff8 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3034,13 +3034,11 @@ TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) rc.left = width; rc.right = rc.left + width; - DrawFrameControl(hdc, &rc, DFC_BUTTON, - DFCS_BUTTONCHECK|DFCS_FLAT); + DrawFrameControl(hdc, &rc, DFC_BUTTON, DFCS_BUTTONCHECK | DFCS_MONO); rc.left = width * 2; rc.right = rc.left + width; - DrawFrameControl(hdc, &rc, DFC_BUTTON, - DFCS_BUTTONCHECK|DFCS_FLAT|DFCS_CHECKED); + DrawFrameControl(hdc, &rc, DFC_BUTTON, DFCS_BUTTONCHECK | DFCS_MONO | DFCS_CHECKED); SelectObject(hdc, hbmOld); nIndex = ImageList_AddMasked(infoPtr->himlState, hbm, -- 2.32.0

1 0

[PATCH 1/2] comctl32/treeview: Support HiDPI for unthemed item check boxes.
by Zhiyi Zhang Feb. 7, 2022

Feb. 7, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/treeview.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 1368105f271..6e9f6dd6d1b 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3011,30 +3011,34 @@ static BOOL TREEVIEW_InitThemedCheckboxes(TREEVIEW_INFO *info) static void TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) { + int nIndex, width, height; RECT rc; HBITMAP hbm, hbmOld; HDC hdc, hdcScreen; - int nIndex; if (TREEVIEW_InitThemedCheckboxes(infoPtr)) return; - infoPtr->himlState = ImageList_Create(16, 16, ILC_COLOR | ILC_MASK, 3, 0); + width = 12 * GetDpiForWindow(infoPtr->hwnd) / 96 + 1; + height = width; + infoPtr->himlState = ImageList_Create(width, height, ILC_COLOR | ILC_MASK, 3, 0); hdcScreen = GetDC(0); hdc = CreateCompatibleDC(hdcScreen); - hbm = CreateCompatibleBitmap(hdcScreen, 48, 16); + hbm = CreateCompatibleBitmap(hdcScreen, width * 3, height); hbmOld = SelectObject(hdc, hbm); - SetRect(&rc, 0, 0, 48, 16); + SetRect(&rc, 0, 0, width * 3, height); FillRect(hdc, &rc, (HBRUSH)(COLOR_WINDOW+1)); - SetRect(&rc, 18, 2, 30, 14); + rc.left = width; + rc.right = rc.left + width; DrawFrameControl(hdc, &rc, DFC_BUTTON, DFCS_BUTTONCHECK|DFCS_FLAT); - SetRect(&rc, 34, 2, 46, 14); + rc.left = width * 2; + rc.right = rc.left + width; DrawFrameControl(hdc, &rc, DFC_BUTTON, DFCS_BUTTONCHECK|DFCS_FLAT|DFCS_CHECKED); @@ -3047,8 +3051,8 @@ TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) DeleteDC(hdc); ReleaseDC(0, hdcScreen); - infoPtr->stateImageWidth = 16; - infoPtr->stateImageHeight = 16; + infoPtr->stateImageWidth = width; + infoPtr->stateImageHeight = height; } static void -- 2.32.0

1 0

[PATCH 1/2] shell32/tests: Wait for window to close in check_window_exists
by Alex Henrie Feb. 7, 2022

Feb. 7, 2022

This fixes a race condition where the directory is deleted before the window closes, which causes an error dialog to appear. Cutting the number of iterations per wait loop in half is necessary so that doubling the number of wait loops does not result in a timeout when new tests are added. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/tests/progman_dde.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index ef087893016..5d532f9222f 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -164,7 +164,7 @@ static BOOL check_window_exists(const char *name) else strcpy(title, name); - for (i = 0; i < 20; i++) + for (i = 0; i < 10; i++) { Sleep(100 * i); if ((window = FindWindowA("ExplorerWClass", title)) || @@ -175,7 +175,17 @@ static BOOL check_window_exists(const char *name) } } - return (window != NULL); + if (!window) + return FALSE; + + for (i = 0; i < 10; i++) + { + Sleep(100 * i); + if (!IsWindow(window)) + break; + } + + return TRUE; } static BOOL check_exists(const char *name) -- 2.35.1

1 1

[PATCH 00/24] Migration to long types
by Eric Pouech Feb. 7, 2022

Feb. 7, 2022

some more conversions to long types in programs/ A+ --- Eric Pouech (24): programs/sc: enable compilation with long types programs/services: enable compilation with long types programs/spoolsv: enable compilation with long types programs/start: enable compilation with long types programs/svchost: enable compilation with long types programs/termsv: enable compilation with long types programs/uninstaller: enable compilation with long types programs/whoami: enable compilation with long types programs/wineboot: enable compilation with long types programs/winebrowser: enable compilation with long types programs/winecfg: enable compilation with long types programs/wineconsole: enable compilation with long types programs/winedbg: enable compilation with long types programs/winedevice: enable compilation with long types programs/winemenubuilder: enable compilation with long types programs/winemsibuilder: enable compilation with long types programs/winetest: enable compilation with long types programs/winhlp32: enable compilation with long types programs/winmgmt: enable compilation with long types programs/winoldap.mod16: enable compilation with long types programs/wordpad: enable compilation with long types programs/wuauserv: enable compilation with long types programs/wusa: enable compilation with long types programs/xcopy: enable compilation with long types programs/sc/Makefile.in | 1 - programs/sc/sc.c | 22 +++---- programs/services/Makefile.in | 1 - programs/services/rpc.c | 48 +++++++-------- programs/services/services.c | 24 ++++---- programs/services/utils.c | 6 +- programs/spoolsv/Makefile.in | 1 - programs/spoolsv/main.c | 2 +- programs/start/Makefile.in | 1 - programs/start/start.c | 4 +- programs/svchost/Makefile.in | 1 - programs/svchost/svchost.c | 14 ++--- programs/termsv/Makefile.in | 1 - programs/termsv/main.c | 2 +- programs/uninstaller/Makefile.in | 1 - programs/uninstaller/main.c | 8 +-- programs/whoami/Makefile.in | 1 - programs/whoami/main.c | 4 +- programs/wineboot/Makefile.in | 1 - programs/wineboot/shutdown.c | 12 ++-- programs/wineboot/wineboot.c | 38 ++++++------ programs/winebrowser/Makefile.in | 1 - programs/winebrowser/main.c | 6 +- programs/winecfg/Makefile.in | 1 - programs/winecfg/audio.c | 8 +-- programs/winecfg/drive.c | 14 ++--- programs/winecfg/driveui.c | 4 +- programs/winecfg/main.c | 2 +- programs/winecfg/winecfg.c | 14 ++--- programs/winecfg/x11drvdlg.c | 2 +- programs/wineconsole/Makefile.in | 1 - programs/wineconsole/wineconsole.c | 4 +- programs/winedbg/Makefile.in | 1 - programs/winedbg/be_i386.c | 12 ++-- programs/winedbg/be_x86_64.c | 6 +- programs/winedbg/dbg.y | 2 +- programs/winedbg/gdbproxy.c | 52 ++++++++-------- programs/winedbg/info.c | 26 ++++---- programs/winedbg/memory.c | 10 +-- programs/winedbg/stack.c | 12 ++-- programs/winedbg/symbol.c | 2 +- programs/winedbg/tgt_active.c | 44 ++++++------- programs/winedbg/tgt_minidump.c | 4 +- programs/winedbg/types.c | 22 +++---- programs/winedbg/winedbg.c | 10 +-- programs/winedevice/Makefile.in | 1 - programs/winedevice/device.c | 4 +- programs/winemenubuilder/Makefile.in | 1 - programs/winemenubuilder/winemenubuilder.c | 72 +++++++++++----------- programs/winemsibuilder/Makefile.in | 1 - programs/winemsibuilder/main.c | 6 +- programs/winetest/Makefile.in | 1 - programs/winetest/main.c | 6 +- programs/winhlp32/Makefile.in | 1 - programs/winhlp32/hlpfile.c | 38 ++++++------ programs/winhlp32/macro.c | 52 ++++++++-------- programs/winhlp32/winhelp.c | 6 +- programs/winmgmt/Makefile.in | 1 - programs/winmgmt/main.c | 2 +- programs/winoldap.mod16/Makefile.in | 1 - programs/winoldap.mod16/winoldap.c | 2 +- programs/wordpad/Makefile.in | 1 - programs/wordpad/olecallback.c | 8 +-- programs/wordpad/wordpad.c | 6 +- programs/wuauserv/Makefile.in | 1 - programs/wuauserv/main.c | 2 +- programs/wusa/Makefile.in | 1 - programs/wusa/main.c | 2 +- programs/xcopy/Makefile.in | 1 - programs/xcopy/xcopy.c | 14 ++--- 70 files changed, 330 insertions(+), 354 deletions(-)

1 24

[PATCH] comctl32: Fix long types warnings in traces.
by Nikolay Sivov Feb. 7, 2022

Feb. 7, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/Makefile.in | 2 +- dlls/comctl32/animate.c | 80 ++++++++++---------- dlls/comctl32/combo.c | 6 +- dlls/comctl32/comboex.c | 74 +++++++++--------- dlls/comctl32/commctrl.c | 53 ++++++------- dlls/comctl32/datetime.c | 19 ++--- dlls/comctl32/dpa.c | 16 ++-- dlls/comctl32/draglist.c | 3 +- dlls/comctl32/edit.c | 16 ++-- dlls/comctl32/flatsb.c | 7 +- dlls/comctl32/header.c | 9 +-- dlls/comctl32/hotkey.c | 11 +-- dlls/comctl32/imagelist.c | 33 ++++---- dlls/comctl32/ipaddress.c | 6 +- dlls/comctl32/listbox.c | 5 +- dlls/comctl32/listview.c | 70 ++++++++--------- dlls/comctl32/monthcal.c | 27 +++---- dlls/comctl32/nativefont.c | 6 +- dlls/comctl32/pager.c | 13 ++-- dlls/comctl32/progress.c | 6 +- dlls/comctl32/propsheet.c | 30 ++++---- dlls/comctl32/rebar.c | 70 ++++++++--------- dlls/comctl32/smoothscroll.c | 4 +- dlls/comctl32/static.c | 4 +- dlls/comctl32/status.c | 12 +-- dlls/comctl32/syslink.c | 4 +- dlls/comctl32/tab.c | 38 ++++------ dlls/comctl32/taskdialog.c | 2 +- dlls/comctl32/toolbar.c | 143 +++++++++++++++-------------------- dlls/comctl32/tooltips.c | 26 +++---- dlls/comctl32/trackbar.c | 11 ++- dlls/comctl32/treeview.c | 40 +++++----- dlls/comctl32/updown.c | 9 +-- 33 files changed, 401 insertions(+), 454 deletions(-) diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index 6c27e4c628a..c0272f2d7d4 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_COMCTL32_ +EXTRADEFS = -D_COMCTL32_ MODULE = comctl32.dll IMPORTLIB = comctl32 IMPORTS = uuid user32 gdi32 advapi32 usp10 imm32 kernelbase diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index f7ac28ae4c1..fff963a6baa 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -508,16 +508,16 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr) mmioRead(infoPtr->hMMio, (LPSTR)&infoPtr->mah, sizeof(infoPtr->mah)); - TRACE("mah.dwMicroSecPerFrame=%d\n", infoPtr->mah.dwMicroSecPerFrame); - TRACE("mah.dwMaxBytesPerSec=%d\n", infoPtr->mah.dwMaxBytesPerSec); - TRACE("mah.dwPaddingGranularity=%d\n", infoPtr->mah.dwPaddingGranularity); - TRACE("mah.dwFlags=%d\n", infoPtr->mah.dwFlags); - TRACE("mah.dwTotalFrames=%d\n", infoPtr->mah.dwTotalFrames); - TRACE("mah.dwInitialFrames=%d\n", infoPtr->mah.dwInitialFrames); - TRACE("mah.dwStreams=%d\n", infoPtr->mah.dwStreams); - TRACE("mah.dwSuggestedBufferSize=%d\n", infoPtr->mah.dwSuggestedBufferSize); - TRACE("mah.dwWidth=%d\n", infoPtr->mah.dwWidth); - TRACE("mah.dwHeight=%d\n", infoPtr->mah.dwHeight); + TRACE("mah.dwMicroSecPerFrame=%ld\n", infoPtr->mah.dwMicroSecPerFrame); + TRACE("mah.dwMaxBytesPerSec=%ld\n", infoPtr->mah.dwMaxBytesPerSec); + TRACE("mah.dwPaddingGranularity=%ld\n", infoPtr->mah.dwPaddingGranularity); + TRACE("mah.dwFlags=%ld\n", infoPtr->mah.dwFlags); + TRACE("mah.dwTotalFrames=%ld\n", infoPtr->mah.dwTotalFrames); + TRACE("mah.dwInitialFrames=%ld\n", infoPtr->mah.dwInitialFrames); + TRACE("mah.dwStreams=%ld\n", infoPtr->mah.dwStreams); + TRACE("mah.dwSuggestedBufferSize=%ld\n", infoPtr->mah.dwSuggestedBufferSize); + TRACE("mah.dwWidth=%ld\n", infoPtr->mah.dwWidth); + TRACE("mah.dwHeight=%ld\n", infoPtr->mah.dwHeight); mmioAscend(infoPtr->hMMio, &mmckInfo, 0); @@ -543,17 +543,17 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr) HIBYTE(LOWORD(infoPtr->ash.fccHandler)), LOBYTE(HIWORD(infoPtr->ash.fccHandler)), HIBYTE(HIWORD(infoPtr->ash.fccHandler))); - TRACE("ash.dwFlags=%d\n", infoPtr->ash.dwFlags); + TRACE("ash.dwFlags=%ld\n", infoPtr->ash.dwFlags); TRACE("ash.wPriority=%d\n", infoPtr->ash.wPriority); TRACE("ash.wLanguage=%d\n", infoPtr->ash.wLanguage); - TRACE("ash.dwInitialFrames=%d\n", infoPtr->ash.dwInitialFrames); - TRACE("ash.dwScale=%d\n", infoPtr->ash.dwScale); - TRACE("ash.dwRate=%d\n", infoPtr->ash.dwRate); - TRACE("ash.dwStart=%d\n", infoPtr->ash.dwStart); - TRACE("ash.dwLength=%d\n", infoPtr->ash.dwLength); - TRACE("ash.dwSuggestedBufferSize=%d\n", infoPtr->ash.dwSuggestedBufferSize); - TRACE("ash.dwQuality=%d\n", infoPtr->ash.dwQuality); - TRACE("ash.dwSampleSize=%d\n", infoPtr->ash.dwSampleSize); + TRACE("ash.dwInitialFrames=%ld\n", infoPtr->ash.dwInitialFrames); + TRACE("ash.dwScale=%ld\n", infoPtr->ash.dwScale); + TRACE("ash.dwRate=%ld\n", infoPtr->ash.dwRate); + TRACE("ash.dwStart=%ld\n", infoPtr->ash.dwStart); + TRACE("ash.dwLength=%lu\n", infoPtr->ash.dwLength); + TRACE("ash.dwSuggestedBufferSize=%lu\n", infoPtr->ash.dwSuggestedBufferSize); + TRACE("ash.dwQuality=%lu\n", infoPtr->ash.dwQuality); + TRACE("ash.dwSampleSize=%lu\n", infoPtr->ash.dwSampleSize); TRACE("ash.rcFrame=(%d,%d,%d,%d)\n", infoPtr->ash.rcFrame.top, infoPtr->ash.rcFrame.left, infoPtr->ash.rcFrame.bottom, infoPtr->ash.rcFrame.right); @@ -573,17 +573,17 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr) mmioRead(infoPtr->hMMio, (LPSTR)infoPtr->inbih, mmckInfo.cksize); - TRACE("bih.biSize=%d\n", infoPtr->inbih->biSize); - TRACE("bih.biWidth=%d\n", infoPtr->inbih->biWidth); - TRACE("bih.biHeight=%d\n", infoPtr->inbih->biHeight); + TRACE("bih.biSize=%lu\n", infoPtr->inbih->biSize); + TRACE("bih.biWidth=%ld\n", infoPtr->inbih->biWidth); + TRACE("bih.biHeight=%ld\n", infoPtr->inbih->biHeight); TRACE("bih.biPlanes=%d\n", infoPtr->inbih->biPlanes); TRACE("bih.biBitCount=%d\n", infoPtr->inbih->biBitCount); - TRACE("bih.biCompression=%d\n", infoPtr->inbih->biCompression); - TRACE("bih.biSizeImage=%d\n", infoPtr->inbih->biSizeImage); - TRACE("bih.biXPelsPerMeter=%d\n", infoPtr->inbih->biXPelsPerMeter); - TRACE("bih.biYPelsPerMeter=%d\n", infoPtr->inbih->biYPelsPerMeter); - TRACE("bih.biClrUsed=%d\n", infoPtr->inbih->biClrUsed); - TRACE("bih.biClrImportant=%d\n", infoPtr->inbih->biClrImportant); + TRACE("bih.biCompression=%lu\n", infoPtr->inbih->biCompression); + TRACE("bih.biSizeImage=%lu\n", infoPtr->inbih->biSizeImage); + TRACE("bih.biXPelsPerMeter=%lu\n", infoPtr->inbih->biXPelsPerMeter); + TRACE("bih.biYPelsPerMeter=%lu\n", infoPtr->inbih->biYPelsPerMeter); + TRACE("bih.biClrUsed=%lu\n", infoPtr->inbih->biClrUsed); + TRACE("bih.biClrImportant=%lu\n", infoPtr->inbih->biClrImportant); mmioAscend(infoPtr->hMMio, &mmckInfo, 0); @@ -625,13 +625,15 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr) numFrame++; mmioAscend(infoPtr->hMMio, &mmckInfo, 0); } - if (numFrame != infoPtr->mah.dwTotalFrames) { - WARN("Found %d frames (/%d)\n", numFrame, infoPtr->mah.dwTotalFrames); - return FALSE; + if (numFrame != infoPtr->mah.dwTotalFrames) + { + WARN("Found %lu frames (/%lu)\n", numFrame, infoPtr->mah.dwTotalFrames); + return FALSE; } - if (insize > infoPtr->ash.dwSuggestedBufferSize) { - WARN("insize=%d suggestedSize=%d\n", insize, infoPtr->ash.dwSuggestedBufferSize); - infoPtr->ash.dwSuggestedBufferSize = insize; + if (insize > infoPtr->ash.dwSuggestedBufferSize) + { + WARN("insize %lu suggestedSize %lu\n", insize, infoPtr->ash.dwSuggestedBufferSize); + infoPtr->ash.dwSuggestedBufferSize = insize; } infoPtr->indata = heap_alloc_zero(infoPtr->ash.dwSuggestedBufferSize); @@ -818,7 +820,7 @@ static BOOL ANIMATE_Create(HWND hWnd, const CREATESTRUCTW *lpcs) infoPtr->hbmPrevFrame = 0; infoPtr->dwStyle = lpcs->style; - TRACE("Animate style=0x%08x, parent=%p\n", infoPtr->dwStyle, infoPtr->hwndNotify); + TRACE("Animate style %#lx, parent %p\n", infoPtr->dwStyle, infoPtr->hwndNotify); InitializeCriticalSection(&infoPtr->cs); infoPtr->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ANIMATE_INFO*->cs"); @@ -859,8 +861,7 @@ static BOOL ANIMATE_EraseBackground(ANIMATE_INFO const *infoPtr, HDC hdc) static LRESULT ANIMATE_StyleChanged(ANIMATE_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss) { - TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", - wStyleType, lpss->styleOld, lpss->styleNew); + TRACE("%#Ix, styleOld %#lx, styleNew %#lx.\n", wStyleType, lpss->styleOld, lpss->styleNew); if (wStyleType != GWL_STYLE) return 0; @@ -875,7 +876,8 @@ static LRESULT WINAPI ANIMATE_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LP { ANIMATE_INFO *infoPtr = (ANIMATE_INFO *)GetWindowLongPtrW(hWnd, 0); - TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hWnd, uMsg, wParam, lParam); + TRACE("hwnd %p, msg %x, wparam %#Ix, lparam %#Ix.\n", hWnd, uMsg, wParam, lParam); + if (!infoPtr && (uMsg != WM_NCCREATE)) return DefWindowProcW(hWnd, uMsg, wParam, lParam); switch (uMsg) @@ -953,7 +955,7 @@ static LRESULT WINAPI ANIMATE_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LP default: if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) - ERR("unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam); + ERR("unknown msg %#x, wp %#Ix, lp %#Ix.\n", uMsg, wParam, lParam); return DefWindowProcW(hWnd, uMsg, wParam, lParam); } diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 2f3652c64bd..5876c2acbb8 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -1411,7 +1411,7 @@ static void COMBO_Size( HEADCOMBO *lphc ) */ if( curComboHeight > newComboHeight ) { - TRACE("oldComboHeight=%d, newComboHeight=%d, oldDropBottom=%d, oldDropTop=%d\n", + TRACE("oldComboHeight=%d, newComboHeight=%d, oldDropBottom=%ld, oldDropTop=%ld\n", curComboHeight, newComboHeight, lphc->droppedRect.bottom, lphc->droppedRect.top); lphc->droppedRect.bottom = lphc->droppedRect.top + curComboHeight - newComboHeight; @@ -1663,7 +1663,7 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam HEADCOMBO *lphc = (HEADCOMBO *)GetWindowLongPtrW( hwnd, 0 ); HTHEME theme; - TRACE("[%p]: msg %#x wp %08lx lp %08lx\n", hwnd, message, wParam, lParam ); + TRACE("[%p]: msg %#x, wp %Ix, lp %Ix\n", hwnd, message, wParam, lParam ); if (!IsWindow(hwnd)) return 0; @@ -2108,7 +2108,7 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam default: if (message >= WM_USER) - WARN("unknown msg WM_USER+%04x wp=%04lx lp=%08lx\n", message - WM_USER, wParam, lParam ); + WARN("unknown msg WM_USER+%04x, wp %Ix, lp %Ix\n", message - WM_USER, wParam, lParam ); break; } diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 0f7e46949e4..5dc6b8d4ca0 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -140,7 +140,7 @@ static void COMBOEX_DumpItem (CBE_ITEMDATA const *item) { TRACE("item %p - mask=%08x, pszText=%p, cchTM=%d, iImage=%d\n", item, item->mask, item->pszText, item->cchTextMax, item->iImage); - TRACE("item %p - iSelectedImage=%d, iOverlay=%d, iIndent=%d, lParam=%08lx\n", + TRACE("item %p - iSelectedImage=%d, iOverlay=%d, iIndent=%d, lParam=%Ix\n", item, item->iSelectedImage, item->iOverlay, item->iIndent, item->lParam); if (item->mask & CBEIF_TEXT) TRACE("item %p - pszText=%s\n", item, debugstr_txt(item->pszText)); @@ -149,12 +149,12 @@ static void COMBOEX_DumpItem (CBE_ITEMDATA const *item) static void COMBOEX_DumpInput (COMBOBOXEXITEMW const *input) { - TRACE("input - mask=%08x, iItem=%ld, pszText=%p, cchTM=%d, iImage=%d\n", + TRACE("input - mask=%08x, iItem=%Id, pszText=%p, cchTM=%d, iImage=%d\n", input->mask, input->iItem, input->pszText, input->cchTextMax, input->iImage); if (input->mask & CBEIF_TEXT) TRACE("input - pszText=<%s>\n", debugstr_txt(input->pszText)); - TRACE("input - iSelectedImage=%d, iOverlay=%d, iIndent=%d, lParam=%08lx\n", + TRACE("input - iSelectedImage=%d, iOverlay=%d, iIndent=%d, lParam=%Ix\n", input->iSelectedImage, input->iOverlay, input->iIndent, input->lParam); } @@ -336,7 +336,7 @@ static void COMBOEX_GetComboFontSize (const COMBOEX_INFO *infoPtr, SIZE *size) GetTextExtentPointW (mydc, L"A", 1, size); SelectObject (mydc, ofont); ReleaseDC (0, mydc); - TRACE("selected font hwnd=%p, height=%d\n", nfont, size->cy); + TRACE("selected font hwnd %p, height %ld\n", nfont, size->cy); } @@ -390,7 +390,7 @@ static void COMBOEX_AdjustEditPos (const COMBOEX_INFO *infoPtr) /* reposition the Edit control based on whether icon exists */ COMBOEX_GetComboFontSize (infoPtr, &mysize); - TRACE("Combo font x=%d, y=%d\n", mysize.cx, mysize.cy); + TRACE("Combo font x %ld, y %ld\n", mysize.cx, mysize.cy); x = xioff + CBE_STARTOFFSET + 1; w = rect.right-rect.left - x - GetSystemMetrics(SM_CXVSCROLL) - 1; h = mysize.cy + 1; @@ -413,7 +413,7 @@ static void COMBOEX_ReSize (const COMBOEX_INFO *infoPtr) cy = mysize.cy + CBE_EXTRA; if (infoPtr->himl && ImageList_GetImageInfo(infoPtr->himl, 0, &iinfo)) { cy = max (iinfo.rcImage.bottom - iinfo.rcImage.top, cy); - TRACE("upgraded height due to image: height=%d\n", cy); + TRACE("upgraded height due to image: height %ld\n", cy); } SendMessageW (infoPtr->hwndSelf, CB_SETITEMHEIGHT, -1, cy); if (infoPtr->hwndCombo) { @@ -509,7 +509,7 @@ static UINT COMBOEX_GetListboxText(COMBOEX_INFO *infoPtr, INT_PTR n, LPWSTR buf) static INT COMBOEX_DeleteItem (COMBOEX_INFO *infoPtr, INT_PTR index) { - TRACE("(index=%ld)\n", index); + TRACE("index %Id\n", index); /* if item number requested does not exist then return failure */ if ((index >= infoPtr->nb_items) || (index < 0)) return CB_ERR; @@ -696,7 +696,7 @@ COMBOEX_SetExtendedStyle (COMBOEX_INFO *infoPtr, DWORD mask, DWORD style) { DWORD dwTemp; - TRACE("(mask=x%08x, style=0x%08x)\n", mask, style); + TRACE("mask %#lx, style %#lx\n", mask, style); dwTemp = infoPtr->dwExtStyle; @@ -714,8 +714,7 @@ COMBOEX_SetExtendedStyle (COMBOEX_INFO *infoPtr, DWORD mask, DWORD style) mask = CBES_EX_NOEDITIMAGE | CBES_EX_NOEDITIMAGEINDENT; if ((infoPtr->dwExtStyle & mask) != (dwTemp & mask)) { /* if state of EX_NOEDITIMAGE changes, invalidate all */ - TRACE("EX_NOEDITIMAGE state changed to %d\n", - infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGE); + TRACE("EX_NOEDITIMAGE state changed to %#lx\n", infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGE); InvalidateRect (infoPtr->hwndSelf, NULL, TRUE); COMBOEX_AdjustEditPos (infoPtr); if (infoPtr->hwndEdit) @@ -865,10 +864,10 @@ static DWORD_PTR COMBOEX_GetItemData (COMBOEX_INFO *infoPtr, INT_PTR index) return CB_ERR; } if (item1->mask & CBEIF_LPARAM) ret = item1->lParam; - TRACE("returning 0x%08lx\n", ret); + TRACE("returning %#Ix\n", ret); } else { ret = (DWORD_PTR)item1; - TRACE("non-valid result from combo, returning 0x%08lx\n", ret); + TRACE("non-valid result from combo, returning %#Ix\n", ret); } return ret; } @@ -882,7 +881,7 @@ static INT COMBOEX_SetCursel (COMBOEX_INFO *infoPtr, INT_PTR index) if (!(item = COMBOEX_FindItem(infoPtr, index))) return SendMessageW (infoPtr->hwndCombo, CB_SETCURSEL, index, 0); - TRACE("selecting item %ld text=%s\n", index, debugstr_txt(item->pszText)); + TRACE("selecting item %Id text=%s\n", index, debugstr_txt(item->pszText)); infoPtr->selected = index; sel = (INT)SendMessageW (infoPtr->hwndCombo, CB_SETCURSEL, index, 0); @@ -905,7 +904,7 @@ static DWORD_PTR COMBOEX_SetItemData (COMBOEX_INFO *infoPtr, INT_PTR index, DWOR } item1->mask |= CBEIF_LPARAM; item1->lParam = data; - TRACE("setting lparam to 0x%08lx\n", data); + TRACE("setting lparam to %#Ix\n", data); return 0; } TRACE("non-valid result from combo %p\n", item1); @@ -932,7 +931,7 @@ static INT COMBOEX_SetItemHeight (COMBOEX_INFO const *infoPtr, INT index, UINT h - (cbx_crect.bottom-cbx_crect.top); TRACE("EX window=(%s), client=(%s)\n", wine_dbgstr_rect(&cbx_wrect), wine_dbgstr_rect(&cbx_crect)); - TRACE("CB window=(%s), EX setting=(0,0)-(%d,%d)\n", + TRACE("CB window=(%s), EX setting=(0,0)-(%ld,%d)\n", wine_dbgstr_rect(&cbx_wrect), cbx_wrect.right-cbx_wrect.left, height); SetWindowPos (infoPtr->hwndSelf, HWND_TOP, 0, 0, cbx_wrect.right-cbx_wrect.left, height, @@ -1157,7 +1156,7 @@ static LRESULT COMBOEX_Command (COMBOEX_INFO *infoPtr, WPARAM wParam) */ oldItem = SendMessageW (infoPtr->hwndCombo, CB_GETCURSEL, 0, 0); if (!(item = COMBOEX_FindItem(infoPtr, oldItem))) { - ERR("item %ld not found. Problem!\n", oldItem); + ERR("item %Id not found. Problem!\n", oldItem); break; } infoPtr->selected = oldItem; @@ -1212,7 +1211,7 @@ static BOOL COMBOEX_WM_DeleteItem (COMBOEX_INFO *infoPtr, DELETEITEMSTRUCT const NMCOMBOBOXEXW nmcit; UINT i; - TRACE("CtlType=%08x, CtlID=%08x, itemID=%08x, hwnd=%p, data=%08lx\n", + TRACE("CtlType=%08x, CtlID=%08x, itemID=%08x, hwnd=%p, data=%Ix\n", dis->CtlType, dis->CtlID, dis->itemID, dis->hwndItem, dis->itemData); if (dis->itemID >= infoPtr->nb_items) return FALSE; @@ -1268,7 +1267,7 @@ static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT const *di dis->CtlType, dis->CtlID); TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n", dis->itemID, dis->itemAction, dis->itemState); - TRACE("hWnd=%p hDC=%p (%s) itemData=0x%08lx\n", + TRACE("hWnd=%p hDC=%p (%s) itemData=%#Ix\n", dis->hwndItem, dis->hDC, wine_dbgstr_rect(&dis->rcItem), dis->itemData); /* MSDN says: */ @@ -1556,10 +1555,10 @@ static LRESULT COMBOEX_NCCreate (HWND hwnd) oldstyle = (DWORD)GetWindowLongW (hwnd, GWL_STYLE); newstyle = oldstyle & ~(WS_VSCROLL | WS_HSCROLL | WS_BORDER); - if (newstyle != oldstyle) { - TRACE("req style %08x, resetting style %08x\n", - oldstyle, newstyle); - SetWindowLongW (hwnd, GWL_STYLE, newstyle); + if (newstyle != oldstyle) + { + TRACE("req style %#lx, resetting style %#lx\n", oldstyle, newstyle); + SetWindowLongW (hwnd, GWL_STYLE, newstyle); } return 1; } @@ -1623,7 +1622,7 @@ static LRESULT COMBOEX_WindowPosChanging (const COMBOEX_INFO *infoPtr, WINDOWPOS wp->x, wp->y, wp->cx, wp->cy, wp->flags); TRACE("EX window=(%s), client=(%s)\n", wine_dbgstr_rect(&cbx_wrect), wine_dbgstr_rect(&cbx_crect)); - TRACE("CB window=(%s), EX setting=(0,0)-(%d,%d)\n", + TRACE("CB window=(%s), EX setting=(0,0)-(%d,%ld)\n", wine_dbgstr_rect(&cbx_wrect), width, cb_wrect.bottom-cb_wrect.top); if (width) SetWindowPos (infoPtr->hwndCombo, HWND_TOP, 0, 0, @@ -1658,8 +1657,8 @@ COMBOEX_EditWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, RECT rect; LRESULT lret; - TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx, info_ptr=%p\n", - hwnd, uMsg, wParam, lParam, infoPtr); + TRACE("hwnd %p, msg %x, wparam %Ix, lParam %Ix, info_ptr=%p\n", + hwnd, uMsg, wParam, lParam, infoPtr); if (uMsg == WM_NCDESTROY) RemoveWindowSubclass(hwnd, COMBOEX_EditWndProc, EDIT_SUBCLASSID); @@ -1706,7 +1705,7 @@ COMBOEX_EditWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, oldItem = SendMessageW (infoPtr->hwndCombo, CB_GETCURSEL, 0, 0); InvalidateRect (infoPtr->hwndCombo, 0, 0); if (!(item = COMBOEX_FindItem(infoPtr, oldItem))) { - ERR("item %ld not found. Problem!\n", oldItem); + ERR("item %Id not found. Problem!\n", oldItem); break; } infoPtr->selected = oldItem; @@ -1727,10 +1726,8 @@ COMBOEX_EditWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, if (selected != -1) { cmp_func_t cmptext = get_cmp_func(infoPtr); item = COMBOEX_FindItem (infoPtr, selected); - TRACE("handling VK_RETURN, selected = %ld, selected_text=%s\n", - selected, debugstr_txt(item->pszText)); - TRACE("handling VK_RETURN, edittext=%s\n", - debugstr_w(edit_text)); + TRACE("handling VK_RETURN, selected = %Id, selected_text=%s\n", selected, debugstr_txt(item->pszText)); + TRACE("handling VK_RETURN, edittext=%s\n", debugstr_w(edit_text)); if (cmptext (COMBOEX_GetText(infoPtr, item), edit_text)) { /* strings not equal -- indicate edit has changed */ selected = -1; @@ -1817,8 +1814,8 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, POINT pt; WCHAR edit_text[260]; - TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx, info_ptr=%p\n", - hwnd, uMsg, wParam, lParam, infoPtr); + TRACE("hwnd %p, msg %x, wparam %Ix, lParam %Ix, info_ptr %p\n", + hwnd, uMsg, wParam, lParam, infoPtr); if (uMsg == WM_NCDESTROY) RemoveWindowSubclass(hwnd, COMBOEX_ComboWndProc, COMBO_SUBCLASSID); @@ -1953,8 +1950,7 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, lastwrk = COMBOEX_GetText(infoPtr, item); } - TRACE("handling EN_CHANGE, selected = %ld, selected_text=%s\n", - selected, debugstr_w(lastwrk)); + TRACE("handling EN_CHANGE, selected = %Id, selected_text=%s\n", selected, debugstr_w(lastwrk)); TRACE("handling EN_CHANGE, edittext=%s\n", debugstr_w(edit_text)); @@ -1987,7 +1983,7 @@ COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd); - TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx\n", hwnd, uMsg, wParam, lParam); + TRACE("hwnd %p, msg %x, wparam %Ix, lParam %Ix\n", hwnd, uMsg, wParam, lParam); if (!infoPtr) { if (uMsg == WM_CREATE) @@ -2154,10 +2150,10 @@ COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) COMCTL32_RefreshSysColors(); return 0; - default: - if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) - ERR("unknown msg %04x wp=%08lx lp=%08lx\n",uMsg,wParam,lParam); - return DefWindowProcW (hwnd, uMsg, wParam, lParam); + default: + if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) + ERR("unknown msg %04x, wp %#Ix, lp %#Ix\n",uMsg,wParam,lParam); + return DefWindowProcW (hwnd, uMsg, wParam, lParam); } } diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index c707703ccd2..57863928fc7 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -167,7 +167,7 @@ BOOL WINAPI RegisterClassNameW(const WCHAR *class) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); + TRACE("%p, %#lx, %p\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { case DLL_PROCESS_ATTACH: @@ -293,8 +293,7 @@ MenuHelp (UINT uMsg, WPARAM wParam, LPARAM lParam, HMENU hMainMenu, switch (uMsg) { case WM_MENUSELECT: - TRACE("WM_MENUSELECT wParam=0x%lX lParam=0x%lX\n", - wParam, lParam); + TRACE("WM_MENUSELECT wParam %#Ix, lParam %#Ix\n", wParam, lParam); if ((HIWORD(wParam) == 0xFFFF) && (lParam == 0)) { /* menu was closed */ @@ -323,8 +322,7 @@ MenuHelp (UINT uMsg, WPARAM wParam, LPARAM lParam, HMENU hMainMenu, break; case WM_COMMAND : - TRACE("WM_COMMAND wParam=0x%lX lParam=0x%lX\n", - wParam, lParam); + TRACE("WM_COMMAND wParam %#Ix, lParam %#Ix\n", wParam, lParam); /* WM_COMMAND is not invalid since it is documented * in the windows api reference. So don't output * any FIXME for WM_COMMAND @@ -374,7 +372,7 @@ ShowHideMenuCtl (HWND hwnd, UINT_PTR uFlags, LPINT lpInfo) { LPINT lpMenuId; - TRACE("%p, %lx, %p\n", hwnd, uFlags, lpInfo); + TRACE("%p, %Ix, %p\n", hwnd, uFlags, lpInfo); if (lpInfo == NULL) return FALSE; @@ -715,7 +713,7 @@ InitCommonControlsEx (const INITCOMMONCONTROLSEX *lpInitCtrls) if (!lpInitCtrls || lpInitCtrls->dwSize != sizeof(INITCOMMONCONTROLSEX)) return FALSE; - TRACE("(0x%08x)\n", lpInitCtrls->dwICC); + TRACE("%#lx\n", lpInitCtrls->dwICC); return TRUE; } @@ -977,9 +975,8 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) pdvi->dwBuildNumber = 2919; pdvi->dwPlatformID = 6304; - TRACE("%u.%u.%u.%u\n", - pdvi->dwMajorVersion, pdvi->dwMinorVersion, - pdvi->dwBuildNumber, pdvi->dwPlatformID); + TRACE("%lu.%lu.%lu.%lu\n", pdvi->dwMajorVersion, pdvi->dwMinorVersion, + pdvi->dwBuildNumber, pdvi->dwPlatformID); return S_OK; } @@ -1084,7 +1081,7 @@ BOOL WINAPI SetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass, LPSUBCLASS_INFO stack; LPSUBCLASSPROCS proc; - TRACE ("(%p, %p, %lx, %lx)\n", hWnd, pfnSubclass, uIDSubclass, dwRef); + TRACE("%p, %p, %Ix, %Ix\n", hWnd, pfnSubclass, uIDSubclass, dwRef); if (!hWnd || !pfnSubclass) return FALSE; @@ -1171,7 +1168,7 @@ BOOL WINAPI GetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass, const SUBCLASS_INFO *stack; const SUBCLASSPROCS *proc; - TRACE ("(%p, %p, %lx, %p)\n", hWnd, pfnSubclass, uID, pdwRef); + TRACE("%p, %p, %Ix, %p\n", hWnd, pfnSubclass, uID, pdwRef); /* See if we have been called for this window */ stack = GetPropW (hWnd, COMCTL32_wSubclass); @@ -1214,7 +1211,7 @@ BOOL WINAPI RemoveWindowSubclass(HWND hWnd, SUBCLASSPROC pfnSubclass, UINT_PTR u LPSUBCLASSPROCS proc; BOOL ret = FALSE; - TRACE ("(%p, %p, %lx)\n", hWnd, pfnSubclass, uID); + TRACE("%p, %p, %Ix.\n", hWnd, pfnSubclass, uID); /* Find the Subclass to remove */ stack = GetPropW (hWnd, COMCTL32_wSubclass); @@ -1267,8 +1264,8 @@ static LRESULT WINAPI COMCTL32_SubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam LPSUBCLASS_INFO stack; LPSUBCLASSPROCS proc; LRESULT ret; - - TRACE ("(%p, 0x%08x, 0x%08lx, 0x%08lx)\n", hWnd, uMsg, wParam, lParam); + + TRACE("%p, %#x, %#Ix, %#Ix\n", hWnd, uMsg, wParam, lParam); stack = GetPropW (hWnd, COMCTL32_wSubclass); if (!stack) { @@ -1317,8 +1314,8 @@ LRESULT WINAPI DefSubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar { LPSUBCLASS_INFO stack; LRESULT ret; - - TRACE ("(%p, 0x%08x, 0x%08lx, 0x%08lx)\n", hWnd, uMsg, wParam, lParam); + + TRACE("%p, %#x, %#Ix, %#Ix\n", hWnd, uMsg, wParam, lParam); /* retrieve our little stack from the Properties */ stack = GetPropW (hWnd, COMCTL32_wSubclass); @@ -1669,7 +1666,7 @@ int WINAPI DrawShadowText(HDC hdc, LPCWSTR text, UINT length, RECT *rect, DWORD COLORREF clr; RECT r; - FIXME("(%p, %s, %d, %p, 0x%08x, 0x%08x, 0x%08x, %d, %d): semi-stub\n", hdc, debugstr_w(text), + FIXME("%p, %s, %d, %p, %#lx, %#lx, %#lx, %d, %d: semi-stub\n", hdc, debugstr_w(text), length, rect, flags, crText, crShadow, offset_x, offset_y); bkmode = SetBkMode(hdc, TRANSPARENT); @@ -1972,7 +1969,7 @@ static void MRU_SaveChanged(WINEMRULIST *mp) { ERR("error saving /%s/, err=%d\n", debugstr_w(realname), err); } - TRACE("saving value for name /%s/ size=%d\n", debugstr_w(realname), witem->size); + TRACE("saving value for name /%s/ size %ld\n", debugstr_w(realname), witem->size); } } RegCloseKey(newkey); @@ -2071,7 +2068,7 @@ INT WINAPI FindMRUData(HANDLE hList, const void *data, DWORD cbData, int *pos) if (pos && (ret != -1)) *pos = 'a' + i; - TRACE("%p, %p, %d, %p, returning %d.\n", hList, data, cbData, pos, ret); + TRACE("%p, %p, %ld, %p, returning %d.\n", hList, data, cbData, pos, ret); return ret; } @@ -2131,7 +2128,7 @@ INT WINAPI AddMRUData(HANDLE hList, const void *data, DWORD cbData) mp->wineFlags |= WMRUF_CHANGED; mp->realMRU[0] = replace + 'a'; - TRACE("(%p, %p, %d) adding data, /%c/ now most current\n", hList, data, cbData, replace+'a'); + TRACE("%p, %p, %ld adding data, /%c/ now most current\n", hList, data, cbData, replace+'a'); if (!(mp->extview.fFlags & MRU_CACHEWRITE)) { @@ -2268,7 +2265,7 @@ static HANDLE create_mru_list(WINEMRULIST *mp) KEY_READ | KEY_WRITE, 0, &newkey, &dwdisp))) { /* error - what to do ??? */ - ERR("(%u %u %x %p %s %p): Could not open key, error=%d\n", mp->extview.cbSize, mp->extview.uMax, mp->extview.fFlags, + ERR("%lu, %u, %x, %p, %s, %p: Could not open key, error=%d\n", mp->extview.cbSize, mp->extview.uMax, mp->extview.fFlags, mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), mp->extview.u.string_cmpfn, err); return 0; } @@ -2286,7 +2283,7 @@ static HANDLE create_mru_list(WINEMRULIST *mp) else datasize /= sizeof(WCHAR); - TRACE("MRU list = %s, datasize = %d\n", debugstr_w(mp->realMRU), datasize); + TRACE("MRU list = %s, datasize = %ld\n", debugstr_w(mp->realMRU), datasize); mp->cursize = datasize - 1; /* datasize now has number of items in the MRUList */ @@ -2314,7 +2311,7 @@ static HANDLE create_mru_list(WINEMRULIST *mp) else mp->cursize = 0; - TRACE("(%u %u %x %p %s %p): Current Size = %d\n", mp->extview.cbSize, mp->extview.uMax, mp->extview.fFlags, + TRACE("%lu, %u, %x, %p, %s, %p: Current Size = %ld\n", mp->extview.cbSize, mp->extview.uMax, mp->extview.fFlags, mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), mp->extview.u.string_cmpfn, mp->cursize); return mp; } @@ -2412,7 +2409,7 @@ INT WINAPI EnumMRUListW(HANDLE hList, INT nItemPos, void *buffer, DWORD nBufferS witem = mp->array[desired]; datasize = min(witem->size, nBufferSize); memcpy(buffer, &witem->datastart, datasize); - TRACE("(%p, %d, %p, %d): returning len=%d\n", hList, nItemPos, buffer, nBufferSize, datasize); + TRACE("(%p, %d, %p, %ld): returning len %d\n", hList, nItemPos, buffer, nBufferSize, datasize); return datasize; } @@ -2446,7 +2443,7 @@ INT WINAPI EnumMRUListA(HANDLE hList, INT nItemPos, void *buffer, DWORD nBufferS ((char *)buffer)[ datasize - 1 ] = '\0'; datasize = lenA - 1; } - TRACE("(%p, %d, %p, %d): returning len=%d\n", hList, nItemPos, buffer, nBufferSize, datasize); + TRACE("(%p, %d, %p, %ld): returning len=%d\n", hList, nItemPos, buffer, nBufferSize, datasize); return datasize; } @@ -2606,7 +2603,7 @@ static LRESULT DoNotify(const struct NOTIFYDATA *notify, UINT code, NMHDR *hdr) NMHDR *lpNmh = NULL; UINT idFrom = 0; - TRACE("%p, %p, %d, %p, %#x.\n", notify->hwndFrom, notify->hwndTo, code, hdr, notify->dwParam5); + TRACE("%p, %p, %d, %p, %#lx.\n", notify->hwndFrom, notify->hwndTo, code, hdr, notify->dwParam5); if (!notify->hwndTo) return 0; @@ -2676,7 +2673,7 @@ LRESULT WINAPI SendNotifyEx(HWND hwndTo, HWND hwndFrom, UINT code, NMHDR *hdr, D struct NOTIFYDATA notify; HWND hwndNotify; - TRACE("(%p %p %d %p %#x)\n", hwndFrom, hwndTo, code, hdr, dwParam5); + TRACE("%p, %p, %d, %p, %#lx\n", hwndFrom, hwndTo, code, hdr, dwParam5); hwndNotify = hwndTo; if (!hwndTo) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index f8827d4e26c..f142ea8ede5 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1455,7 +1455,7 @@ DATETIME_Size (DATETIME_INFO *infoPtr, INT width, INT height) infoPtr->rcClient.bottom = height; infoPtr->rcClient.right = width; - TRACE("Height=%d, Width=%d\n", infoPtr->rcClient.bottom, infoPtr->rcClient.right); + TRACE("Height %ld, Width %ld\n", infoPtr->rcClient.bottom, infoPtr->rcClient.right); infoPtr->rcDraw = infoPtr->rcClient; @@ -1489,8 +1489,7 @@ DATETIME_Size (DATETIME_INFO *infoPtr, INT width, INT height) static LRESULT DATETIME_StyleChanging(DATETIME_INFO *infoPtr, WPARAM wStyleType, STYLESTRUCT *lpss) { - TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", - wStyleType, lpss->styleOld, lpss->styleNew); + TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew); /* block DTS_SHOWNONE change */ if ((lpss->styleNew ^ lpss->styleOld) & DTS_SHOWNONE) @@ -1507,8 +1506,7 @@ DATETIME_StyleChanging(DATETIME_INFO *infoPtr, WPARAM wStyleType, STYLESTRUCT *l static LRESULT DATETIME_StyleChanged(DATETIME_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss) { - TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", - wStyleType, lpss->styleOld, lpss->styleNew); + TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew); if (wStyleType != GWL_STYLE) return 0; @@ -1595,7 +1593,7 @@ static BOOL DATETIME_GetIdealSize(DATETIME_INFO *infoPtr, SIZE *size) size->cx += 12; size->cy += 4; - TRACE("cx=%d cy=%d\n", size->cx, size->cy); + TRACE("cx %ld, cy %ld\n", size->cx, size->cy); return TRUE; } @@ -1710,7 +1708,7 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { DATETIME_INFO *infoPtr = ((DATETIME_INFO *)GetWindowLongPtrW (hwnd, 0)); - TRACE ("%x, %lx, %lx\n", uMsg, wParam, lParam); + TRACE("%x, %Ix, %Ix\n", uMsg, wParam, lParam); if (!infoPtr && (uMsg != WM_CREATE) && (uMsg != WM_NCCREATE)) return DefWindowProcW( hwnd, uMsg, wParam, lParam ); @@ -1839,10 +1837,9 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return CB_ERR; default: - if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) - ERR("unknown msg %04x wp=%08lx lp=%08lx\n", - uMsg, wParam, lParam); - return DefWindowProcW (hwnd, uMsg, wParam, lParam); + if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) + ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam); + return DefWindowProcW (hwnd, uMsg, wParam, lParam); } } diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index 6dce9575b59..b8d23f6cafa 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -110,7 +110,7 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, PFNDPASTREAM loadProc, if (errCode != S_OK) return errCode; - TRACE ("dwSize=%u dwData2=%u dwItems=%u\n", + TRACE ("dwSize=%lu dwData2=%lu dwItems=%lu\n", streamData.dwSize, streamData.dwData2, streamData.dwItems); if (ulRead < sizeof(STREAMDATA) || @@ -152,7 +152,7 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, PFNDPASTREAM loadProc, /* store the handle to the dpa */ *phDpa = hDpa; - TRACE ("new hDpa=%p, errorcode=%x\n", hDpa, errCode); + TRACE ("new hDpa=%p, errorcode %lx\n", hDpa, errCode); return errCode; } @@ -271,8 +271,7 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, INT nResult, i; INT nIndex; - TRACE("(%p %p %08x %p %p %08lx)\n", - hdpa1, hdpa2, dwFlags, pfnCompare, pfnMerge, lParam); + TRACE("%p, %p, %#lx, %p, %p, %#Ix\n", hdpa1, hdpa2, dwFlags, pfnCompare, pfnMerge, lParam); if (IsBadWritePtr (hdpa1, sizeof(*hdpa1))) return FALSE; @@ -526,7 +525,7 @@ HDPA WINAPI DPA_Clone (const HDPA hdpa, HDPA hdpaNew) */ LPVOID WINAPI DPA_GetPtr (HDPA hdpa, INT_PTR nIndex) { - TRACE("(%p %ld)\n", hdpa, nIndex); + TRACE("%p, %Id\n", hdpa, nIndex); if (!hdpa) return NULL; @@ -535,7 +534,7 @@ LPVOID WINAPI DPA_GetPtr (HDPA hdpa, INT_PTR nIndex) return NULL; } if ((nIndex < 0) || (nIndex >= hdpa->nItemCount)) { - WARN("not enough pointers in array (%ld vs %d).\n",nIndex,hdpa->nItemCount); + WARN("not enough pointers in array (%Id vs %d).\n",nIndex,hdpa->nItemCount); return NULL; } @@ -815,7 +814,7 @@ BOOL WINAPI DPA_Sort (HDPA hdpa, PFNDPACOMPARE pfnCompare, LPARAM lParam) if (!hdpa || !pfnCompare) return FALSE; - TRACE("(%p %p 0x%lx)\n", hdpa, pfnCompare, lParam); + TRACE("%p, %p, %#Ix\n", hdpa, pfnCompare, lParam); if ((hdpa->nItemCount > 1) && (hdpa->ptrs)) DPA_QuickSort (hdpa->ptrs, 0, hdpa->nItemCount - 1, @@ -848,8 +847,7 @@ INT WINAPI DPA_Search (HDPA hdpa, LPVOID pFind, INT nStart, if (!hdpa || !pfnCompare || !pFind) return -1; - TRACE("(%p %p %d %p 0x%08lx 0x%08x)\n", - hdpa, pFind, nStart, pfnCompare, lParam, uOptions); + TRACE("%p, %p, %d, %p, %#Ix, %#x\n", hdpa, pFind, nStart, pfnCompare, lParam, uOptions); if (uOptions & DPAS_SORTED) { /* array is sorted --> use binary search */ diff --git a/dlls/comctl32/draglist.c b/dlls/comctl32/draglist.c index ed52e5e9068..183e4e82beb 100644 --- a/dlls/comctl32/draglist.c +++ b/dlls/comctl32/draglist.c @@ -292,8 +292,7 @@ INT WINAPI LBItemFromPt (HWND hwndLB, POINT pt, BOOL bAutoScroll) INT nIndex; DWORD dwScrollTime; - TRACE("(%p %d x %d %s)\n", - hwndLB, pt.x, pt.y, bAutoScroll ? "TRUE" : "FALSE"); + TRACE("%p, %ld x %ld, %s\n", hwndLB, pt.x, pt.y, bAutoScroll ? "TRUE" : "FALSE"); ScreenToClient (hwndLB, &pt); GetClientRect (hwndLB, &rcClient); diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index d9354a107b1..f89e11c9203 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -349,7 +349,7 @@ static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData_linedef(EDITSTATE *es, HD NULL, NULL, NULL, &tabdef, NULL, &line_def->ssa); if (FAILED(hr)) { - WARN("ScriptStringAnalyse failed (%x)\n",hr); + WARN("ScriptStringAnalyse failed, hr %#lx.\n", hr); line_def->ssa = NULL; } @@ -2355,7 +2355,7 @@ static HLOCAL EDIT_EM_GetHandle(EDITSTATE *es) /* The text buffer handle belongs to the app */ es->hlocapp = es->hloc32W; - TRACE("Returning %p, LocalSize() = %ld\n", es->hlocapp, LocalSize(es->hlocapp)); + TRACE("Returning %p, LocalSize() = %Id\n", es->hlocapp, LocalSize(es->hlocapp)); return es->hlocapp; } @@ -3896,7 +3896,7 @@ static LRESULT EDIT_WM_StyleChanged ( EDITSTATE *es, WPARAM which, const STYLES } else if (GWL_EXSTYLE == which) { ; /* FIXME - what is needed here */ } else { - WARN ("Invalid style change %ld\n",which); + WARN ("Invalid style change %#Ix.\n", which); } return 0; @@ -4045,7 +4045,7 @@ static LRESULT EDIT_WM_HScroll(EDITSTATE *es, INT action, INT pos) INT fw = es->format_rect.right - es->format_rect.left; ret = es->text_width ? es->x_offset * 100 / (es->text_width - fw) : 0; } - TRACE("EM_GETTHUMB: returning %ld\n", ret); + TRACE("EM_GETTHUMB: returning %Id\n", ret); return ret; } case EM_LINESCROLL: @@ -4168,7 +4168,7 @@ static LRESULT EDIT_WM_VScroll(EDITSTATE *es, INT action, INT pos) INT vlc = get_vertical_line_count(es); ret = es->line_count ? es->y_offset * 100 / (es->line_count - vlc) : 0; } - TRACE("EM_GETTHUMB: returning %ld\n", ret); + TRACE("EM_GETTHUMB: returning %Id\n", ret); return ret; } case EM_LINESCROLL: @@ -4401,7 +4401,7 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs) EDITSTATE *es; UINT alloc_size; - TRACE("Creating edit control, style = %08x\n", lpcs->style); + TRACE("Creating edit control, style = %#lx\n", lpcs->style); if (!(es = heap_alloc_zero(sizeof(*es)))) return FALSE; @@ -4600,7 +4600,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR LRESULT result = 0; RECT *rect; - TRACE("hwnd=%p msg=%#x wparam=%lx lparam=%lx\n", hwnd, msg, wParam, lParam); + TRACE("hwnd %p, msg %#x, wparam %Ix, lparam %Ix\n", hwnd, msg, wParam, lParam); if (!es && msg != WM_NCCREATE) return DefWindowProcW(hwnd, msg, wParam, lParam); @@ -5108,7 +5108,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR if (IsWindow(hwnd) && es && msg != EM_GETHANDLE) EDIT_UnlockBuffer(es, FALSE); - TRACE("hwnd=%p msg=%x -- 0x%08lx\n", hwnd, msg, result); + TRACE("hwnd=%p msg=%x -- %#Ix\n", hwnd, msg, result); return result; } diff --git a/dlls/comctl32/flatsb.c b/dlls/comctl32/flatsb.c index 66e25c307fa..1cedca98a6c 100644 --- a/dlls/comctl32/flatsb.c +++ b/dlls/comctl32/flatsb.c @@ -227,7 +227,7 @@ FlatSB_SetScrollRange(HWND hwnd, int nBar, INT min, INT max, BOOL bRedraw) static LRESULT FlatSB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam) { - TRACE("[%p] wParam=%04lx lParam=%08lx\n", hwnd, wParam, lParam); + TRACE("[%p] wParam %Ix, lParam %Ix\n", hwnd, wParam, lParam); return 0; } @@ -235,7 +235,7 @@ FlatSB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT FlatSB_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam) { - TRACE("[%p] wParam=%04lx lParam=%08lx\n", hwnd, wParam, lParam); + TRACE("[%p] wParam %Ix, lParam %Ix\n", hwnd, wParam, lParam); return 0; } @@ -256,8 +256,7 @@ FlatSB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) default: if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) - ERR("unknown msg %04x wp=%08lx lp=%08lx\n", - uMsg, wParam, lParam); + ERR("unknown msg %04x, wp %#Ix, lp %#Ix\n", uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam); } } diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 8bb39261dd1..be4c5616bb7 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -2094,8 +2094,7 @@ static LRESULT HEADER_SetRedraw(HEADER_INFO *infoPtr, WPARAM wParam, LPARAM lPar static INT HEADER_StyleChanged(HEADER_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss) { - TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", - wStyleType, lpss->styleOld, lpss->styleNew); + TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew); if (wStyleType != GWL_STYLE) return 0; @@ -2128,7 +2127,8 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { HEADER_INFO *infoPtr = (HEADER_INFO *)GetWindowLongPtrW(hwnd, 0); - TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx\n", hwnd, msg, wParam, lParam); + TRACE("hwnd %p, msg %x, wparam %Ix, lParam %Ix\n", hwnd, msg, wParam, lParam); + if (!infoPtr && (msg != WM_CREATE)) return DefWindowProcW (hwnd, msg, wParam, lParam); switch (msg) { @@ -2266,8 +2266,7 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) default: if ((msg >= WM_USER) && (msg < WM_APP) && !COMCTL32_IsReflectedMessage(msg)) - ERR("unknown msg %04x wp=%04lx lp=%08lx\n", - msg, wParam, lParam ); + ERR("unknown msg %04x, wp %#Ix, lp %#Ix\n", msg, wParam, lParam ); return DefWindowProcW(hwnd, msg, wParam, lParam); } } diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index 7808660e7f5..f27b71e3124 100644 --- a/dlls/comctl32/hotkey.c +++ b/dlls/comctl32/hotkey.c @@ -290,7 +290,7 @@ HOTKEY_KeyDown (HOTKEY_INFO *infoPtr, DWORD key, DWORD flags) if (GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & WS_DISABLED) return 0; - TRACE("() Key: %d\n", key); + TRACE("() Key: %ld\n", key); wOldHotKey = infoPtr->HotKey; bOldMod = infoPtr->CurrMod; @@ -350,7 +350,7 @@ HOTKEY_KeyUp (HOTKEY_INFO *infoPtr, DWORD key) if (GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & WS_DISABLED) return 0; - TRACE("() Key: %d\n", key); + TRACE("() Key: %ld\n", key); bOldMod = infoPtr->CurrMod; @@ -511,7 +511,9 @@ static LRESULT WINAPI HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { HOTKEY_INFO *infoPtr = (HOTKEY_INFO *)GetWindowLongPtrW (hwnd, 0); - TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hwnd, uMsg, wParam, lParam); + + TRACE("hwnd %p, msg %x, wparam %Ix, lparam %Ix\n", hwnd, uMsg, wParam, lParam); + if (!infoPtr && (uMsg != WM_NCCREATE)) return DefWindowProcW (hwnd, uMsg, wParam, lParam); switch (uMsg) @@ -577,8 +579,7 @@ HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) default: if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) - ERR("unknown msg %04x wp=%08lx lp=%08lx\n", - uMsg, wParam, lParam); + ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam); } return 0; diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 155d4b2a956..22d8d8c40e0 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -342,13 +342,13 @@ IMAGELIST_InternalExpandBitmaps(HIMAGELIST himl, INT nImageCount) imagelist_get_bitmap_size(himl, nNewCount, &sz); - TRACE("Create expanded bitmaps : himl=%p x=%d y=%d count=%d\n", himl, sz.cx, sz.cy, nNewCount); + TRACE("Create expanded bitmaps : himl=%p x=%ld y=%ld count=%d\n", himl, sz.cx, sz.cy, nNewCount); hdcBitmap = CreateCompatibleDC (0); hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount); if (hbmNewBitmap == 0) - ERR("creating new image bitmap (x=%d y=%d)!\n", sz.cx, sz.cy); + ERR("creating new image bitmap (x=%ld y=%ld)!\n", sz.cx, sz.cy); if (himl->cCurImage) { @@ -527,7 +527,8 @@ ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask) HBITMAP hMaskBitmap; COLORREF bkColor; - TRACE("himl=%p hbitmap=%p clrmask=%x\n", himl, hBitmap, clrMask); + TRACE("himl %p, hbitmap %p, clrmask %#lx\n", himl, hBitmap, clrMask); + if (!is_valid(himl)) return -1; @@ -2209,7 +2210,7 @@ static void *read_bitmap(IStream *pstm, BITMAPINFO *bmi) if ((bmi->bmiHeader.biSize != sizeof(bmi->bmiHeader))) return NULL; - TRACE("width %u, height %u, planes %u, bpp %u\n", + TRACE("width %lu, height %lu, planes %u, bpp %u\n", bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, bmi->bmiHeader.biPlanes, bmi->bmiHeader.biBitCount); @@ -2793,7 +2794,7 @@ ImageList_SetDragCursorImage (HIMAGELIST himlDrag, INT iDrag, BOOL WINAPI ImageList_SetFilter (HIMAGELIST himl, INT i, DWORD dwFilter) { - FIXME("(%p 0x%x 0x%x):empty stub!\n", himl, i, dwFilter); + FIXME("%p, %d, %#lx:empty stub!\n", himl, i, dwFilter); return FALSE; } @@ -2818,7 +2819,7 @@ ImageList_SetFilter (HIMAGELIST himl, INT i, DWORD dwFilter) DWORD WINAPI ImageList_SetFlags(HIMAGELIST himl, DWORD flags) { - FIXME("(%p %08x):empty stub\n", himl, flags); + FIXME("(%p %#lx):empty stub\n", himl, flags); return 0; } @@ -3043,7 +3044,7 @@ static BOOL _write_bitmap(HBITMAP hBitmap, IStream *pstm) if (!result) goto failed; - TRACE("width %u, height %u, planes %u, bpp %u\n", + TRACE("width %lu, height %lu, planes %u, bpp %u\n", bmih->biWidth, bmih->biHeight, bmih->biPlanes, bmih->biBitCount); @@ -3063,7 +3064,7 @@ failed: */ HRESULT WINAPI ImageList_WriteEx(HIMAGELIST himl, DWORD flags, IStream *pstm) { - FIXME("%p %08x %p: semi-stub\n", himl, flags, pstm); + FIXME("%p %#lx %p: semi-stub\n", himl, flags, pstm); return ImageList_Write(himl, pstm) ? S_OK : E_FAIL; } @@ -3140,7 +3141,7 @@ static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count) char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; BITMAPINFO *bmi = (BITMAPINFO *)buffer; - TRACE("Creating DIBSection %d x %d, %d Bits per Pixel\n", + TRACE("Creating DIBSection %ld x %ld, %d Bits per Pixel\n", sz.cx, sz.cy, himl->uBitsPixel); memset( buffer, 0, sizeof(buffer) ); @@ -3272,7 +3273,7 @@ static ULONG WINAPI ImageListImpl_AddRef(IImageList2 *iface) HIMAGELIST imgl = impl_from_IImageList2(iface); ULONG ref = InterlockedIncrement(&imgl->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("%p, refcount %lu\n", iface, ref); return ref; } @@ -3281,7 +3282,7 @@ static ULONG WINAPI ImageListImpl_Release(IImageList2 *iface) HIMAGELIST This = impl_from_IImageList2(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("%p, refcount %lu\n", iface, ref); if (ref == 0) { @@ -3673,7 +3674,7 @@ static HRESULT WINAPI ImageListImpl_Resize(IImageList2 *iface, INT cx, INT cy) static HRESULT WINAPI ImageListImpl_GetOriginalSize(IImageList2 *iface, INT image, DWORD flags, INT *cx, INT *cy) { - FIXME("(%p)->(%d %x %p %p): stub\n", iface, image, flags, cx, cy); + FIXME("(%p)->(%d %lx %p %p): stub\n", iface, image, flags, cx, cy); return E_NOTIMPL; } @@ -3697,13 +3698,13 @@ static HRESULT WINAPI ImageListImpl_GetCallback(IImageList2 *iface, REFIID riid, static HRESULT WINAPI ImageListImpl_ForceImagePresent(IImageList2 *iface, INT image, DWORD flags) { - FIXME("(%p)->(%d %x): stub\n", iface, image, flags); + FIXME("(%p)->(%d %lx): stub\n", iface, image, flags); return E_NOTIMPL; } static HRESULT WINAPI ImageListImpl_DiscardImages(IImageList2 *iface, INT first_image, INT last_image, DWORD flags) { - FIXME("(%p)->(%d %d %x): stub\n", iface, first_image, last_image, flags); + FIXME("(%p)->(%d %d %lx): stub\n", iface, first_image, last_image, flags); return E_NOTIMPL; } @@ -3727,14 +3728,14 @@ static HRESULT WINAPI ImageListImpl_Initialize(IImageList2 *iface, INT cx, INT c static HRESULT WINAPI ImageListImpl_Replace2(IImageList2 *iface, INT i, HBITMAP image, HBITMAP mask, IUnknown *unk, DWORD flags) { - FIXME("(%p)->(%d %p %p %p %x): stub\n", iface, i, image, mask, unk, flags); + FIXME("(%p)->(%d %p %p %p %lx): stub\n", iface, i, image, mask, unk, flags); return E_NOTIMPL; } static HRESULT WINAPI ImageListImpl_ReplaceFromImageList(IImageList2 *iface, INT i, IImageList *imagelist, INT src, IUnknown *unk, DWORD flags) { - FIXME("(%p)->(%d %p %d %p %x): stub\n", iface, i, imagelist, src, unk, flags); + FIXME("(%p)->(%d %p %d %p %lx): stub\n", iface, i, imagelist, src, unk, flags); return E_NOTIMPL; } diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index f24fb4a9335..146a5a5ae1f 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -509,7 +509,7 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) INT index, len = 0, startsel, endsel; IPPART_INFO *part; - TRACE("(hwnd=%p msg=0x%x wparam=0x%lx lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam); + TRACE("hwnd %p, msg 0x%x, wparam %#Ix, lparam %#Ix\n", hwnd, uMsg, wParam, lParam); if ((index = IPADDRESS_GetPartIndex(infoPtr, hwnd)) < 0) { @@ -592,7 +592,7 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { IPADDRESS_INFO *infoPtr = (IPADDRESS_INFO *)GetWindowLongPtrW (hwnd, 0); - TRACE("(hwnd=%p msg=0x%x wparam=0x%lx lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam); + TRACE("hwnd %p, msg 0x%x, wparam %#Ix, lparam %#Ix\n", hwnd, uMsg, wParam, lParam); if (!infoPtr && (uMsg != WM_CREATE)) return DefWindowProcW (hwnd, uMsg, wParam, lParam); @@ -654,7 +654,7 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) default: if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) - ERR("unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam); + ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam); } return 0; diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 1edb233f104..08bc4db4362 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2683,7 +2683,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, } if (descr->style & LBS_COMBOBOX) lphc = descr->lphc; - TRACE("[%p]: msg %#x wp %08lx lp %08lx\n", descr->self, msg, wParam, lParam ); + TRACE("[%p]: msg %#x, wp %Ix, lp %Ix\n", descr->self, msg, wParam, lParam ); switch(msg) { @@ -3143,8 +3143,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, default: if ((msg >= WM_USER) && (msg < 0xc000)) - WARN("[%p]: unknown msg %04x wp %08lx lp %08lx\n", - hwnd, msg, wParam, lParam ); + WARN("[%p]: unknown msg %04x, wp %Ix, lp %Ix\n", hwnd, msg, wParam, lParam ); } return DefWindowProcW( hwnd, msg, wParam, lParam ); diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4176fb72c63..cd7fec28e27 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -407,13 +407,13 @@ typedef struct tagLISTVIEW_INFO /* Dump the LISTVIEW_INFO structure to the debug channel */ #define LISTVIEW_DUMP(iP) do { \ - TRACE("hwndSelf=%p, clrBk=0x%06x, clrText=0x%06x, clrTextBk=0x%06x, ItemHeight=%d, ItemWidth=%d, Style=0x%08x\n", \ + TRACE("hwndSelf=%p, clrBk=%#lx, clrText=%#lx, clrTextBk=%#lx, ItemHeight=%d, ItemWidth=%d, Style=%#lx\n", \ iP->hwndSelf, iP->clrBk, iP->clrText, iP->clrTextBk, \ iP->nItemHeight, iP->nItemWidth, iP->dwStyle); \ - TRACE("hwndSelf=%p, himlNor=%p, himlSml=%p, himlState=%p, Focused=%d, Hot=%d, exStyle=0x%08x, Focus=%d\n", \ + TRACE("hwndSelf=%p, himlNor=%p, himlSml=%p, himlState=%p, Focused=%d, Hot=%d, exStyle=%#lx, Focus=%d\n", \ iP->hwndSelf, iP->himlNormal, iP->himlSmall, iP->himlState, \ iP->nFocusedItem, iP->nHotItem, iP->dwLvExStyle, iP->bFocus ); \ - TRACE("hwndSelf=%p, ntmH=%d, icSz.cx=%d, icSz.cy=%d, icSp.cx=%d, icSp.cy=%d, notifyFmt=%d\n", \ + TRACE("hwndSelf=%p, ntmH=%d, icSz.cx=%ld, icSz.cy=%ld, icSp.cx=%ld, icSp.cy=%ld, notifyFmt=%d\n", \ iP->hwndSelf, iP->ntmHeight, iP->iconSize.cx, iP->iconSize.cy, \ iP->iconSpacing.cx, iP->iconSpacing.cy, iP->notifyFormat); \ TRACE("hwndSelf=%p, rcList=%s\n", iP->hwndSelf, wine_dbgstr_rect(&iP->rcList)); \ @@ -607,7 +607,7 @@ static const char* debugnmlistview(const NMLISTVIEW *plvnm) { if (!plvnm) return "(null)"; return wine_dbg_sprintf("iItem=%d, iSubItem=%d, uNewState=0x%x," - " uOldState=0x%x, uChanged=0x%x, ptAction=%s, lParam=%ld", + " uOldState=0x%x, uChanged=0x%x, ptAction=%s, lParam=%Id", plvnm->iItem, plvnm->iSubItem, plvnm->uNewState, plvnm->uOldState, plvnm->uChanged, wine_dbgstr_point(&plvnm->ptAction), plvnm->lParam); } @@ -637,7 +637,7 @@ static const char* debuglvitem_t(const LVITEMW *lpLVItem, BOOL isW) if (len == -1) goto end; buf += len; size -= len; if (lpLVItem->mask & LVIF_PARAM) - len = snprintf(buf, size, "lParam=%lx, ", lpLVItem->lParam); + len = snprintf(buf, size, "lParam=%Ix, ", lpLVItem->lParam); else len = 0; if (len == -1) goto end; buf += len; size -= len; @@ -829,7 +829,7 @@ static LRESULT notify_hdr(const LISTVIEW_INFO *infoPtr, INT code, LPNMHDR pnmh) pnmh->code = code; result = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, pnmh->idFrom, (LPARAM)pnmh); - TRACE(" <= %ld\n", result); + TRACE(" <= %Id\n", result); return result; } @@ -2930,7 +2930,7 @@ static INT LISTVIEW_CalculateItemWidth(const LISTVIEW_INFO *infoPtr) { INT nItemWidth = 0; - TRACE("uView=%d\n", infoPtr->uView); + TRACE("view %ld\n", infoPtr->uView); if (infoPtr->uView == LV_VIEW_ICON) nItemWidth = infoPtr->iconSpacing.cx; @@ -2990,7 +2990,7 @@ static INT LISTVIEW_CalculateItemHeight(const LISTVIEW_INFO *infoPtr) { INT nItemHeight; - TRACE("uView=%d\n", infoPtr->uView); + TRACE("view %ld\n", infoPtr->uView); if (infoPtr->uView == LV_VIEW_ICON) nItemHeight = infoPtr->iconSpacing.cy; @@ -5972,8 +5972,7 @@ static LRESULT EditLblWndProcT(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(GetParent(hwnd), 0); BOOL save = TRUE; - TRACE("(hwnd=%p, uMsg=%x, wParam=%lx, lParam=%lx, isW=%d)\n", - hwnd, uMsg, wParam, lParam, isW); + TRACE("hwnd %p, uMsg %x, wParam %Ix, lParam %Ix, isW %d\n", hwnd, uMsg, wParam, lParam, isW); switch (uMsg) { @@ -6127,7 +6126,7 @@ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW) sz.cy = rect.bottom - rect.top + 2; rect.left -= 2; rect.top -= 1; - TRACE("moving edit=(%d,%d)-(%d,%d)\n", rect.left, rect.top, sz.cx, sz.cy); + TRACE("moving edit (%ld,%ld)-(%ld,%ld)\n", rect.left, rect.top, sz.cx, sz.cy); MoveWindow(infoPtr->hwndEdit, rect.left, rect.top, sz.cx, sz.cy, FALSE); ShowWindow(infoPtr->hwndEdit, SW_NORMAL); SetFocus(infoPtr->hwndEdit); @@ -7067,8 +7066,8 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT break; default: - WARN("Unknown value: %d\n", lprc->left); - return FALSE; + WARN("Unknown value: %ld\n", lprc->left); + return FALSE; } if (infoPtr->uView == LV_VIEW_DETAILS) @@ -7112,7 +7111,8 @@ static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT item, LPRE if (!lprc) return FALSE; - TRACE("(item=%d, subitem=%d, type=%d)\n", item, lprc->top, lprc->left); + TRACE("item %d, subitem %ld, type %ld\n", item, lprc->top, lprc->left); + /* Subitem of '0' means item itself, and this works for all control view modes */ if (lprc->top == 0) return LISTVIEW_GetItemRect(infoPtr, item, lprc); @@ -7157,8 +7157,8 @@ static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT item, LPRE break; default: - ERR("Unknown bounds=%d\n", lprc->left); - return FALSE; + ERR("Unknown bounds %ld\n", lprc->left); + return FALSE; } OffsetRect(&rect, origin.x, y); @@ -8006,7 +8006,7 @@ static BOOL LISTVIEW_Scroll(LISTVIEW_INFO *infoPtr, INT dx, INT dy) */ static BOOL LISTVIEW_SetBkColor(LISTVIEW_INFO *infoPtr, COLORREF color) { - TRACE("(color=%x)\n", color); + TRACE("color %lx\n", color); if(infoPtr->clrBk != color) { if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush); @@ -8540,7 +8540,7 @@ static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD mas { DWORD old_ex_style = infoPtr->dwLvExStyle; - TRACE("mask=0x%08x, ex_style=0x%08x\n", mask, ex_style); + TRACE("mask %#lx, ex_style %#lx\n", mask, ex_style); /* set new style */ if (mask) @@ -8721,7 +8721,7 @@ static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy) if (cy != 0) infoPtr->iconSpacing.cy = cy; - TRACE("old=(%d,%d), new=(%d,%d), iconSize=(%d,%d), ntmH=%d\n", + TRACE("old=(%d,%d), new=(%ld,%ld), iconSize=(%ld,%ld), ntmH=%d\n", LOWORD(oldspacing), HIWORD(oldspacing), infoPtr->iconSpacing.cx, infoPtr->iconSpacing.cy, infoPtr->iconSize.cx, infoPtr->iconSize.cy, infoPtr->ntmHeight); @@ -8820,7 +8820,7 @@ static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *infoPtr, INT nType, HIMAG */ static BOOL LISTVIEW_SetItemCount(LISTVIEW_INFO *infoPtr, INT nItems, DWORD dwFlags) { - TRACE("(nItems=%d, dwFlags=%x)\n", nItems, dwFlags); + TRACE("nItems %d, flags %#lx\n", nItems, dwFlags); if (infoPtr->dwStyle & LVS_OWNERDATA) { @@ -9093,7 +9093,7 @@ static INT LISTVIEW_SetSelectionMark(LISTVIEW_INFO *infoPtr, INT nIndex) */ static BOOL LISTVIEW_SetTextBkColor(LISTVIEW_INFO *infoPtr, COLORREF color) { - TRACE("(color=%x)\n", color); + TRACE("color %#lx\n", color); infoPtr->clrTextBk = color; return TRUE; @@ -9113,7 +9113,7 @@ static BOOL LISTVIEW_SetTextBkColor(LISTVIEW_INFO *infoPtr, COLORREF color) */ static BOOL LISTVIEW_SetTextColor (LISTVIEW_INFO *infoPtr, COLORREF color) { - TRACE("(color=%x)\n", color); + TRACE("color %#lx\n", color); infoPtr->clrText = color; return TRUE; @@ -9218,7 +9218,7 @@ static INT LISTVIEW_SetView(LISTVIEW_INFO *infoPtr, DWORD nView) LISTVIEW_UpdateScroll(infoPtr); LISTVIEW_InvalidateList(infoPtr); - TRACE("nView=%d\n", nView); + TRACE("nView %ld\n", nView); return 1; } @@ -9276,7 +9276,7 @@ static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *infoPtr, PFNLVCOMPARE pfnCompare, struct sorting_context context; int i; - TRACE("(pfnCompare=%p, lParamSort=%lx)\n", pfnCompare, lParamSort); + TRACE("pfnCompare %p, lParamSort %Ix\n", pfnCompare, lParamSort); if (infoPtr->dwStyle & LVS_OWNERDATA) return FALSE; @@ -9531,7 +9531,7 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) { LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(hwnd, 0); - TRACE("(lpcs=%p, style=0x%08x)\n", lpcs, lpcs->style); + TRACE("lpcs %p, style %#lx\n", lpcs, lpcs->style); infoPtr->dwStyle = lpcs->style; map_style_view(infoPtr); @@ -9941,7 +9941,7 @@ static LRESULT LISTVIEW_KeyDown(LISTVIEW_INFO *infoPtr, INT nVirtualKey, LONG lK INT nItem = -1; NMLVKEYDOWN nmKeyDown; - TRACE("(nVirtualKey=%d, lKeyData=%d)\n", nVirtualKey, lKeyData); + TRACE("(nVirtualKey=%d, lKeyData=%ld)\n", nVirtualKey, lKeyData); /* send LVN_KEYDOWN notification */ nmKeyDown.wVKey = nVirtualKey; @@ -10735,7 +10735,7 @@ static LRESULT LISTVIEW_PrintClient(LISTVIEW_INFO *infoPtr, HDC hdc, DWORD optio return 0; if (options & ~(PRF_ERASEBKGND|PRF_CLIENT)) - FIXME("(hdc=%p options=0x%08x) partial stub\n", hdc, options); + FIXME("(hdc=%p options %#lx) partial stub\n", hdc, options); if (options & PRF_ERASEBKGND) LISTVIEW_EraseBkgnd(infoPtr, hdc); @@ -11040,8 +11040,8 @@ static LRESULT LISTVIEW_Size(LISTVIEW_INFO *infoPtr, int Width, int Height) */ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) { - TRACE("uView=%d, rcList(old)=%s\n", infoPtr->uView, wine_dbgstr_rect(&infoPtr->rcList)); - + TRACE("uView %ld, rcList(old)=%s\n", infoPtr->uView, wine_dbgstr_rect(&infoPtr->rcList)); + GetClientRect(infoPtr->hwndSelf, &infoPtr->rcList); if (infoPtr->uView == LV_VIEW_LIST) @@ -11114,7 +11114,7 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, UINT uNewView, uOldView; UINT style; - TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", + TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew); if (wStyleType != GWL_STYLE || lpss->styleNew == infoPtr->dwStyle) return 0; @@ -11217,7 +11217,7 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, static INT LISTVIEW_StyleChanging(WPARAM wStyleType, STYLESTRUCT *lpss) { - TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", + TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew); /* don't forward LVS_OWNERDATA only if not already set to */ @@ -11294,7 +11294,7 @@ static LRESULT LISTVIEW_SetVersion(LISTVIEW_INFO *infoPtr, DWORD iVersion) infoPtr->iVersion = iVersion; - TRACE("new version %d\n", iVersion); + TRACE("new version %ld\n", iVersion); return iOldVersion; } @@ -11309,7 +11309,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(hwnd, 0); - TRACE("(hwnd=%p uMsg=%x wParam=%lx lParam=%lx)\n", hwnd, uMsg, wParam, lParam); + TRACE("hwnd %p, uMsg %x, wParam %Ix, lParam %Ix\n", hwnd, uMsg, wParam, lParam); if (!infoPtr && (uMsg != WM_NCCREATE)) return DefWindowProcW(hwnd, uMsg, wParam, lParam); @@ -11805,7 +11805,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) default: if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) - ERR("unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam); + ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam); return DefWindowProcW(hwnd, uMsg, wParam, lParam); } @@ -11867,7 +11867,7 @@ void LISTVIEW_Unregister(void) static LRESULT LISTVIEW_Command(LISTVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - TRACE("(%p %x %x %lx)\n", infoPtr, HIWORD(wParam), LOWORD(wParam), lParam); + TRACE("%p, %x, %x, %Ix\n", infoPtr, HIWORD(wParam), LOWORD(wParam), lParam); if (!infoPtr->hwndEdit) return 0; diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 70ea604d2c7..4fc984f6f4b 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -671,7 +671,7 @@ MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st) { INT range; - TRACE("flag=%d, st=%p\n", flag, st); + TRACE("flags %#lx, st %p\n", flag, st); switch (flag) { case GMR_VISIBLE: @@ -709,7 +709,7 @@ MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st) break; } default: - WARN("Unknown flag value, got %d\n", flag); + WARN("Unknown flag value, got %ld\n", flag); range = 0; } @@ -1296,7 +1296,7 @@ MONTHCAL_SetColor(MONTHCAL_INFO *infoPtr, UINT index, COLORREF color) enum CachedBrush type; COLORREF prev; - TRACE("%p, %d: color %08x\n", infoPtr, index, color); + TRACE("%p, %d: color %#lx\n", infoPtr, index, color); if (index > MCSC_TRAILINGTEXT) return -1; @@ -2071,8 +2071,7 @@ static LRESULT CALLBACK EditWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM { MONTHCAL_INFO *infoPtr = (MONTHCAL_INFO *)GetWindowLongPtrW(GetParent(hwnd), 0); - TRACE("(hwnd=%p, uMsg=%x, wParam=%lx, lParam=%lx)\n", - hwnd, uMsg, wParam, lParam); + TRACE("hwnd %p, uMsg %x, wParam %Ix, lParam %Ix\n", hwnd, uMsg, wParam, lParam); switch (uMsg) { @@ -2160,7 +2159,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) hit = MONTHCAL_HitTest(infoPtr, &ht); - TRACE("%x at %s\n", hit, wine_dbgstr_point(&ht.pt)); + TRACE("%lx at %s\n", hit, wine_dbgstr_point(&ht.pt)); switch(hit) { @@ -2320,7 +2319,7 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) static LRESULT MONTHCAL_Timer(MONTHCAL_INFO *infoPtr, WPARAM id) { - TRACE("%ld\n", id); + TRACE("%Id\n", id); switch(id) { case MC_PREVNEXTMONTHTIMER: @@ -2343,7 +2342,7 @@ MONTHCAL_Timer(MONTHCAL_INFO *infoPtr, WPARAM id) return 0; } default: - ERR("got unknown timer %ld\n", id); + ERR("got unknown timer %Id\n", id); break; } @@ -2449,7 +2448,7 @@ MONTHCAL_EraseBkgnd(const MONTHCAL_INFO *infoPtr, HDC hdc) static LRESULT MONTHCAL_PrintClient(MONTHCAL_INFO *infoPtr, HDC hdc, DWORD options) { - FIXME("Partial Stub: (hdc=%p options=0x%08x)\n", hdc, options); + FIXME("Partial Stub: (hdc %p options %#lx)\n", hdc, options); if ((options & PRF_CHECKVISIBLE) && !IsWindowVisible(infoPtr->hwndSelf)) return 0; @@ -2705,8 +2704,7 @@ static LRESULT theme_changed (const MONTHCAL_INFO* infoPtr) static INT MONTHCAL_StyleChanged(MONTHCAL_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss) { - TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", - wStyleType, lpss->styleOld, lpss->styleNew); + TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew); if (wStyleType != GWL_STYLE) return 0; @@ -2722,8 +2720,7 @@ static INT MONTHCAL_StyleChanged(MONTHCAL_INFO *infoPtr, WPARAM wStyleType, static INT MONTHCAL_StyleChanging(MONTHCAL_INFO *infoPtr, WPARAM wStyleType, STYLESTRUCT *lpss) { - TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", - wStyleType, lpss->styleOld, lpss->styleNew); + TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew); /* block MCS_MULTISELECT change */ if ((lpss->styleNew ^ lpss->styleOld) & MCS_MULTISELECT) @@ -2874,7 +2871,7 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { MONTHCAL_INFO *infoPtr = (MONTHCAL_INFO *)GetWindowLongPtrW(hwnd, 0); - TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hwnd, uMsg, wParam, lParam); + TRACE("hwnd %p, msg %x, wparam %Ix, lparam %Ix\n", hwnd, uMsg, wParam, lParam); if (!infoPtr && (uMsg != WM_CREATE)) return DefWindowProcW(hwnd, uMsg, wParam, lParam); @@ -3015,7 +3012,7 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) default: if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) - ERR( "unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam); + ERR( "unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam); return DefWindowProcW(hwnd, uMsg, wParam, lParam); } } diff --git a/dlls/comctl32/nativefont.c b/dlls/comctl32/nativefont.c index 2e11a9e665a..ede08d155b6 100644 --- a/dlls/comctl32/nativefont.c +++ b/dlls/comctl32/nativefont.c @@ -76,8 +76,7 @@ NATIVEFONT_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { NATIVEFONT_INFO *infoPtr = NATIVEFONT_GetInfoPtr(hwnd); - TRACE("hwnd=%p msg=%04x wparam=%08lx lparam=%08lx\n", - hwnd, uMsg, wParam, lParam); + TRACE("hwnd %p, msg %04x, wparam %Ix, lparam %Ix\n", hwnd, uMsg, wParam, lParam); if (!infoPtr && (uMsg != WM_CREATE)) return DefWindowProcW( hwnd, uMsg, wParam, lParam ); @@ -102,8 +101,7 @@ NATIVEFONT_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) default: if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) - ERR("unknown msg %04x wp=%08lx lp=%08lx\n", - uMsg, wParam, lParam); + ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam); } } diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index b8baa93e15f..7d807c8b2c4 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -219,7 +219,7 @@ PAGER_GetBorder(const PAGER_INFO *infoPtr) static inline COLORREF PAGER_GetBkColor(const PAGER_INFO *infoPtr) { - TRACE("[%p] returns %06x\n", infoPtr->hwndSelf, infoPtr->clrBk); + TRACE("[%p] returns %#lx\n", infoPtr->hwndSelf, infoPtr->clrBk); return infoPtr->clrBk; } @@ -446,7 +446,7 @@ PAGER_SetBkColor (PAGER_INFO* infoPtr, COLORREF clrBk) COLORREF clrTemp = infoPtr->clrBk; infoPtr->clrBk = clrBk; - TRACE("[%p] %06x\n", infoPtr->hwndSelf, infoPtr->clrBk); + TRACE("[%p] %#lx\n", infoPtr->hwndSelf, infoPtr->clrBk); /* the native control seems to do things this way */ SetWindowPos(infoPtr->hwndSelf, 0, 0, 0, 0, 0, @@ -776,7 +776,7 @@ PAGER_MouseMove (PAGER_INFO* infoPtr, INT keys, INT x, INT y) /* If in one of the buttons the capture and draw buttons */ if (rect) { - TRACE("[%p] draw btn (%s), Capture %s, style %08x\n", + TRACE("[%p] draw btn (%s), Capture %s, style %#lx\n", infoPtr->hwndSelf, wine_dbgstr_rect(rect), (infoPtr->bCapture) ? "TRUE" : "FALSE", infoPtr->dwStyle); @@ -943,7 +943,7 @@ PAGER_Timer (PAGER_INFO* infoPtr, INT nTimerId) else dir = (infoPtr->dwStyle & PGS_HORZ) ? PGF_SCROLLRIGHT : PGF_SCROLLDOWN; - TRACE("[%p] TIMERID1: style=%08x, dir=%d\n", + TRACE("[%p] TIMERID1: style=%#lx, dir=%d\n", infoPtr->hwndSelf, infoPtr->dwStyle, dir); KillTimer(infoPtr->hwndSelf, TIMERID1); SetTimer(infoPtr->hwndSelf, TIMERID1, REPEAT_DELAY, 0); @@ -1012,8 +1012,7 @@ PAGER_StyleChanged(PAGER_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lp { DWORD oldStyle = infoPtr->dwStyle; - TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", - wStyleType, lpss->styleOld, lpss->styleNew); + TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew); if (wStyleType != GWL_STYLE) return 0; @@ -1464,7 +1463,7 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { PAGER_INFO *infoPtr = (PAGER_INFO *)GetWindowLongPtrW(hwnd, 0); - TRACE("(%p, %#x, %#lx, %#lx)\n", hwnd, uMsg, wParam, lParam); + TRACE("%p, %#x, %#Ix, %#Ix\n", hwnd, uMsg, wParam, lParam); if (!infoPtr && (uMsg != WM_CREATE)) return DefWindowProcW (hwnd, uMsg, wParam, lParam); diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index fb4c2dc66dd..f8fc2a14eb0 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -532,7 +532,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, static const WCHAR themeClass[] = L"Progress"; HTHEME theme; - TRACE("hwnd=%p msg=%04x wparam=%lx lParam=%lx\n", hwnd, message, wParam, lParam); + TRACE("hwnd %p, msg %04x, wparam %Ix, lParam %Ix\n", hwnd, message, wParam, lParam); infoPtr = (PROGRESS_INFO *)GetWindowLongPtrW(hwnd, 0); @@ -712,7 +712,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, case PBM_SETSTATE: if(wParam != PBST_NORMAL) - FIXME("state %04lx not yet handled\n", wParam); + FIXME("state %Ix not yet handled\n", wParam); return PBST_NORMAL; case PBM_GETSTATE: @@ -734,7 +734,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, default: if ((message >= WM_USER) && (message < WM_APP) && !COMCTL32_IsReflectedMessage(message)) - ERR("unknown msg %04x wp=%04lx lp=%08lx\n", message, wParam, lParam ); + ERR("unknown msg %04x, wp %Ix, lp %Ix\n", message, wParam, lParam ); return DefWindowProcW( hwnd, message, wParam, lParam ); } } diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 556d63f2c75..a512ca9f361 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -321,7 +321,7 @@ static void PROPSHEET_CollectSheetInfoA(LPCPROPSHEETHEADERA lppsh, psInfo->useCallback = (dwFlags & PSH_USECALLBACK )&& (lppsh->pfnCallback); memcpy(&psInfo->ppshheader,lppsh,dwSize); - TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%d\ndwFlags\t\t%08x\nhwndParent\t%p\nhInstance\t%p\npszCaption\t'%s'\nnPages\t\t%d\npfnCallback\t%p\n", + TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%ld\ndwFlags\t\t%#lx\nhwndParent\t%p\nhInstance\t%p\npszCaption\t'%s'\nnPages\t\t%d\npfnCallback\t%p\n", lppsh->dwSize, lppsh->dwFlags, lppsh->hwndParent, lppsh->hInstance, debugstr_a(lppsh->pszCaption), lppsh->nPages, lppsh->pfnCallback); @@ -365,7 +365,7 @@ static void PROPSHEET_CollectSheetInfoW(LPCPROPSHEETHEADERW lppsh, psInfo->useCallback = (dwFlags & PSH_USECALLBACK) && (lppsh->pfnCallback); memcpy(&psInfo->ppshheader,lppsh,dwSize); - TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%d\ndwFlags\t\t%08x\nhwndParent\t%p\nhInstance\t%p\npszCaption\t%s\nnPages\t\t%d\npfnCallback\t%p\n", + TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%ld\ndwFlags\t\t%#lx\nhwndParent\t%p\nhInstance\t%p\npszCaption\t%s\nnPages\t\t%d\npfnCallback\t%p\n", lppsh->dwSize, lppsh->dwFlags, lppsh->hwndParent, lppsh->hInstance, debugstr_w(lppsh->pszCaption), lppsh->nPages, lppsh->pfnCallback); if (lppsh->dwFlags & INTRNL_ANY_WIZARD) @@ -765,8 +765,7 @@ static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo) rc.right -= rc.left; rc.bottom -= rc.top; - TRACE("setting tab %p, rc (0,0)-(%d,%d)\n", - hwndTabCtrl, rc.right, rc.bottom); + TRACE("setting tab %p, rc (0,0)-(%ld,%ld)\n", hwndTabCtrl, rc.right, rc.bottom); SetWindowPos(hwndTabCtrl, 0, 0, 0, rc.right, rc.bottom, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); @@ -787,8 +786,7 @@ static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo) /* * Resize the property sheet. */ - TRACE("setting dialog %p, rc (0,0)-(%d,%d)\n", - hwndDlg, rc.right, rc.bottom); + TRACE("setting dialog %p, rc (0,0)-(%ld,%ld)\n", hwndDlg, rc.right, rc.bottom); SetWindowPos(hwndDlg, 0, 0, 0, rc.right, rc.bottom, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); return TRUE; @@ -820,8 +818,7 @@ static BOOL PROPSHEET_AdjustSizeWizard(HWND hwndDlg, const PropSheetInfo* psInfo AdjustWindowRect(&rc, GetWindowLongW(hwndDlg, GWL_STYLE), FALSE); /* Resize the property sheet */ - TRACE("setting dialog %p, rc (0,0)-(%d,%d)\n", - hwndDlg, rc.right, rc.bottom); + TRACE("setting dialog %p, rc (0,0)-(%ld,%ld)\n", hwndDlg, rc.right, rc.bottom); SetWindowPos(hwndDlg, 0, 0, 0, rc.right - rc.left, rc.bottom - rc.top, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); @@ -1297,7 +1294,7 @@ static UINT GetTemplateSize(const DLGTEMPLATE* pTemplate) p++; break; case 0xffff: - TRACE("class ordinal 0x%08x\n",*(const DWORD*)p); + TRACE("class ordinal %#lx\n",*(const DWORD*)p); p += 2; break; default: @@ -1313,7 +1310,7 @@ static UINT GetTemplateSize(const DLGTEMPLATE* pTemplate) p++; break; case 0xffff: - TRACE("text ordinal 0x%08x\n",*(const DWORD*)p); + TRACE("text ordinal %#lx\n",*(const DWORD*)p); p += 2; break; default: @@ -1405,7 +1402,7 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, if (!pTemplateCopy) return FALSE; - TRACE("copying pTemplate %p into pTemplateCopy %p (%d)\n", pTemplate, pTemplateCopy, resSize); + TRACE("copying pTemplate %p into pTemplateCopy %p (%ld)\n", pTemplate, pTemplateCopy, resSize); memcpy(pTemplateCopy, pTemplate, resSize); if (((MyDLGTEMPLATEEX*)pTemplateCopy)->signature == 0xFFFF) @@ -1674,7 +1671,7 @@ static BOOL PROPSHEET_Finish(HWND hwndDlg) msgResult = SendMessageW(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn); - TRACE("msg result %ld\n", msgResult); + TRACE("msg result %Id\n", msgResult); if (msgResult != 0) return FALSE; @@ -2030,7 +2027,7 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg, * NOTE: The resizing happens every time the page is selected and * not only when it's created (some applications depend on it). */ PROPSHEET_GetPageRect(psInfo, hwndDlg, &rc, ppshpage); - TRACE("setting page %p, rc (%s) w=%d, h=%d\n", + TRACE("setting page %p, rc (%s) w=%ld, h=%ld\n", psInfo->proppage[index].hwndPage, wine_dbgstr_rect(&rc), rc.right - rc.left, rc.bottom - rc.top); SetWindowPos(psInfo->proppage[index].hwndPage, HWND_TOP, @@ -2136,7 +2133,7 @@ static void PROPSHEET_SetTitleW(HWND hwndDlg, DWORD dwStyle, LPCWSTR lpszText) PropSheetInfo* psInfo = GetPropW(hwndDlg, PropSheetInfoStr); WCHAR szTitle[256]; - TRACE("%s (style %08x)\n", debugstr_w(lpszText), dwStyle); + TRACE("%s (style %#lx)\n", debugstr_w(lpszText), dwStyle); if (IS_INTRESOURCE(lpszText)) { if (!LoadStringW(psInfo->ppshheader.hInstance, LOWORD(lpszText), szTitle, ARRAY_SIZE(szTitle))) return; @@ -2458,7 +2455,7 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON); BOOL enable_finish = ((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH); - TRACE("%d\n", dwFlags); + TRACE("%lx\n", dwFlags); EnableWindow(hwndBack, dwFlags & PSWIZB_BACK); EnableWindow(hwndNext, dwFlags & PSWIZB_NEXT); @@ -3444,8 +3441,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) static INT_PTR CALLBACK PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - TRACE("hwnd=%p msg=0x%04x wparam=%lx lparam=%lx\n", - hwnd, uMsg, wParam, lParam); + TRACE("hwnd %p, msg=0x%04x, wparam %Ix, lparam %Ix\n", hwnd, uMsg, wParam, lParam); switch (uMsg) { diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 6a065514e60..61fd30c445f 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -349,7 +349,7 @@ REBAR_DumpBandInfo(const REBARBANDINFOW *pB) TRACE("ID=%u, ", pB->wID); TRACE("size=%u, child=%p", pB->cbSize, pB->hwndChild); if (pB->fMask & RBBIM_COLORS) - TRACE(", clrF=0x%06x, clrB=0x%06x", pB->clrFore, pB->clrBack); + TRACE(", clrF=%#lx, clrB=%#lx", pB->clrFore, pB->clrBack); TRACE("\n"); TRACE("band info: mask=0x%08x (%s)\n", pB->fMask, REBAR_FmtMask(buff, pB->fMask)); @@ -364,7 +364,7 @@ REBAR_DumpBandInfo(const REBARBANDINFOW *pB) if (pB->fMask & RBBIM_HEADERSIZE) TRACE(" xHeader=%u", pB->cxHeader); if (pB->fMask & RBBIM_LPARAM) - TRACE(" lParam=0x%08lx", pB->lParam); + TRACE(" lParam %Ix", pB->lParam); TRACE("\n"); } if (pB->fMask & RBBIM_CHILDSIZE) @@ -382,14 +382,14 @@ REBAR_DumpBand (const REBAR_INFO *iP) if(! TRACE_ON(rebar) ) return; - TRACE("hwnd=%p: color=%08x/%08x, bands=%u, rows=%u, cSize=%d,%d\n", + TRACE("hwnd=%p: color=%#lx/%#lx, bands=%u, rows=%u, cSize=%ld,%ld\n", iP->hwndSelf, iP->clrText, iP->clrBk, iP->uNumBands, iP->uNumRows, iP->calcSize.cx, iP->calcSize.cy); - TRACE("hwnd=%p: flags=%08x, dragStart=%d,%d, dragNow=%d,%d, iGrabbedBand=%d\n", + TRACE("hwnd=%p: flags=%#x, dragStart=%ld,%ld, dragNow=%ld,%ld, iGrabbedBand=%d\n", iP->hwndSelf, iP->fStatus, iP->dragStart.x, iP->dragStart.y, iP->dragNow.x, iP->dragNow.y, iP->iGrabbedBand); - TRACE("hwnd=%p: style=%08x, notify in Unicode=%s, redraw=%s\n", + TRACE("hwnd=%p: style=%#lx, notify in Unicode=%s, redraw=%s\n", iP->hwndSelf, iP->dwStyle, (iP->bUnicode)?"TRUE":"FALSE", (iP->DoRedraw)?"TRUE":"FALSE"); for (i = 0; i < iP->uNumBands; i++) { @@ -400,7 +400,7 @@ REBAR_DumpBand (const REBAR_INFO *iP) if (pB->fMask & RBBIM_CHILD) TRACE(" child=%p", pB->hwndChild); if (pB->fMask & RBBIM_COLORS) - TRACE(" clrF=0x%06x clrB=0x%06x", pB->clrFore, pB->clrBack); + TRACE(" clrF=%#lx clrB=%#lx", pB->clrFore, pB->clrBack); TRACE("\n"); TRACE("band # %u: mask=0x%08x (%s)\n", i, pB->fMask, REBAR_FmtMask(buff, pB->fMask)); if (pB->fMask & RBBIM_STYLE) @@ -413,7 +413,7 @@ REBAR_DumpBand (const REBAR_INFO *iP) if (pB->fMask & RBBIM_IDEALSIZE) TRACE(" xIdeal=%u", pB->cxIdeal); if (pB->fMask & RBBIM_LPARAM) - TRACE(" lParam=0x%08lx", pB->lParam); + TRACE(" lParam %Ix", pB->lParam); } TRACE("\n"); if (RBBIM_CHILDSIZE) @@ -946,7 +946,7 @@ REBAR_ForceResize (REBAR_INFO *infoPtr) INT xedge = 0, yedge = 0; RECT rcSelf; - TRACE("new size [%d x %d]\n", infoPtr->calcSize.cx, infoPtr->calcSize.cy); + TRACE("new size [%ld x %ld]\n", infoPtr->calcSize.cx, infoPtr->calcSize.cy); if (infoPtr->dwStyle & CCS_NORESIZE) return; @@ -993,8 +993,8 @@ REBAR_ForceResize (REBAR_INFO *infoPtr) width = rcSelf.right - rcSelf.left; } - TRACE("hwnd %p, style=%08x, setting at (%d,%d) for (%d,%d)\n", - infoPtr->hwndSelf, infoPtr->dwStyle, x, y, width, height); + TRACE("hwnd %p, style %#lx, setting at (%d,%d) for (%d,%d)\n", infoPtr->hwndSelf, infoPtr->dwStyle, + x, y, width, height); /* Set flag to ignore next WM_SIZE message and resize the window */ infoPtr->fStatus |= SELF_RESIZE; @@ -1059,7 +1059,7 @@ REBAR_MoveChildWindows (const REBAR_INFO *infoPtr, UINT start, UINT endplus) yPos = (lpBand->rcChild.bottom + lpBand->rcChild.top - nEditHeight)/2; /* center combo box inside child area */ - TRACE("moving child (Combo(Ex)) %p to (%d,%d) for (%d,%d)\n", + TRACE("moving child (Combo(Ex)) %p to (%ld,%d) for (%ld,%d)\n", lpBand->hwndChild, lpBand->rcChild.left, yPos, lpBand->rcChild.right - lpBand->rcChild.left, @@ -1074,7 +1074,7 @@ REBAR_MoveChildWindows (const REBAR_INFO *infoPtr, UINT start, UINT endplus) ERR("DeferWindowPos returned NULL\n"); } else { - TRACE("moving child (Other) %p to (%d,%d) for (%d,%d)\n", + TRACE("moving child (Other) %p to (%ld,%ld) for (%ld,%ld)\n", lpBand->hwndChild, lpBand->rcChild.left, lpBand->rcChild.top, lpBand->rcChild.right - lpBand->rcChild.left, @@ -1390,7 +1390,7 @@ REBAR_Layout(REBAR_INFO *infoPtr) adjcx = get_rect_cx(infoPtr, &rcAdj); if (infoPtr->uNumBands == 0) { - TRACE("No bands - setting size to (0,%d), style: %x\n", adjcx, infoPtr->dwStyle); + TRACE("No bands - setting size to (0,%d), style: %#lx\n", adjcx, infoPtr->dwStyle); infoPtr->calcSize.cx = adjcx; /* the calcSize.cy won't change for a 0 band rebar */ infoPtr->uNumRows = 0; @@ -1434,9 +1434,8 @@ REBAR_Layout(REBAR_INFO *infoPtr) infoPtr->calcSize.cx = adjcx; infoPtr->calcSize.cy = yPos; - TRACE("calcsize size=(%d, %d), origheight=(%d,%d)\n", - infoPtr->calcSize.cx, infoPtr->calcSize.cy, - oldSize.cx, oldSize.cy); + TRACE("calcsize size=(%ld, %ld), origheight=(%ld,%ld)\n", infoPtr->calcSize.cx, infoPtr->calcSize.cy, + oldSize.cx, oldSize.cy); REBAR_DumpBand (infoPtr); REBAR_MoveChildWindows (infoPtr, 0, infoPtr->uNumBands); @@ -1929,7 +1928,7 @@ static LRESULT REBAR_EraseBkGnd (const REBAR_INFO *infoPtr, HDC hdc) else { old = SetBkColor (hdc, new); - TRACE("%s background color=0x%06x, band %s\n", + TRACE("%s background color %#lx, band %s\n", (lpBand->clrBack == CLR_NONE) ? "none" : ((lpBand->clrBack == CLR_DEFAULT) ? "dft" : ""), GetBkColor(hdc), wine_dbgstr_rect(&rcBand)); @@ -2362,7 +2361,7 @@ REBAR_GetBkColor (const REBAR_INFO *infoPtr) if (clr == CLR_DEFAULT) clr = infoPtr->clrBtnFace; - TRACE("background color 0x%06x!\n", clr); + TRACE("background color %#lx\n", clr); return clr; } @@ -2434,7 +2433,7 @@ REBAR_GetRowHeight (const REBAR_INFO *infoPtr, INT iRow) static inline LRESULT REBAR_GetTextColor (const REBAR_INFO *infoPtr) { - TRACE("text color 0x%06x!\n", infoPtr->clrText); + TRACE("text color %#lx\n", infoPtr->clrText); return infoPtr->clrText; } @@ -2599,7 +2598,7 @@ REBAR_MaximizeBand (const REBAR_INFO *infoPtr, INT iBand, LPARAM lParam) extra = REBAR_ShrinkBandsLTR(infoPtr, next_visible(infoPtr, iBand), iRowEnd, extra, TRUE); lpBand->cxEffective += extraOrig - extra; lpBand->cx = lpBand->cxEffective; - TRACE("(%d, %ld): Wanted size %d, obtained %d (shrink %d, %d)\n", iBand, lParam, cxDesired, lpBand->cx, extraOrig, extra); + TRACE("(%d, %Id): Wanted size %d, obtained %d (shrink %d, %d)\n", iBand, lParam, cxDesired, lpBand->cx, extraOrig, extra); REBAR_SetRowRectsX(infoPtr, iRowBegin, iRowEnd); if (infoPtr->dwStyle & CCS_VERT) @@ -2784,8 +2783,7 @@ REBAR_SetBarInfo (REBAR_INFO *infoPtr, const REBARINFO *lpInfo) infoPtr->imageSize.cx = 0; infoPtr->imageSize.cy = 0; } - TRACE("new image cx=%d, cy=%d\n", infoPtr->imageSize.cx, - infoPtr->imageSize.cy); + TRACE("new image cx=%ld, cy=%ld\n", infoPtr->imageSize.cx, infoPtr->imageSize.cy); } /* revalidate all bands to reset flags for images in headers of bands */ @@ -2806,7 +2804,7 @@ REBAR_SetBkColor (REBAR_INFO *infoPtr, COLORREF clr) clrTemp = infoPtr->clrBk; infoPtr->clrBk = clr; - TRACE("background color 0x%06x!\n", infoPtr->clrBk); + TRACE("background color %#lx\n", infoPtr->clrBk); return clrTemp; } @@ -2835,7 +2833,7 @@ REBAR_SetTextColor (REBAR_INFO *infoPtr, COLORREF clr) clrTemp = infoPtr->clrText; infoPtr->clrText = clr; - TRACE("text color 0x%06x!\n", infoPtr->clrText); + TRACE("text color %#lx\n", infoPtr->clrText); return clrTemp; } @@ -3309,12 +3307,12 @@ REBAR_NCHitTest (const REBAR_INFO *infoPtr, LPARAM lParam) nmmouse.dwItemData = 0; nmmouse.pt = clpt; nmmouse.dwHitInfo = 0; - if ((i = REBAR_Notify((NMHDR *) &nmmouse, infoPtr, NM_NCHITTEST))) { - TRACE("notify changed return value from %ld to %d\n", - ret, i); - ret = (LRESULT) i; + if ((i = REBAR_Notify((NMHDR *) &nmmouse, infoPtr, NM_NCHITTEST))) + { + TRACE("notify changed return value from %Id to %d\n", ret, i); + ret = (LRESULT) i; } - TRACE("returning %ld, client point %s\n", ret, wine_dbgstr_point(&clpt)); + TRACE("returning %Id, client point %s\n", ret, wine_dbgstr_point(&clpt)); return ret; } @@ -3476,13 +3474,12 @@ REBAR_SetRedraw (REBAR_INFO *infoPtr, BOOL redraw) static LRESULT REBAR_Size (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - TRACE("wParam=%lx, lParam=%lx\n", wParam, lParam); + TRACE("wParam %Ix, lParam %Ix\n", wParam, lParam); /* avoid _Layout resize recursion (but it shouldn't be infinite and it seems Windows does recurse) */ if (infoPtr->fStatus & SELF_RESIZE) { infoPtr->fStatus &= ~SELF_RESIZE; - TRACE("SELF_RESIZE was set, reset, fStatus=%08x lparam=%08lx\n", - infoPtr->fStatus, lParam); + TRACE("SELF_RESIZE was set, reset, fStatus=%08x lparam %Ix\n", infoPtr->fStatus, lParam); return 0; } @@ -3498,7 +3495,7 @@ REBAR_Size (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) static LRESULT REBAR_StyleChanged (REBAR_INFO *infoPtr, INT nType, const STYLESTRUCT *lpStyle) { - TRACE("current style=%08x, styleOld=%08x, style being set to=%08x\n", + TRACE("current style %#lx, styleOld %#lx, style being set to %#lx\n", infoPtr->dwStyle, lpStyle->styleOld, lpStyle->styleNew); if (nType == GWL_STYLE) { @@ -3538,8 +3535,8 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd); - TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", - hwnd, uMsg, wParam, lParam); + TRACE("hwnd %p, msg %x, wparam %Ix, lparam %Ix\n", hwnd, uMsg, wParam, lParam); + if (!infoPtr && (uMsg != WM_NCCREATE)) return DefWindowProcW (hwnd, uMsg, wParam, lParam); switch (uMsg) @@ -3745,8 +3742,7 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) default: if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) - ERR("unknown msg %04x wp=%08lx lp=%08lx\n", - uMsg, wParam, lParam); + ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam); } } diff --git a/dlls/comctl32/smoothscroll.c b/dlls/comctl32/smoothscroll.c index e71fac330e3..75eac1211e2 100644 --- a/dlls/comctl32/smoothscroll.c +++ b/dlls/comctl32/smoothscroll.c @@ -112,9 +112,7 @@ BOOL WINAPI SmoothScrollWindow( const SMOOTHSCROLLSTRUCT *smooth ) { ); } - FIXME("(hwnd=%p,flags=%x,x2=%x): should smooth scroll here.\n", - smooth->hwnd,flags,smooth->x2 - ); + FIXME("(hwnd=%p,flags=%lx,x2=%lx): should smooth scroll here.\n", smooth->hwnd, flags, smooth->x2); /* FIXME: do timer based smooth scrolling */ if ((smooth->x2 & 1) && smooth->scrollfun) return smooth->scrollfun( diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index d584b470a8c..7a3ac958111 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -438,7 +438,7 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, if (style < 0L || style > SS_TYPEMASK) { - ERR("Unknown style 0x%02x\n", style ); + ERR("Unknown style %#lx\n", style ); return -1; } @@ -613,7 +613,7 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, full_style ); break; default: - FIXME("STM_SETIMAGE: Unhandled type %lx\n", wParam); + FIXME("STM_SETIMAGE: Unhandled type %Ix\n", wParam); break; } STATIC_TryPaintFcn( hwnd, full_style ); diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index e804c0418f4..5251f3677b0 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -110,7 +110,7 @@ STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr) margin = (tm.tmInternalLeading ? tm.tmInternalLeading : 2); height = max(tm.tmHeight + margin + 2*GetSystemMetrics(SM_CYBORDER), infoPtr->minHeight) + infoPtr->verticalBorder; - TRACE(" textHeight=%d+%d, final height=%d\n", tm.tmHeight, tm.tmInternalLeading, height); + TRACE(" textHeight=%ld+%ld, final height=%d\n", tm.tmHeight, tm.tmInternalLeading, height); return height; } @@ -542,7 +542,7 @@ STATUSBAR_SetBkColor (STATUS_INFO *infoPtr, COLORREF color) infoPtr->clrBk = color; InvalidateRect(infoPtr->Self, NULL, FALSE); - TRACE("CREF: %08x -> %08x\n", oldBkColor, infoPtr->clrBk); + TRACE("CREF: %#lx -> %#lx\n", oldBkColor, infoPtr->clrBk); return oldBkColor; } @@ -1101,7 +1101,7 @@ STATUSBAR_SendMouseNotify(const STATUS_INFO *infoPtr, UINT code, UINT msg, WPARA { NMMOUSE nm; - TRACE("code %04x, lParam=%lx\n", code, lParam); + TRACE("code %04x, lParam %Ix\n", code, lParam); nm.hdr.hwndFrom = infoPtr->Self; nm.hdr.idFrom = GetWindowLongPtrW(infoPtr->Self, GWLP_ID); nm.hdr.code = code; @@ -1128,7 +1128,8 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) INT nPart = ((INT) wParam) & 0x00ff; LRESULT res; - TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hwnd, msg, wParam, lParam); + TRACE("hwnd %p, msg %x, wparam %Ix, lparam %Ix\n", hwnd, msg, wParam, lParam); + if (!infoPtr && msg != WM_CREATE) return DefWindowProcW (hwnd, msg, wParam, lParam); @@ -1267,8 +1268,7 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) default: if ((msg >= WM_USER) && (msg < WM_APP) && !COMCTL32_IsReflectedMessage(msg)) - ERR("unknown msg %04x wp=%04lx lp=%08lx\n", - msg, wParam, lParam); + ERR("unknown msg %04x wp=%Ix lp=%Ix\n", msg, wParam, lParam); return DefWindowProcW (hwnd, msg, wParam, lParam); } } diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 802a8803e82..011c8bdb8b2 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -1497,7 +1497,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, { SYSLINK_INFO *infoPtr; - TRACE("hwnd=%p msg=%04x wparam=%lx lParam=%lx\n", hwnd, message, wParam, lParam); + TRACE("hwnd %p, msg %04x, wparam %Ix, lParam %Ix\n", hwnd, message, wParam, lParam); infoPtr = (SYSLINK_INFO *)GetWindowLongPtrW(hwnd, 0); @@ -1726,7 +1726,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, default: if ((message >= WM_USER) && (message < WM_APP) && !COMCTL32_IsReflectedMessage(message)) { - ERR("unknown msg %04x wp=%04lx lp=%08lx\n", message, wParam, lParam ); + ERR("unknown msg %04x, wp %Ix, lp %Ix\n", message, wParam, lParam ); } return DefWindowProcW(hwnd, message, wParam, lParam); } diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 017719a183d..8e34f8b97b3 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -203,9 +203,9 @@ static void TAB_DumpItemExternalT(const TCITEMW *pti, UINT iItem, BOOL isW) { if (TRACE_ON(tab)) { - TRACE("external tab %d, mask=0x%08x, dwState=0x%08x, dwStateMask=0x%08x, cchTextMax=0x%08x\n", + TRACE("external tab %d, mask=0x%08x, dwState %#lx, dwStateMask %#lx, cchTextMax=0x%08x\n", iItem, pti->mask, pti->dwState, pti->dwStateMask, pti->cchTextMax); - TRACE("external tab %d, iImage=%d, lParam=0x%08lx, pszTextW=%s\n", + TRACE("external tab %d, iImage=%d, lParam %Ix, pszTextW=%s\n", iItem, pti->iImage, pti->lParam, isW ? debugstr_w(pti->pszText) : debugstr_a((LPSTR)pti->pszText)); } } @@ -216,10 +216,8 @@ TAB_DumpItemInternal(const TAB_INFO *infoPtr, UINT iItem) if (TRACE_ON(tab)) { TAB_ITEM *ti = TAB_GetItem(infoPtr, iItem); - TRACE("tab %d, dwState=0x%08x, pszText=%s, iImage=%d\n", - iItem, ti->dwState, debugstr_w(ti->pszText), ti->iImage); - TRACE("tab %d, rect.left=%d, rect.top(row)=%d\n", - iItem, ti->rect.left, ti->rect.top); + TRACE("tab %d, dwState %#lx, pszText %s, iImage %d\n", iItem, ti->dwState, debugstr_w(ti->pszText), ti->iImage); + TRACE("tab %d, rect.left=%ld, rect.top(row)=%ld\n", iItem, ti->rect.left, ti->rect.top); } } @@ -929,8 +927,7 @@ static LRESULT TAB_AdjustRect(const TAB_INFO *infoPtr, WPARAM fLarger, LPRECT pr { LONG *iRightBottom, *iLeftTop; - TRACE ("hwnd=%p fLarger=%ld (%s)\n", infoPtr->hwnd, fLarger, - wine_dbgstr_rect(prc)); + TRACE("hwnd %p, fLarger %Id, (%s)\n", infoPtr->hwnd, fLarger, wine_dbgstr_rect(prc)); if (!prc) return -1; @@ -1173,11 +1170,10 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) ((infoPtr->dwStyle & TCS_BUTTONS) ? 2 : 1) * infoPtr->uVItemPadding; - TRACE("tabH=%d, tmH=%d, iconh=%d\n", - infoPtr->tabHeight, fontMetrics.tmHeight, icon_height); + TRACE("tabH=%d, tmH %ld, iconh %d\n", infoPtr->tabHeight, fontMetrics.tmHeight, icon_height); } - TRACE("client right=%d\n", clientRect.right); + TRACE("client right %ld\n", clientRect.right); /* Get the icon width */ if (infoPtr->himl) @@ -1331,7 +1327,7 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) curr->rect.right -= curr->rect.left; curr->rect.left = 0; - TRACE("r=%d, cl=%d, cl.r=%d, iCount=%d, iRow=%d, uNumRows=%d, remTab=%d, tabPerRow=%d\n", + TRACE("r=%ld, cl=%d, cl.r=%ld, iCount=%d, iRow=%d, uNumRows=%d, remTab=%d, tabPerRow=%d\n", curr->rect.right, curItemLeftPos, clientRect.right, iCount, iRow, infoPtr->uNumRows, remTab, tabPerRow); @@ -1796,8 +1792,8 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect if (center_offset_v < 0) center_offset_v = 0; - - TRACE("for <%s>, c_o_h=%d, c_o_v=%d, draw=(%s), textlen=%d\n", + + TRACE("for <%s>, c_o_h=%d, c_o_v=%d, draw=(%s), textlen=%ld\n", debugstr_w(item->pszText), center_offset_h, center_offset_v, wine_dbgstr_rect(drawRect), (rcText.right-rcText.left)); @@ -1823,8 +1819,7 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect drawRect->left += cx + infoPtr->uHItemPadding; } - TRACE("drawing image=%d, left=%d, top=%d\n", - item->iImage, rcImage.left, rcImage.top-1); + TRACE("drawing image %d, left %ld, top %ld\n", item->iImage, rcImage.left, rcImage.top-1); ImageList_Draw ( infoPtr->himl, @@ -1914,7 +1909,7 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect } else { - TRACE("for <%s>, c_o_h=%d, c_o_v=%d, draw=(%s), textlen=%d\n", + TRACE("for <%s>, c_o_h=%d, c_o_v=%d, draw=(%s), textlen=%ld\n", debugstr_w(item->pszText), center_offset_h, center_offset_v, wine_dbgstr_rect(drawRect), (rcText.right-rcText.left)); if (item->pszText) @@ -3240,8 +3235,7 @@ TAB_DeselectAll (TAB_INFO *infoPtr, BOOL excludesel) static INT TAB_StyleChanged(TAB_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss) { - TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", - wStyleType, lpss->styleOld, lpss->styleNew); + TRACE("style type %Ix, styleOld %#lx, styleNew %#lx\n", wStyleType, lpss->styleOld, lpss->styleNew); if (wStyleType != GWL_STYLE) return 0; @@ -3258,7 +3252,8 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd); - TRACE("hwnd=%p msg=%x wParam=%lx lParam=%lx\n", hwnd, uMsg, wParam, lParam); + TRACE("hwnd %p, msg %x, wParam %Ix, lParam %Ix\n", hwnd, uMsg, wParam, lParam); + if (!infoPtr && (uMsg != WM_CREATE)) return DefWindowProcW (hwnd, uMsg, wParam, lParam); @@ -3425,8 +3420,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) default: if (uMsg >= WM_USER && uMsg < WM_APP && !COMCTL32_IsReflectedMessage(uMsg)) - WARN("unknown msg %04x wp=%08lx lp=%08lx\n", - uMsg, wParam, lParam); + WARN("unknown msg %04x wp %Ix, lp %Ix\n", uMsg, wParam, lParam); break; } return DefWindowProcW(hwnd, uMsg, wParam, lParam); diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 4523695d614..6682b399946 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -1210,7 +1210,7 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR struct taskdialog_info *dialog_info; LRESULT result; - TRACE("hwnd=%p msg=0x%04x wparam=%lx lparam=%lx\n", hwnd, msg, wParam, lParam); + TRACE("hwnd %p, msg 0x%04x, wparam %Ix, lparam %Ix\n", hwnd, msg, wParam, lParam); if (msg != WM_INITDIALOG) dialog_info = GetPropW(hwnd, taskdialog_info_propnameW); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 2ae70ad4f3e..9b059996b65 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -292,36 +292,29 @@ TOOLBAR_DumpTBButton(const TBBUTTON *tbb, BOOL fUnicode) static void TOOLBAR_DumpButton(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *bP, INT btn_num) { - if (TRACE_ON(toolbar)){ - TRACE("button %d id %d, bitmap=%d, state=%02x, style=%02x, data=%08lx, stringid=0x%08lx\n", - btn_num, bP->idCommand, GETIBITMAP(infoPtr, bP->iBitmap), - bP->fsState, bP->fsStyle, bP->dwData, bP->iString); - TRACE("string %s\n", debugstr_w(TOOLBAR_GetText(infoPtr,bP))); - TRACE("button %d id %d, hot=%s, row=%d, rect=(%s)\n", - btn_num, bP->idCommand, (bP->bHot) ? "TRUE":"FALSE", bP->nRow, - wine_dbgstr_rect(&bP->rect)); - } + TRACE("button %d id %d, bitmap=%d, state=%02x, style=%02x, data=%Ix, stringid=%Ix\n", + btn_num, bP->idCommand, GETIBITMAP(infoPtr, bP->iBitmap), bP->fsState, bP->fsStyle, bP->dwData, bP->iString); + TRACE("string %s\n", debugstr_w(TOOLBAR_GetText(infoPtr,bP))); + TRACE("button %d id %d, hot=%s, row=%d, rect=(%s)\n", btn_num, bP->idCommand, (bP->bHot) ? "TRUE":"FALSE", bP->nRow, + wine_dbgstr_rect(&bP->rect)); } static void TOOLBAR_DumpToolbar(const TOOLBAR_INFO *iP, INT line) { - if (TRACE_ON(toolbar)) { - INT i; - - TRACE("toolbar %p at line %d, exStyle=%08x, buttons=%d, bitmaps=%d, strings=%d, style=%08x\n", - iP->hwndSelf, line, - iP->dwExStyle, iP->nNumButtons, iP->nNumBitmaps, - iP->nNumStrings, iP->dwStyle); - TRACE("toolbar %p at line %d, himlInt=%p, himlDef=%p, himlHot=%p, himlDis=%p, redrawable=%s\n", - iP->hwndSelf, line, - iP->himlInt, iP->himlDef, iP->himlHot, iP->himlDis, - (iP->bDoRedraw) ? "TRUE" : "FALSE"); - for(i=0; i<iP->nNumButtons; i++) { - TOOLBAR_DumpButton(iP, &iP->buttons[i], i); - } - } + INT i; + + if (!TRACE_ON(toolbar)) + return; + + TRACE("toolbar %p at line %d, exStyle=%#lx, buttons=%d, bitmaps=%d, strings=%d, style=%#lx\n", + iP->hwndSelf, line, iP->dwExStyle, iP->nNumButtons, iP->nNumBitmaps, iP->nNumStrings, iP->dwStyle); + TRACE("toolbar %p at line %d, himlInt=%p, himlDef=%p, himlHot=%p, himlDis=%p, redrawable=%s\n", + iP->hwndSelf, line, iP->himlInt, iP->himlDef, iP->himlHot, iP->himlDis, (iP->bDoRedraw) ? "TRUE" : "FALSE"); + + for (i = 0; i < iP->nNumButtons; ++i) + TOOLBAR_DumpButton(iP, &iP->buttons[i], i); } static inline BOOL @@ -419,7 +412,7 @@ TOOLBAR_GetBitmapIndex(const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr) if (nmgd.dwMask & TBNF_DI_SETITEM) btnPtr->iBitmap = nmgd.iImage; ret = nmgd.iImage; - TRACE("TBN_GETDISPINFO returned bitmap id %d, mask=%08x, nNumBitmaps=%d\n", + TRACE("TBN_GETDISPINFO returned bitmap id %d, mask %#lx, nNumBitmaps %d\n", ret, nmgd.dwMask, infoPtr->nNumBitmaps); } @@ -976,11 +969,10 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, rcBitmap.top += infoPtr->szPadding.cy / 2; - TRACE("iBitmap=%d, start=(%d,%d) w=%d, h=%d\n", - btnPtr->iBitmap, rcBitmap.left, rcBitmap.top, + TRACE("iBitmap=%d, start=(%ld,%ld) w=%d, h=%d\n", btnPtr->iBitmap, rcBitmap.left, rcBitmap.top, infoPtr->nBitmapWidth, infoPtr->nBitmapHeight); TRACE("Text=%s\n", debugstr_w(lpText)); - TRACE("iListGap=%d, padding = { %d, %d }\n", infoPtr->iListGap, infoPtr->szPadding.cx, infoPtr->szPadding.cy); + TRACE("iListGap=%d, padding = { %ld, %ld }\n", infoPtr->iListGap, infoPtr->szPadding.cx, infoPtr->szPadding.cy); /* calculate text position */ if (lpText) @@ -1270,7 +1262,7 @@ TOOLBAR_MeasureString(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *btnPtr, } } - TRACE("string size %d x %d!\n", lpSize->cx, lpSize->cy); + TRACE("string size %ld x %ld.\n", lpSize->cx, lpSize->cy); } /*********************************************************************** @@ -1320,7 +1312,7 @@ TOOLBAR_CalcStrings (const TOOLBAR_INFO *infoPtr, LPSIZE lpSize) SelectObject (hdc, hOldFont); ReleaseDC (infoPtr->hwndSelf, hdc); - TRACE("max string size %d x %d\n", lpSize->cx, lpSize->cy); + TRACE("max string size %ld x %ld\n", lpSize->cx, lpSize->cy); } /*********************************************************************** @@ -2438,7 +2430,7 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if (!TOOLBAR_GetButtonInfo(infoPtr, &nmtb)) break; - TRACE("WM_INITDIALOG style: %x iItem(%d) idCommand(%d) iString(%ld) %s\n", + TRACE("WM_INITDIALOG style: %x iItem(%d) idCommand(%d) iString(%Id) %s\n", nmtb.tbButton.fsStyle, i, nmtb.tbButton.idCommand, nmtb.tbButton.iString, @@ -2865,7 +2857,7 @@ TOOLBAR_AddBitmap (TOOLBAR_INFO *infoPtr, INT count, const TBADDBITMAP *lpAddBmp info.nID = IDB_HIST_LARGE; break; default: - WARN("unknown bitmap id, %ld\n", lpAddBmp->nID); + WARN("unknown bitmap id, %Id\n", lpAddBmp->nID); return -1; } @@ -2951,7 +2943,7 @@ TOOLBAR_AddStringW (TOOLBAR_INFO *infoPtr, HINSTANCE hInstance, LPARAM lParam) BOOL fFirstString = (infoPtr->nNumStrings == 0); INT nIndex = infoPtr->nNumStrings; - TRACE("%p, %lx\n", hInstance, lParam); + TRACE("%p, %Ix\n", hInstance, lParam); if (IS_INTRESOURCE(lParam)) { WCHAR szString[MAX_RESOURCE_STRING_LENGTH]; @@ -3033,7 +3025,7 @@ TOOLBAR_AddStringA (TOOLBAR_INFO *infoPtr, HINSTANCE hInstance, LPARAM lParam) INT nIndex; INT len; - TRACE("%p, %lx\n", hInstance, lParam); + TRACE("%p, %Ix\n", hInstance, lParam); if (IS_INTRESOURCE(lParam)) /* load from resources */ return TOOLBAR_AddStringW(infoPtr, hInstance, lParam); @@ -3064,7 +3056,7 @@ TOOLBAR_AddStringA (TOOLBAR_INFO *infoPtr, HINSTANCE hInstance, LPARAM lParam) static LRESULT TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) { - TRACE("auto sizing, style=%#x\n", infoPtr->dwStyle); + TRACE("auto sizing, style=%#lx\n", infoPtr->dwStyle); TRACE("nRows: %d, infoPtr->nButtonHeight: %d\n", infoPtr->nRows, infoPtr->nButtonHeight); if (!(infoPtr->dwStyle & CCS_NORESIZE)) @@ -3175,7 +3167,7 @@ TOOLBAR_CheckButton (TOOLBAR_INFO *infoPtr, INT Id, LPARAM lParam) nIndex = TOOLBAR_GetButtonIndex (infoPtr, Id, FALSE); - TRACE("hwnd=%p, btn index=%d, lParam=0x%08lx\n", infoPtr->hwndSelf, nIndex, lParam); + TRACE("hwnd %p, btn index %d, lParam %Ix\n", infoPtr->hwndSelf, nIndex, lParam); if (nIndex == -1) return FALSE; @@ -3307,7 +3299,7 @@ TOOLBAR_EnableButton (TOOLBAR_INFO *infoPtr, INT Id, LPARAM lParam) nIndex = TOOLBAR_GetButtonIndex (infoPtr, Id, FALSE); - TRACE("hwnd=%p, btn id=%d, lParam=0x%08lx\n", infoPtr->hwndSelf, Id, lParam); + TRACE("hwnd %p, btn id %d, lParam %Ix\n", infoPtr->hwndSelf, Id, lParam); if (nIndex == -1) return FALSE; @@ -3479,7 +3471,7 @@ TOOLBAR_GetButtonText (const TOOLBAR_INFO *infoPtr, INT Id, LPWSTR lpStr, BOOL i static LRESULT TOOLBAR_GetDisabledImageList (const TOOLBAR_INFO *infoPtr, WPARAM wParam) { - TRACE("hwnd=%p, wParam=%ld\n", infoPtr->hwndSelf, wParam); + TRACE("hwnd %p, wParam %Id\n", infoPtr->hwndSelf, wParam); /* UNDOCUMENTED: wParam is actually the ID of the image list to return */ return (LRESULT)GETDISIMAGELIST(infoPtr, wParam); } @@ -3497,7 +3489,7 @@ TOOLBAR_GetExtendedStyle (const TOOLBAR_INFO *infoPtr) static LRESULT TOOLBAR_GetHotImageList (const TOOLBAR_INFO *infoPtr, WPARAM wParam) { - TRACE("hwnd=%p, wParam=%ld\n", infoPtr->hwndSelf, wParam); + TRACE("hwnd %p, wParam %Id\n", infoPtr->hwndSelf, wParam); /* UNDOCUMENTED: wParam is actually the ID of the image list to return */ return (LRESULT)GETHOTIMAGELIST(infoPtr, wParam); } @@ -3519,7 +3511,7 @@ TOOLBAR_GetHotItem (const TOOLBAR_INFO *infoPtr) static LRESULT TOOLBAR_GetDefImageList (const TOOLBAR_INFO *infoPtr, WPARAM wParam) { - TRACE("hwnd=%p, wParam=%ld\n", infoPtr->hwndSelf, wParam); + TRACE("hwnd %p, wParam %Id\n", infoPtr->hwndSelf, wParam); /* UNDOCUMENTED: wParam is actually the ID of the image list to return */ return (LRESULT) GETDEFIMAGELIST(infoPtr, wParam); } @@ -3577,9 +3569,8 @@ TOOLBAR_GetMaxSize (const TOOLBAR_INFO *infoPtr, LPSIZE lpSize) lpSize->cx = infoPtr->rcBound.right - infoPtr->rcBound.left; lpSize->cy = infoPtr->rcBound.bottom - infoPtr->rcBound.top; - TRACE("maximum size %d x %d\n", - infoPtr->rcBound.right - infoPtr->rcBound.left, - infoPtr->rcBound.bottom - infoPtr->rcBound.top); + TRACE("maximum size %ld x %ld\n", infoPtr->rcBound.right - infoPtr->rcBound.left, + infoPtr->rcBound.bottom - infoPtr->rcBound.top); return TRUE; } @@ -3856,7 +3847,7 @@ TOOLBAR_LoadImages (TOOLBAR_INFO *infoPtr, WPARAM wParam, HINSTANCE hInstance) tbab.hInst = hInstance; tbab.nID = wParam; - TRACE("hwnd = %p, hInst = %p, nID = %lu\n", infoPtr->hwndSelf, tbab.hInst, tbab.nID); + TRACE("hwnd = %p, hInst = %p, nID = %Iu\n", infoPtr->hwndSelf, tbab.hInst, tbab.nID); return TOOLBAR_AddBitmap(infoPtr, 0, &tbab); } @@ -4036,7 +4027,7 @@ TOOLBAR_ReplaceBitmap (TOOLBAR_INFO *infoPtr, const TBREPLACEBITMAP *lpReplace) int nOldBitmaps, nNewBitmaps = 0; HIMAGELIST himlDef = 0; - TRACE("hInstOld %p nIDOld %lx hInstNew %p nIDNew %lx nButtons %x\n", + TRACE("hInstOld %p nIDOld %Ix hInstNew %p nIDNew %Ix nButtons %x\n", lpReplace->hInstOld, lpReplace->nIDOld, lpReplace->hInstNew, lpReplace->nIDNew, lpReplace->nButtons); @@ -4048,7 +4039,7 @@ TOOLBAR_ReplaceBitmap (TOOLBAR_INFO *infoPtr, const TBREPLACEBITMAP *lpReplace) else if (lpReplace->hInstOld != 0 && lpReplace->hInstOld != lpReplace->hInstNew) FIXME("resources not in the current module not implemented\n"); - TRACE("To be replaced hInstOld %p nIDOld %lx\n", lpReplace->hInstOld, lpReplace->nIDOld); + TRACE("To be replaced hInstOld %p nIDOld %Ix\n", lpReplace->hInstOld, lpReplace->nIDOld); for (i = 0; i < infoPtr->nNumBitmapInfos; i++) { TBITMAP_INFO *tbi = &infoPtr->bitmaps[i]; TRACE("tbimapinfo %d hInstOld %p nIDOld %x\n", i, tbi->hInst, tbi->nID); @@ -4067,7 +4058,7 @@ TOOLBAR_ReplaceBitmap (TOOLBAR_INFO *infoPtr, const TBREPLACEBITMAP *lpReplace) if (nOldButtons == 0) { - WARN("No hinst/bitmap found! hInst %p nID %lx\n", lpReplace->hInstOld, lpReplace->nIDOld); + WARN("No hinst/bitmap found! hInst %p nID %Ix\n", lpReplace->hInstOld, lpReplace->nIDOld); return FALSE; } @@ -4381,10 +4372,10 @@ TOOLBAR_SetBitmapSize (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) short width = (short)LOWORD(lParam); short height = (short)HIWORD(lParam); - TRACE("hwnd=%p, wParam=%ld, size %d x %d\n", infoPtr->hwndSelf, wParam, width, height); + TRACE("hwnd %p, wParam %Id, size %d x %d\n", infoPtr->hwndSelf, wParam, width, height); if (wParam != 0) - FIXME("wParam is %ld. Perhaps image list index?\n", wParam); + FIXME("wParam is %Id. Perhaps image list index?\n", wParam); /* 0 width or height is changed to 1 */ if (width == 0) @@ -4479,7 +4470,7 @@ TOOLBAR_SetButtonSize (TOOLBAR_INFO *infoPtr, LPARAM lParam) if ((cx < 0) || (cy < 0)) { - ERR("invalid parameter 0x%08x\n", (DWORD)lParam); + ERR("invalid parameter %#Ix\n", lParam); return FALSE; } @@ -4586,7 +4577,7 @@ TOOLBAR_SetDrawTextFlags (TOOLBAR_INFO *infoPtr, DWORD mask, DWORD flags) { DWORD old_flags; - TRACE("hwnd = %p, mask = 0x%08x, flags = 0x%08x\n", infoPtr->hwndSelf, mask, flags); + TRACE("hwnd = %p, mask = %#lx, flags %#lx\n", infoPtr->hwndSelf, mask, flags); old_flags = infoPtr->dwDTFlags; infoPtr->dwDTFlags = (old_flags & ~mask) | (flags & mask); @@ -4605,7 +4596,7 @@ TOOLBAR_SetExtendedStyle (TOOLBAR_INFO *infoPtr, DWORD mask, DWORD style) { DWORD old_style = infoPtr->dwExStyle; - TRACE("mask=0x%08x, style=0x%08x\n", mask, style); + TRACE("mask %#lx, style %#lx\n", mask, style); if (mask) infoPtr->dwExStyle = (old_style & ~mask) | (style & mask); @@ -4613,8 +4604,7 @@ TOOLBAR_SetExtendedStyle (TOOLBAR_INFO *infoPtr, DWORD mask, DWORD style) infoPtr->dwExStyle = style; if (infoPtr->dwExStyle & ~TBSTYLE_EX_ALL) - FIXME("Unknown Toolbar Extended Style 0x%08x. Please report.\n", - (infoPtr->dwExStyle & ~TBSTYLE_EX_ALL)); + FIXME("Unknown Toolbar Extended Style %#lx. Please report.\n", (infoPtr->dwExStyle & ~TBSTYLE_EX_ALL)); if ((old_style ^ infoPtr->dwExStyle) & TBSTYLE_EX_MIXEDBUTTONS) TOOLBAR_CalcToolbar(infoPtr); @@ -4794,11 +4784,11 @@ TOOLBAR_SetIndent (TOOLBAR_INFO *infoPtr, INT nIndent) static LRESULT TOOLBAR_SetInsertMark (TOOLBAR_INFO *infoPtr, const TBINSERTMARK *lptbim) { - TRACE("hwnd = %p, lptbim = { %d, 0x%08x}\n", infoPtr->hwndSelf, lptbim->iButton, lptbim->dwFlags); + TRACE("hwnd = %p, lptbim = { %d, %#lx}\n", infoPtr->hwndSelf, lptbim->iButton, lptbim->dwFlags); if ((lptbim->dwFlags & ~TBIMHT_AFTER) != 0) { - FIXME("Unrecognized flag(s): 0x%08x\n", (lptbim->dwFlags & ~TBIMHT_AFTER)); + FIXME("Unrecognized flag(s): %#lx\n", (lptbim->dwFlags & ~TBIMHT_AFTER)); return 0; } @@ -4858,8 +4848,7 @@ TOOLBAR_SetPadding (TOOLBAR_INFO *infoPtr, LPARAM lParam) oldPad = MAKELONG(infoPtr->szPadding.cx, infoPtr->szPadding.cy); infoPtr->szPadding.cx = min(LOWORD((DWORD)lParam), GetSystemMetrics(SM_CXEDGE)); infoPtr->szPadding.cy = min(HIWORD((DWORD)lParam), GetSystemMetrics(SM_CYEDGE)); - TRACE("cx=%d, cy=%d\n", - infoPtr->szPadding.cx, infoPtr->szPadding.cy); + TRACE("cx %ld, cy %ld\n", infoPtr->szPadding.cx, infoPtr->szPadding.cy); return (LRESULT) oldPad; } @@ -5041,7 +5030,7 @@ TOOLBAR_SetStyle (TOOLBAR_INFO *infoPtr, DWORD style) { DWORD dwOldStyle = infoPtr->dwStyle; - TRACE("new style 0x%08x\n", style); + TRACE("new style %#lx\n", style); if (style & TBSTYLE_LIST) infoPtr->dwDTFlags = DT_LEFT | DT_VCENTER | DT_SINGLELINE | DT_END_ELLIPSIS; @@ -5111,7 +5100,7 @@ TOOLBAR_GetColorScheme (const TOOLBAR_INFO *infoPtr, LPCOLORSCHEME lParam) static LRESULT TOOLBAR_SetColorScheme (TOOLBAR_INFO *infoPtr, const COLORSCHEME *lParam) { - TRACE("new colors Hl=%x Shd=%x, old colors Hl=%x Shd=%x\n", + TRACE("new colors Hl=%#lx Shd=%#lx, old colors Hl=%#lx Shd=%#lx\n", lParam->clrBtnHighlight, lParam->clrBtnShadow, infoPtr->clrBtnHighlight, infoPtr->clrBtnShadow); @@ -5190,7 +5179,7 @@ TOOLBAR_GetStringW (const TOOLBAR_INFO *infoPtr, WPARAM wParam, LPWSTR str) static LRESULT TOOLBAR_SetBoundingSize(HWND hwnd, WPARAM wParam, LPARAM lParam) { SIZE * pSize = (SIZE*)lParam; - FIXME("hwnd=%p, wParam=0x%08lx, size.cx=%d, size.cy=%d stub\n", hwnd, wParam, pSize->cx, pSize->cy); + FIXME("hwnd=%p, wParam=%Ix, size.cx=%ld, size.cy=%ld stub\n", hwnd, wParam, pSize->cx, pSize->cy); return 0; } @@ -5202,8 +5191,7 @@ TOOLBAR_SetHotItem2 (TOOLBAR_INFO *infoPtr, INT nHotItem, LPARAM lParam) { INT nOldHotItem = infoPtr->nHotItem; - TRACE("old item=%d, new item=%d, flags=%08x\n", - nOldHotItem, nHotItem, (DWORD)lParam); + TRACE("old item %d, new item %d, flags %Ix\n", nOldHotItem, nHotItem, lParam); if (nHotItem < 0 || nHotItem > infoPtr->nNumButtons) nHotItem = -1; @@ -5254,8 +5242,7 @@ TOOLBAR_GetIdealSize (const TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) * lParam pointer to SIZE structure * */ - TRACE("wParam %ld, lParam 0x%08lx -> 0x%08x 0x%08x\n", - wParam, lParam, lpsize->cx, lpsize->cy); + TRACE("wParam %Id, lParam %Ix -> %lx, %lx\n", wParam, lParam, lpsize->cx, lpsize->cy); switch(wParam) { case 0: @@ -5280,17 +5267,16 @@ TOOLBAR_GetIdealSize (const TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) lpsize->cy = infoPtr->rcBound.bottom - infoPtr->rcBound.top; break; default: - FIXME("Unknown wParam %ld\n", wParam); + FIXME("Unknown wParam %Id\n", wParam); return 0; } - TRACE("set to -> 0x%08x 0x%08x\n", - lpsize->cx, lpsize->cy); + TRACE("set to -> %lu, %lu\n", lpsize->cx, lpsize->cy); return 1; } static LRESULT TOOLBAR_Unkwn464(HWND hwnd, WPARAM wParam, LPARAM lParam) { - FIXME("hwnd=%p wParam %08lx lParam %08lx\n", hwnd, wParam, lParam); + FIXME("hwnd %p, wParam %Ix, lParam %Ix\n", hwnd, wParam, lParam); InvalidateRect(hwnd, NULL, TRUE); return 1; @@ -5303,7 +5289,7 @@ TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) TOOLBAR_INFO *infoPtr = (TOOLBAR_INFO *)GetWindowLongPtrW(hwnd, 0); LOGFONTW logFont; - TRACE("hwnd = %p, style=0x%08x\n", hwnd, lpcs->style); + TRACE("hwnd = %p, style = %#lx\n", hwnd, lpcs->style); infoPtr->dwStyle = GetWindowLongW(hwnd, GWL_STYLE); GetClientRect(hwnd, &infoPtr->client_rect); @@ -5395,7 +5381,7 @@ TOOLBAR_EraseBackground (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) case CDRF_SKIPDEFAULT: return TRUE; default: - FIXME("[%p] response %d not handled to NM_CUSTOMDRAW (CDDS_PREERASE)\n", + FIXME("[%p] response %ld not handled to NM_CUSTOMDRAW (CDDS_PREERASE)\n", infoPtr->hwndSelf, ntfret); } } @@ -5432,7 +5418,7 @@ TOOLBAR_EraseBackground (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) case CDRF_SKIPDEFAULT: return TRUE; default: - FIXME("[%p] response %d not handled to NM_CUSTOMDRAW (CDDS_POSTERASE)\n", + FIXME("[%p] response %ld not handled to NM_CUSTOMDRAW (CDDS_POSTERASE)\n", infoPtr->hwndSelf, ntfret); } } @@ -5605,7 +5591,7 @@ TOOLBAR_LButtonDown (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) nmtb.iItem = btnPtr->idCommand; nmtb.rcButton = btnPtr->rect; res = TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr, TBN_DROPDOWN); - TRACE("TBN_DROPDOWN responded with %ld\n", res); + TRACE("TBN_DROPDOWN responded with %Id\n", res); if (res != TBDDRET_TREATPRESSED) { @@ -6381,7 +6367,7 @@ TOOLBAR_NotifyFormat(const TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { LRESULT format; - TRACE("wParam = 0x%lx, lParam = 0x%08lx\n", wParam, lParam); + TRACE("wParam %Ix, lParam %Ix\n", wParam, lParam); if (lParam == NF_QUERY) return NFR_UNICODE; @@ -6390,8 +6376,7 @@ TOOLBAR_NotifyFormat(const TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) format = SendMessageW(infoPtr->hwndNotify, WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY); if ((format != NFR_ANSI) && (format != NFR_UNICODE)) { - ERR("wrong response to WM_NOTIFYFORMAT (%ld), assuming ANSI\n", - format); + ERR("wrong response to WM_NOTIFYFORMAT (%Id), assuming ANSI\n", format); format = NFR_ANSI; } return format; @@ -6561,8 +6546,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { TOOLBAR_INFO *infoPtr = (TOOLBAR_INFO *)GetWindowLongPtrW(hwnd, 0); - TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", - hwnd, uMsg, /* SPY_GetMsgName(uMsg), */ wParam, lParam); + TRACE("hwnd %p, msg %x, wparam %Ix, lparam %Ix\n", hwnd, uMsg, wParam, lParam); if (!infoPtr && (uMsg != WM_NCCREATE)) return DefWindowProcW( hwnd, uMsg, wParam, lParam ); @@ -6958,8 +6942,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) default: if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) - ERR("unknown msg %04x wp=%08lx lp=%08lx\n", - uMsg, wParam, lParam); + ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam); } } diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 2a68beafd7d..95ef8da6794 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -228,7 +228,7 @@ TOOLTIPS_notify_customdraw (DWORD dwDrawStage, NMTTCUSTOMDRAW *lpnmttcd) LRESULT result; lpnmttcd->nmcd.dwDrawStage = dwDrawStage; - TRACE("Notifying stage %d, flags %x, id %x\n", lpnmttcd->nmcd.dwDrawStage, + TRACE("Notifying stage %ld, flags %x, id %x\n", lpnmttcd->nmcd.dwDrawStage, lpnmttcd->uDrawFlags, lpnmttcd->nmcd.hdr.code); result = SendMessageW(GetParent(lpnmttcd->nmcd.hdr.hwndFrom), WM_NOTIFY, @@ -370,7 +370,7 @@ static void TOOLTIPS_GetDispInfoA(const TOOLTIPS_INFO *infoPtr, TTTOOL_INFO *too ttnmdi.uFlags = toolPtr->uFlags; ttnmdi.lParam = toolPtr->lParam; - TRACE("hdr.idFrom = %lx\n", ttnmdi.hdr.idFrom); + TRACE("hdr.idFrom = %Ix\n", ttnmdi.hdr.idFrom); SendMessageW(toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&ttnmdi); if (IS_INTRESOURCE(ttnmdi.lpszText)) { @@ -426,7 +426,7 @@ static void TOOLTIPS_GetDispInfoW(const TOOLTIPS_INFO *infoPtr, TTTOOL_INFO *too ttnmdi.uFlags = toolPtr->uFlags; ttnmdi.lParam = toolPtr->lParam; - TRACE("hdr.idFrom = %lx\n", ttnmdi.hdr.idFrom); + TRACE("hdr.idFrom = %Ix\n", ttnmdi.hdr.idFrom); SendMessageW(toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&ttnmdi); if (IS_INTRESOURCE(ttnmdi.lpszText)) { @@ -616,7 +616,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) toolPtr = &infoPtr->tools[nTool]; TOOLTIPS_CalcTipSize (infoPtr, &size); - TRACE("Show tooltip %d, %s, size %d x %d\n", nTool, debugstr_w(infoPtr->szTipText), + TRACE("Show tooltip %d, %s, size %ld x %ld\n", nTool, debugstr_w(infoPtr->szTipText), size.cx, size.cy); if (track_activate && (toolPtr->uFlags & TTF_TRACK)) @@ -720,7 +720,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) } } - TRACE("pos %d - %d\n", rect.left, rect.top); + TRACE("pos %ld - %ld\n", rect.left, rect.top); rect.right = rect.left + size.cx; rect.bottom = rect.top + size.cy; @@ -1045,7 +1045,7 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) if (!ti) return FALSE; - TRACE("add tool (%p) %p %ld%s\n", infoPtr->hwndSelf, ti->hwnd, ti->uId, + TRACE("add tool (%p) %p %Id%s\n", infoPtr->hwndSelf, ti->hwnd, ti->uId, (ti->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : ""); if (ti->cbSize > TTTOOLINFOW_V3_SIZE && isW) @@ -1285,7 +1285,7 @@ TOOLTIPS_GetBubbleSize (const TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *lpToolI TRACE("tool %d\n", nTool); TOOLTIPS_CalcTipSize (infoPtr, &size); - TRACE("size %d x %d\n", size.cx, size.cy); + TRACE("size %ld x %ld\n", size.cx, size.cy); return MAKELRESULT(size.cx, size.cy); } @@ -1320,7 +1320,7 @@ TOOLTIPS_GetDelayTime (const TOOLTIPS_INFO *infoPtr, DWORD duration) return infoPtr->nInitialTime; default: - WARN("Invalid duration flag %x\n", duration); + WARN("Invalid duration flag %lx\n", duration); break; } @@ -1577,7 +1577,7 @@ TOOLTIPS_SetDelayTime (TOOLTIPS_INFO *infoPtr, DWORD duration, INT nTime) break; default: - WARN("Invalid duration flag %x\n", duration); + WARN("Invalid duration flag %lx\n", duration); break; } @@ -1924,7 +1924,7 @@ TOOLTIPS_NCHitTest (const TOOLTIPS_INFO *infoPtr, WPARAM wParam, LPARAM lParam) static LRESULT TOOLTIPS_NotifyFormat (TOOLTIPS_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - FIXME ("hwnd=%p wParam=%lx lParam=%lx\n", infoPtr->hwndSelf, wParam, lParam); + FIXME("hwnd %p, wParam %Ix, lParam %Ix\n", infoPtr->hwndSelf, wParam, lParam); return 0; } @@ -2102,7 +2102,8 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); - TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx\n", hwnd, uMsg, wParam, lParam); + TRACE("hwnd %p, msg %x, wparam %Ix, lParam %Ix\n", hwnd, uMsg, wParam, lParam); + if (!infoPtr && (uMsg != WM_CREATE) && (uMsg != WM_NCCREATE)) return DefWindowProcW (hwnd, uMsg, wParam, lParam); switch (uMsg) @@ -2270,8 +2271,7 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) default: if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) - ERR("unknown msg %04x wp=%08lx lp=%08lx\n", - uMsg, wParam, lParam); + ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam); } } diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index ce6a20c6c63..6643752c043 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -118,7 +118,7 @@ static LRESULT notify_hdr (const TRACKBAR_INFO *infoPtr, INT code, LPNMHDR pnmh) pnmh->code = code; result = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, pnmh->idFrom, (LPARAM)pnmh); - TRACE(" <= %ld\n", result); + TRACE(" <= %Id\n", result); return result; } @@ -443,7 +443,7 @@ TRACKBAR_AutoPage (TRACKBAR_INFO *infoPtr, POINT clickPoint) LONG dir = TRACKBAR_GetAutoPageDirection(infoPtr, clickPoint); LONG prevPos = infoPtr->lPos; - TRACE("clickPoint=%s, dir=%d\n", wine_dbgstr_point(&clickPoint), dir); + TRACE("clickPoint=%s, dir=%ld\n", wine_dbgstr_point(&clickPoint), dir); if (dir > 0 && (infoPtr->flags & TB_AUTO_PAGE_RIGHT)) TRACKBAR_PageDown(infoPtr); @@ -1127,7 +1127,6 @@ static int __cdecl comp_tics (const void *ap, const void *bp) const DWORD a = *(const DWORD *)ap; const DWORD b = *(const DWORD *)bp; - TRACE("(a=%d, b=%d)\n", a, b); if (a < b) return -1; if (a > b) return 1; return 0; @@ -1407,7 +1406,7 @@ TRACKBAR_SetTic (TRACKBAR_INFO *infoPtr, LONG lPos) if ((lPos < infoPtr->lRangeMin) || (lPos> infoPtr->lRangeMax)) return FALSE; - TRACE("lPos=%d\n", lPos); + TRACE("position %ld\n", lPos); infoPtr->uNumTics++; infoPtr->tics=ReAlloc( infoPtr->tics, @@ -1885,7 +1884,7 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { TRACKBAR_INFO *infoPtr = (TRACKBAR_INFO *)GetWindowLongPtrW (hwnd, 0); - TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hwnd, uMsg, wParam, lParam); + TRACE("hwnd %p, msg %x, wparam %Ix, lparam %Ix\n", hwnd, uMsg, wParam, lParam); if (!infoPtr && (uMsg != WM_CREATE)) return DefWindowProcW (hwnd, uMsg, wParam, lParam); @@ -2064,7 +2063,7 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) default: if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) - ERR("unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam); + ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam); return DefWindowProcW (hwnd, uMsg, wParam, lParam); } } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 1368105f271..608ce489e33 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -624,7 +624,7 @@ TREEVIEW_SendCustomDrawNotify(const TREEVIEW_INFO *infoPtr, DWORD dwDrawStage, NMTVCUSTOMDRAW nmcdhdr; NMCUSTOMDRAW *nmcd; - TRACE("drawstage:0x%x hdc:%p\n", dwDrawStage, hdc); + TRACE("drawstage %#lx, hdc %p\n", dwDrawStage, hdc); nmcd = &nmcdhdr.nmcd; nmcd->dwDrawStage = dwDrawStage; @@ -671,7 +671,7 @@ TREEVIEW_SendCustomDrawItemNotify(const TREEVIEW_INFO *infoPtr, HDC hdc, nmcd->lItemlParam = item->lParam; nmcdhdr->iLevel = item->iLevel; - TRACE("drawstage:0x%x hdc:%p item:%lx, itemstate:0x%x, lItemlParam:0x%lx\n", + TRACE("drawstage %#lx hdc:%p item:%Ix, itemstate:0x%x, lItemlParam:%Ix\n", nmcd->dwDrawStage, nmcd->hdc, nmcd->dwItemSpec, nmcd->uItemState, nmcd->lItemlParam); @@ -2005,7 +2005,7 @@ TREEVIEW_SetInsertMarkColor(TREEVIEW_INFO *infoPtr, COLORREF color) { COLORREF prevColor = infoPtr->clrInsertMark; - TRACE("0x%08x\n", color); + TRACE("%#lx\n", color); infoPtr->clrInsertMark = color; return (LRESULT)prevColor; @@ -2079,7 +2079,7 @@ static inline LRESULT TREEVIEW_GetVisibleCount(const TREEVIEW_INFO *infoPtr) { /* Surprise! This does not take integral height into account. */ - TRACE("client=%d, item=%d\n", infoPtr->clientHeight, infoPtr->uItemHeight); + TRACE("client=%ld, item=%d\n", infoPtr->clientHeight, infoPtr->uItemHeight); return infoPtr->clientHeight / infoPtr->uItemHeight; } @@ -3113,7 +3113,7 @@ TREEVIEW_Paint(TREEVIEW_INFO *infoPtr, HDC hdc_ref) static LRESULT TREEVIEW_PrintClient(TREEVIEW_INFO *infoPtr, HDC hdc, DWORD options) { - FIXME("Partial Stub: (hdc=%p options=0x%08x)\n", hdc, options); + FIXME("Partial Stub: (hdc=%p options=%#lx)\n", hdc, options); if ((options & PRF_CHECKVISIBLE) && !IsWindowVisible(infoPtr->hwnd)) return 0; @@ -3789,7 +3789,7 @@ TREEVIEW_HitTest(const TREEVIEW_INFO *infoPtr, LPTVHITTESTINFO lpht) } lpht->hItem = item; - TRACE("(%d,%d):result 0x%x\n", lpht->pt.x, lpht->pt.y, lpht->flags); + TRACE("(%ld, %ld) : result 0x%x\n", lpht->pt.x, lpht->pt.y, lpht->flags); return item; } @@ -3866,7 +3866,7 @@ TREEVIEW_Edit_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) static LRESULT TREEVIEW_Command(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - TRACE("code=0x%x, id=0x%x, handle=0x%lx\n", HIWORD(wParam), LOWORD(wParam), lParam); + TRACE("code 0x%x, id=0x%x, handle %Ix\n", HIWORD(wParam), LOWORD(wParam), lParam); switch (HIWORD(wParam)) { @@ -4472,7 +4472,7 @@ TREEVIEW_CreateDragImage(TREEVIEW_INFO *infoPtr, LPARAM lParam) else GetTextExtentPoint32A(hdc, "", 0, &size); - TRACE("%d %d %s\n", size.cx, size.cy, debugstr_w(dragItem->pszText)); + TRACE("%ld, %ld, %s\n", size.cx, size.cy, debugstr_w(dragItem->pszText)); hbmp = CreateCompatibleBitmap(htopdc, size.cx, size.cy); hOldbmp = SelectObject(hdc, hbmp); @@ -4804,7 +4804,7 @@ TREEVIEW_EnsureVisible(TREEVIEW_INFO *infoPtr, HTREEITEM item, BOOL bHScroll) viscount = TREEVIEW_GetVisibleCount(infoPtr); - TRACE("%p (%s) %d - %d viscount(%d)\n", item, TREEVIEW_ItemName(item), item->visibleOrder, + TRACE("%p (%s) %ld - %ld viscount(%d)\n", item, TREEVIEW_ItemName(item), item->visibleOrder, hasFirstVisible ? infoPtr->firstVisible->visibleOrder : -1, viscount); if (hasFirstVisible) @@ -4939,7 +4939,7 @@ TREEVIEW_VScroll(TREEVIEW_INFO *infoPtr, WPARAM wParam) int nScrollCode = LOWORD(wParam); - TRACE("wp %lx\n", wParam); + TRACE("wp %Ix\n", wParam); if (!(infoPtr->uInternalStatus & TV_VSCROLL)) return 0; @@ -5009,7 +5009,7 @@ TREEVIEW_HScroll(TREEVIEW_INFO *infoPtr, WPARAM wParam) int scrollX = infoPtr->scrollX; int nScrollCode = LOWORD(wParam); - TRACE("wp %lx\n", wParam); + TRACE("wp %Ix\n", wParam); if (!(infoPtr->uInternalStatus & TV_HSCROLL)) return FALSE; @@ -5131,7 +5131,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) TREEVIEW_INFO *infoPtr; LOGFONTW lf; - TRACE("wnd %p, style 0x%x\n", hwnd, GetWindowLongW(hwnd, GWL_STYLE)); + TRACE("wnd %p, style %#lx\n", hwnd, GetWindowLongW(hwnd, GWL_STYLE)); infoPtr = heap_alloc_zero(sizeof(TREEVIEW_INFO)); @@ -5323,7 +5323,7 @@ TREEVIEW_KeyDown(TREEVIEW_INFO *infoPtr, WPARAM wParam) TREEVIEW_ITEM *prevItem = infoPtr->selectedItem; NMTVKEYDOWN nmkeydown; - TRACE("%lx\n", wParam); + TRACE("%Ix\n", wParam); nmkeydown.wVKey = wParam; nmkeydown.flags = 0; @@ -5538,13 +5538,13 @@ TREEVIEW_Notify(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if (lppgc->dwFlag == PGF_CALCWIDTH) { lppgc->iWidth = infoPtr->treeWidth; - TRACE("got PGN_CALCSIZE, returning horz size = %d, client=%d\n", + TRACE("got PGN_CALCSIZE, returning horz size = %ld, client= %ld\n", infoPtr->treeWidth, infoPtr->clientWidth); } else { lppgc->iHeight = infoPtr->treeHeight; - TRACE("got PGN_CALCSIZE, returning vert size = %d, client=%d\n", - infoPtr->treeHeight, infoPtr->clientHeight); + TRACE("got PGN_CALCSIZE, returning vert size = %ld, client = %ld\n", infoPtr->treeHeight, + infoPtr->clientHeight); } return 0; } @@ -5565,7 +5565,7 @@ TREEVIEW_Size(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) } else { - FIXME("WM_SIZE flag %lx %lx not handled\n", wParam, lParam); + FIXME("WM_SIZE flag %Ix %Ix not handled\n", wParam, lParam); } TREEVIEW_Invalidate(infoPtr, NULL); @@ -5575,7 +5575,7 @@ TREEVIEW_Size(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) static LRESULT TREEVIEW_StyleChanged(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - TRACE("(%lx %lx)\n", wParam, lParam); + TRACE("%Ix, %Ix.\n", wParam, lParam); if (wParam == GWL_STYLE) { @@ -5699,7 +5699,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd); - TRACE("hwnd %p msg %04x wp=%08lx lp=%08lx\n", hwnd, uMsg, wParam, lParam); + TRACE("hwnd %p, msg %04x, wp %Ix, lp %Ix\n", hwnd, uMsg, wParam, lParam); if (infoPtr) TREEVIEW_VerifyTree(infoPtr); else @@ -5954,7 +5954,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) default: /* This mostly catches MFC and Delphi messages. :( */ if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) - TRACE("Unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam); + TRACE("Unknown msg %04x wp %Ix lp %Ix\n", uMsg, wParam, lParam); def: return DefWindowProcW(hwnd, uMsg, wParam, lParam); } diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index d5625839db3..e07f9e7a9f2 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -576,8 +576,7 @@ UPDOWN_Buddy_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, { UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr((HWND)ref_data); - TRACE("hwnd=%p, uMsg=%04x, wParam=%08lx, lParam=%08lx\n", - hwnd, uMsg, wParam, lParam); + TRACE("hwnd %p, uMsg %04x, wParam %Ix, lParam %Ix\n", hwnd, uMsg, wParam, lParam); switch(uMsg) { @@ -892,7 +891,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr (hwnd); HTHEME theme; - TRACE("hwnd=%p msg=%04x wparam=%08lx lparam=%08lx\n", hwnd, message, wParam, lParam); + TRACE("hwnd %p, msg %04x, wparam %Id, lparam %Ix\n", hwnd, message, wParam, lParam); if (!infoPtr && (message != WM_CREATE)) return DefWindowProcW (hwnd, message, wParam, lParam); @@ -1088,7 +1087,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L return infoPtr->Base; case UDM_SETBASE: - TRACE("UpDown Ctrl new base(%ld), hwnd=%p\n", wParam, hwnd); + TRACE("UpDown Ctrl new base(%Id), hwnd=%p\n", wParam, hwnd); if (wParam==10 || wParam==16) { WPARAM old_base = infoPtr->Base; infoPtr->Base = wParam; @@ -1159,7 +1158,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L } default: if ((message >= WM_USER) && (message < WM_APP) && !COMCTL32_IsReflectedMessage(message)) - ERR("unknown msg %04x wp=%04lx lp=%08lx\n", message, wParam, lParam); + ERR("unknown msg %04x wp=%Ix lp=%Ix\n", message, wParam, lParam); return DefWindowProcW (hwnd, message, wParam, lParam); } -- 2.34.1

1 0

[PATCH] dbgeng: Fix long types warnings in traces.
by Nikolay Sivov Feb. 7, 2022

Feb. 7, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dbgeng/Makefile.in | 1 - dlls/dbgeng/dbgeng.c | 468 ++++++++++++++++++++-------------------- 2 files changed, 234 insertions(+), 235 deletions(-) diff --git a/dlls/dbgeng/Makefile.in b/dlls/dbgeng/Makefile.in index dc00f025e7c..c2639c5d222 100644 --- a/dlls/dbgeng/Makefile.in +++ b/dlls/dbgeng/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dbgeng.dll IMPORTLIB = dbgeng DELAYIMPORTS = version diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 5ffde0e3c80..880b6f03b43 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -164,7 +164,7 @@ static HRESULT debug_target_init_modules_info(struct target_process *target) { if (!GetModuleInformation(target->handle, modules[i], &info, sizeof(info))) { - WARN("Failed to get module information, error %d.\n", GetLastError()); + WARN("Failed to get module information, error %ld.\n", GetLastError()); continue; } @@ -230,7 +230,7 @@ static void debug_client_detach_target(struct target_process *target) if (resume) { if ((status = NtResumeProcess(target->handle))) - WARN("Failed to resume process, status %#x.\n", status); + WARN("Failed to resume process, status %#lx.\n", status); } } @@ -324,7 +324,7 @@ static ULONG STDMETHODCALLTYPE debugclient_AddRef(IDebugClient7 *iface) struct debug_client *debug_client = impl_from_IDebugClient(iface); ULONG refcount = InterlockedIncrement(&debug_client->refcount); - TRACE("%p, %d.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -341,7 +341,7 @@ static ULONG STDMETHODCALLTYPE debugclient_Release(IDebugClient7 *iface) ULONG refcount = InterlockedDecrement(&debug_client->refcount); struct target_process *cur, *cur2; - TRACE("%p, %d.\n", debug_client, refcount); + TRACE("%p, refcount %lu.\n", debug_client, refcount); if (!refcount) { @@ -361,7 +361,7 @@ static ULONG STDMETHODCALLTYPE debugclient_Release(IDebugClient7 *iface) static HRESULT STDMETHODCALLTYPE debugclient_AttachKernel(IDebugClient7 *iface, ULONG flags, const char *options) { - FIXME("%p, %#x, %s stub.\n", iface, flags, debugstr_a(options)); + FIXME("%p, %#lx, %s stub.\n", iface, flags, debugstr_a(options)); return E_NOTIMPL; } @@ -369,7 +369,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_AttachKernel(IDebugClient7 *iface, static HRESULT STDMETHODCALLTYPE debugclient_GetKernelConnectionOptions(IDebugClient7 *iface, char *buffer, ULONG buffer_size, ULONG *options_size) { - FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, options_size); + FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, options_size); return E_NOTIMPL; } @@ -384,7 +384,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_SetKernelConnectionOptions(IDebugCl static HRESULT STDMETHODCALLTYPE debugclient_StartProcessServer(IDebugClient7 *iface, ULONG flags, const char *options, void *reserved) { - FIXME("%p, %#x, %s, %p stub.\n", iface, flags, debugstr_a(options), reserved); + FIXME("%p, %#lx, %s, %p stub.\n", iface, flags, debugstr_a(options), reserved); return E_NOTIMPL; } @@ -407,7 +407,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_DisconnectProcessServer(IDebugClien static HRESULT STDMETHODCALLTYPE debugclient_GetRunningProcessSystemIds(IDebugClient7 *iface, ULONG64 server, ULONG *ids, ULONG count, ULONG *actual_count) { - FIXME("%p, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(server), ids, count, actual_count); + FIXME("%p, %s, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(server), ids, count, actual_count); return E_NOTIMPL; } @@ -415,7 +415,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_GetRunningProcessSystemIds(IDebugCl static HRESULT STDMETHODCALLTYPE debugclient_GetRunningProcessSystemIdByExecutableName(IDebugClient7 *iface, ULONG64 server, const char *exe_name, ULONG flags, ULONG *id) { - FIXME("%p, %s, %s, %#x, %p stub.\n", iface, wine_dbgstr_longlong(server), debugstr_a(exe_name), flags, id); + FIXME("%p, %s, %s, %#lx, %p stub.\n", iface, wine_dbgstr_longlong(server), debugstr_a(exe_name), flags, id); return E_NOTIMPL; } @@ -424,7 +424,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_GetRunningProcessDescription(IDebug ULONG systemid, ULONG flags, char *exe_name, ULONG exe_name_size, ULONG *actual_exe_name_size, char *description, ULONG description_size, ULONG *actual_description_size) { - FIXME("%p, %s, %u, %#x, %p, %u, %p, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(server), systemid, flags, + FIXME("%p, %s, %lu, %#lx, %p, %lu, %p, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(server), systemid, flags, exe_name, exe_name_size, actual_exe_name_size, description, description_size, actual_description_size); return E_NOTIMPL; @@ -435,7 +435,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_AttachProcess(IDebugClient7 *iface, struct debug_client *debug_client = impl_from_IDebugClient(iface); struct target_process *process; - TRACE("%p, %s, %u, %#x.\n", iface, wine_dbgstr_longlong(server), pid, flags); + TRACE("%p, %s, %lu, %#lx.\n", iface, wine_dbgstr_longlong(server), pid, flags); if (server) { @@ -457,7 +457,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_AttachProcess(IDebugClient7 *iface, static HRESULT STDMETHODCALLTYPE debugclient_CreateProcess(IDebugClient7 *iface, ULONG64 server, char *cmdline, ULONG flags) { - FIXME("%p, %s, %s, %#x stub.\n", iface, wine_dbgstr_longlong(server), debugstr_a(cmdline), flags); + FIXME("%p, %s, %s, %#lx stub.\n", iface, wine_dbgstr_longlong(server), debugstr_a(cmdline), flags); return E_NOTIMPL; } @@ -465,7 +465,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_CreateProcess(IDebugClient7 *iface, static HRESULT STDMETHODCALLTYPE debugclient_CreateProcessAndAttach(IDebugClient7 *iface, ULONG64 server, char *cmdline, ULONG create_flags, ULONG pid, ULONG attach_flags) { - FIXME("%p, %s, %s, %#x, %u, %#x stub.\n", iface, wine_dbgstr_longlong(server), debugstr_a(cmdline), create_flags, + FIXME("%p, %s, %s, %#lx, %lu, %#lx stub.\n", iface, wine_dbgstr_longlong(server), debugstr_a(cmdline), create_flags, pid, attach_flags); return E_NOTIMPL; @@ -480,21 +480,21 @@ static HRESULT STDMETHODCALLTYPE debugclient_GetProcessOptions(IDebugClient7 *if static HRESULT STDMETHODCALLTYPE debugclient_AddProcessOptions(IDebugClient7 *iface, ULONG options) { - FIXME("%p, %#x stub.\n", iface, options); + FIXME("%p, %#lx stub.\n", iface, options); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE debugclient_RemoveProcessOptions(IDebugClient7 *iface, ULONG options) { - FIXME("%p, %#x stub.\n", iface, options); + FIXME("%p, %#lx stub.\n", iface, options); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE debugclient_SetProcessOptions(IDebugClient7 *iface, ULONG options) { - FIXME("%p, %#x stub.\n", iface, options); + FIXME("%p, %#lx stub.\n", iface, options); return E_NOTIMPL; } @@ -508,14 +508,14 @@ static HRESULT STDMETHODCALLTYPE debugclient_OpenDumpFile(IDebugClient7 *iface, static HRESULT STDMETHODCALLTYPE debugclient_WriteDumpFile(IDebugClient7 *iface, const char *filename, ULONG qualifier) { - FIXME("%p, %s, %u stub.\n", iface, debugstr_a(filename), qualifier); + FIXME("%p, %s, %lu stub.\n", iface, debugstr_a(filename), qualifier); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE debugclient_ConnectSession(IDebugClient7 *iface, ULONG flags, ULONG history_limit) { - FIXME("%p, %#x, %u stub.\n", iface, flags, history_limit); + FIXME("%p, %#lx, %lu stub.\n", iface, flags, history_limit); return E_NOTIMPL; } @@ -530,7 +530,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_StartServer(IDebugClient7 *iface, c static HRESULT STDMETHODCALLTYPE debugclient_OutputServers(IDebugClient7 *iface, ULONG output_control, const char *machine, ULONG flags) { - FIXME("%p, %u, %s, %#x stub.\n", iface, output_control, debugstr_a(machine), flags); + FIXME("%p, %lu, %s, %#lx stub.\n", iface, output_control, debugstr_a(machine), flags); return E_NOTIMPL; } @@ -559,7 +559,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_DetachProcesses(IDebugClient7 *ifac static HRESULT STDMETHODCALLTYPE debugclient_EndSession(IDebugClient7 *iface, ULONG flags) { - FIXME("%p, %#x stub.\n", iface, flags); + FIXME("%p, %#lx stub.\n", iface, flags); return E_NOTIMPL; } @@ -573,7 +573,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_GetExitCode(IDebugClient7 *iface, U static HRESULT STDMETHODCALLTYPE debugclient_DispatchCallbacks(IDebugClient7 *iface, ULONG timeout) { - FIXME("%p, %u stub.\n", iface, timeout); + FIXME("%p, %lu stub.\n", iface, timeout); return E_NOTIMPL; } @@ -629,7 +629,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_GetOutputMask(IDebugClient7 *iface, static HRESULT STDMETHODCALLTYPE debugclient_SetOutputMask(IDebugClient7 *iface, ULONG mask) { - FIXME("%p, %#x stub.\n", iface, mask); + FIXME("%p, %#lx stub.\n", iface, mask); return E_NOTIMPL; } @@ -643,7 +643,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_GetOtherOutputMask(IDebugClient7 *i static HRESULT STDMETHODCALLTYPE debugclient_SetOtherOutputMask(IDebugClient7 *iface, IDebugClient *client, ULONG mask) { - FIXME("%p, %p, %#x stub.\n", iface, client, mask); + FIXME("%p, %p, %#lx stub.\n", iface, client, mask); return E_NOTIMPL; } @@ -657,7 +657,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_GetOutputWidth(IDebugClient7 *iface static HRESULT STDMETHODCALLTYPE debugclient_SetOutputWidth(IDebugClient7 *iface, ULONG columns) { - FIXME("%p, %u stub.\n", iface, columns); + FIXME("%p, %lu stub.\n", iface, columns); return E_NOTIMPL; } @@ -665,7 +665,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_SetOutputWidth(IDebugClient7 *iface static HRESULT STDMETHODCALLTYPE debugclient_GetOutputLinePrefix(IDebugClient7 *iface, char *buffer, ULONG buffer_size, ULONG *prefix_size) { - FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, prefix_size); + FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, prefix_size); return E_NOTIMPL; } @@ -680,7 +680,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_SetOutputLinePrefix(IDebugClient7 * static HRESULT STDMETHODCALLTYPE debugclient_GetIdentity(IDebugClient7 *iface, char *buffer, ULONG buffer_size, ULONG *identity_size) { - FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, identity_size); + FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, identity_size); return E_NOTIMPL; } @@ -688,7 +688,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_GetIdentity(IDebugClient7 *iface, c static HRESULT STDMETHODCALLTYPE debugclient_OutputIdentity(IDebugClient7 *iface, ULONG output_control, ULONG flags, const char *format) { - FIXME("%p, %u, %#x, %s stub.\n", iface, output_control, flags, debugstr_a(format)); + FIXME("%p, %lu, %#lx, %s stub.\n", iface, output_control, flags, debugstr_a(format)); return E_NOTIMPL; } @@ -732,13 +732,13 @@ static HRESULT STDMETHODCALLTYPE debugclient_FlushCallbacks(IDebugClient7 *iface static HRESULT STDMETHODCALLTYPE debugclient_WriteDumpFile2(IDebugClient7 *iface, const char *dumpfile, ULONG qualifier, ULONG flags, const char *comment) { - FIXME("%p, %s, %d, 0x%08x, %s.\n", iface, debugstr_a(dumpfile), qualifier, flags, debugstr_a(comment)); + FIXME("%p, %s, %lu, %#lx, %s.\n", iface, debugstr_a(dumpfile), qualifier, flags, debugstr_a(comment)); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE debugclient_AddDumpInformationFile(IDebugClient7 *iface, const char *infofile, ULONG type) { - FIXME("%p, %s, %d.\n", iface, debugstr_a(infofile), type); + FIXME("%p, %s, %lu.\n", iface, debugstr_a(infofile), type); return E_NOTIMPL; } @@ -750,7 +750,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_EndProcessServer(IDebugClient7 *ifa static HRESULT STDMETHODCALLTYPE debugclient_WaitForProcessServerEnd(IDebugClient7 *iface, ULONG timeout) { - FIXME("%p, %d.\n", iface, timeout); + FIXME("%p, %lu.\n", iface, timeout); return E_NOTIMPL; } @@ -781,28 +781,28 @@ static HRESULT STDMETHODCALLTYPE debugclient_AbandonCurrentProcess(IDebugClient7 static HRESULT STDMETHODCALLTYPE debugclient_GetRunningProcessSystemIdByExecutableNameWide(IDebugClient7 *iface, ULONG64 server, const WCHAR *exename, ULONG flags, ULONG *id) { - FIXME("%p, %s, %s, 0x%08x, %p.\n", iface, wine_dbgstr_longlong(server), debugstr_w(exename), flags, id); + FIXME("%p, %s, %s, %#lx, %p.\n", iface, wine_dbgstr_longlong(server), debugstr_w(exename), flags, id); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE debugclient_GetRunningProcessDescriptionWide(IDebugClient7 *iface, ULONG64 server, ULONG id, ULONG flags, WCHAR *exename, ULONG size, ULONG *actualsize, WCHAR *description, ULONG desc_size, ULONG *actual_desc_size) { - FIXME("%p, %s, %d, 0x%08x, %s, %d, %p, %s, %d, %p.\n", iface, wine_dbgstr_longlong(server), id, flags, debugstr_w(exename), size, + FIXME("%p, %s, %lu, %#lx, %s, %lu, %p, %s, %lu, %p.\n", iface, wine_dbgstr_longlong(server), id, flags, debugstr_w(exename), size, actualsize, debugstr_w(description), desc_size, actual_desc_size ); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE debugclient_CreateProcessWide(IDebugClient7 *iface, ULONG64 server, WCHAR *commandline, ULONG flags) { - FIXME("%p, %s, %s, 0x%08x.\n", iface, wine_dbgstr_longlong(server), debugstr_w(commandline), flags); + FIXME("%p, %s, %s, %#lx.\n", iface, wine_dbgstr_longlong(server), debugstr_w(commandline), flags); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE debugclient_CreateProcessAndAttachWide(IDebugClient7 *iface, ULONG64 server, WCHAR *commandline, ULONG flags, ULONG processid, ULONG attachflags) { - FIXME("%p, %s, %s, 0x%08x, %d, 0x%08x.\n", iface, wine_dbgstr_longlong(server), debugstr_w(commandline), flags, processid, attachflags); + FIXME("%p, %s, %s, %#lx, %lu, %#lx.\n", iface, wine_dbgstr_longlong(server), debugstr_w(commandline), flags, processid, attachflags); return E_NOTIMPL; } @@ -815,7 +815,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_OpenDumpFileWide(IDebugClient7 *ifa static HRESULT STDMETHODCALLTYPE debugclient_WriteDumpFileWide(IDebugClient7 *iface, const WCHAR *filename, ULONG64 handle, ULONG qualifier, ULONG flags, const WCHAR *comment) { - FIXME("%p, %s, %s, %d, 0x%08x, %s.\n", iface, debugstr_w(filename), wine_dbgstr_longlong(handle), + FIXME("%p, %s, %s, %lu, %#lx, %s.\n", iface, debugstr_w(filename), wine_dbgstr_longlong(handle), qualifier, flags, debugstr_w(comment)); return E_NOTIMPL; } @@ -823,7 +823,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_WriteDumpFileWide(IDebugClient7 *if static HRESULT STDMETHODCALLTYPE debugclient_AddDumpInformationFileWide(IDebugClient7 *iface, const WCHAR *filename, ULONG64 handle, ULONG type) { - FIXME("%p, %s, %s, %d.\n", iface, debugstr_w(filename), wine_dbgstr_longlong(handle), type); + FIXME("%p, %s, %s, %lu.\n", iface, debugstr_w(filename), wine_dbgstr_longlong(handle), type); return E_NOTIMPL; } @@ -836,27 +836,27 @@ static HRESULT STDMETHODCALLTYPE debugclient_GetNumberDumpFiles(IDebugClient7 *i static HRESULT STDMETHODCALLTYPE debugclient_GetDumpFile(IDebugClient7 *iface, ULONG index, char *buffer, ULONG buf_size, ULONG *name_size, ULONG64 *handle, ULONG *type) { - FIXME("%p, %d, %p, %d, %p, %p, %p.\n", iface, index, buffer, buf_size, name_size, handle, type); + FIXME("%p, %lu, %p, %lu, %p, %p, %p.\n", iface, index, buffer, buf_size, name_size, handle, type); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE debugclient_GetDumpFileWide(IDebugClient7 *iface, ULONG index, WCHAR *buffer, ULONG buf_size, ULONG *name_size, ULONG64 *handle, ULONG *type) { - FIXME("%p, %d, %p, %d, %p, %p, %p.\n", iface, index, buffer, buf_size, name_size, handle, type); + FIXME("%p, %lu, %p, %lu, %p, %p, %p.\n", iface, index, buffer, buf_size, name_size, handle, type); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE debugclient_AttachKernelWide(IDebugClient7 *iface, ULONG flags, const WCHAR *options) { - FIXME("%p, 0x%08x, %s.\n", iface, flags, debugstr_w(options)); + FIXME("%p, %#lx, %s.\n", iface, flags, debugstr_w(options)); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE debugclient_GetKernelConnectionOptionsWide(IDebugClient7 *iface, WCHAR *buffer, ULONG buf_size, ULONG *size) { - FIXME("%p, %p, %d, %p.\n", iface, buffer, buf_size, size); + FIXME("%p, %p, %lu, %p.\n", iface, buffer, buf_size, size); return E_NOTIMPL; } @@ -868,7 +868,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_SetKernelConnectionOptionsWide(IDeb static HRESULT STDMETHODCALLTYPE debugclient_StartProcessServerWide(IDebugClient7 *iface, ULONG flags, const WCHAR *options, void *reserved) { - FIXME("%p, 0x%08x, %s, %p.\n", iface, flags, debugstr_w(options), reserved); + FIXME("%p, %#lx, %s, %p.\n", iface, flags, debugstr_w(options), reserved); return E_NOTIMPL; } @@ -886,7 +886,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_StartServerWide(IDebugClient7 *ifac static HRESULT STDMETHODCALLTYPE debugclient_OutputServersWide(IDebugClient7 *iface, ULONG control, const WCHAR *machine, ULONG flags) { - FIXME("%p, %d, %s, 0x%08x.\n", iface, control, debugstr_w(machine), flags); + FIXME("%p, %lu, %s, %#lx.\n", iface, control, debugstr_w(machine), flags); return E_NOTIMPL; } @@ -904,7 +904,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_SetOutputCallbacksWide(IDebugClient static HRESULT STDMETHODCALLTYPE debugclient_GetOutputLinePrefixWide(IDebugClient7 *iface, WCHAR *buffer, ULONG buf_size, ULONG *size) { - FIXME("%p, %p, %d, %p.\n", iface, buffer, buf_size, size); + FIXME("%p, %p, %lu, %p.\n", iface, buffer, buf_size, size); return E_NOTIMPL; } @@ -916,13 +916,13 @@ static HRESULT STDMETHODCALLTYPE debugclient_SetOutputLinePrefixWide(IDebugClien static HRESULT STDMETHODCALLTYPE debugclient_GetIdentityWide(IDebugClient7 *iface, WCHAR *buffer, ULONG buf_size, ULONG *identity) { - FIXME("%p, %p, %d, %p.\n", iface, buffer, buf_size, identity); + FIXME("%p, %p, %lu, %p.\n", iface, buffer, buf_size, identity); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE debugclient_OutputIdentityWide(IDebugClient7 *iface, ULONG control, ULONG flags, const WCHAR *format) { - FIXME("%p, %d, 0x%08x, %s.\n", iface, control, flags, debugstr_w(format)); + FIXME("%p, %ld, %#lx, %s.\n", iface, control, flags, debugstr_w(format)); return E_NOTIMPL; } @@ -941,7 +941,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_SetEventCallbacksWide(IDebugClient7 static HRESULT STDMETHODCALLTYPE debugclient_CreateProcess2(IDebugClient7 *iface, ULONG64 server, char *command, void *options, ULONG buf_size, const char *initial, const char *environment) { - FIXME("%p %s, %s, %p, %d, %s, %s.\n", iface, wine_dbgstr_longlong(server), debugstr_a(command), options, + FIXME("%p, %s, %s, %p, %ld, %s, %s.\n", iface, wine_dbgstr_longlong(server), debugstr_a(command), options, buf_size, debugstr_a(initial), debugstr_a(environment)); return E_NOTIMPL; } @@ -949,7 +949,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_CreateProcess2(IDebugClient7 *iface static HRESULT STDMETHODCALLTYPE debugclient_CreateProcess2Wide(IDebugClient7 *iface, ULONG64 server, WCHAR *command, void *options, ULONG size, const WCHAR *initial, const WCHAR *environment) { - FIXME("%p %s, %s, %p, %d, %s, %s.\n", iface, wine_dbgstr_longlong(server), debugstr_w(command), options, + FIXME("%p, %s, %s, %p, %ld, %s, %s.\n", iface, wine_dbgstr_longlong(server), debugstr_w(command), options, size, debugstr_w(initial), debugstr_w(environment)); return E_NOTIMPL; } @@ -957,7 +957,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_CreateProcess2Wide(IDebugClient7 *i static HRESULT STDMETHODCALLTYPE debugclient_CreateProcessAndAttach2(IDebugClient7 *iface, ULONG64 server, char *command, void *options, ULONG buf_size, const char *initial, const char *environment, ULONG processid, ULONG flags) { - FIXME("%p %s, %s, %p, %d, %s, %s, %d, 0x%08x.\n", iface, wine_dbgstr_longlong(server), debugstr_a(command), options, + FIXME("%p, %s, %s, %p, %ld, %s, %s, %ld, %#lx.\n", iface, wine_dbgstr_longlong(server), debugstr_a(command), options, buf_size, debugstr_a(initial), debugstr_a(environment), processid, flags); return E_NOTIMPL; } @@ -965,7 +965,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_CreateProcessAndAttach2(IDebugClien static HRESULT STDMETHODCALLTYPE debugclient_CreateProcessAndAttach2Wide(IDebugClient7 *iface, ULONG64 server, WCHAR *command, void *buffer, ULONG buf_size, const WCHAR *initial, const WCHAR *environment, ULONG processid, ULONG flags) { - FIXME("%p %s, %s, %p, %d, %s, %s, %d, 0x%08x.\n", iface, wine_dbgstr_longlong(server), debugstr_w(command), buffer, + FIXME("%p %s, %s, %p, %ld, %s, %s, %ld, %#lx.\n", iface, wine_dbgstr_longlong(server), debugstr_w(command), buffer, buf_size, debugstr_w(initial), debugstr_w(environment), processid, flags); return E_NOTIMPL; } @@ -1002,13 +1002,13 @@ static HRESULT STDMETHODCALLTYPE debugclient_GetNumberOutputCallbacks(IDebugClie static HRESULT STDMETHODCALLTYPE debugclient_GetNumberEventCallbacks(IDebugClient7 *iface, ULONG flags, ULONG *count) { - FIXME("%p, 0x%08x, %p.\n", iface, flags, count); + FIXME("%p, %#lx, %p.\n", iface, flags, count); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE debugclient_GetQuitLockString(IDebugClient7 *iface, char *buffer, ULONG buf_size, ULONG *size) { - FIXME("%p, %s, %d, %p.\n", iface, debugstr_a(buffer), buf_size, size); + FIXME("%p, %s, %ld, %p.\n", iface, debugstr_a(buffer), buf_size, size); return E_NOTIMPL; } @@ -1020,7 +1020,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_SetQuitLockString(IDebugClient7 *if static HRESULT STDMETHODCALLTYPE debugclient_GetQuitLockStringWide(IDebugClient7 *iface, WCHAR *buffer, ULONG buf_size, ULONG *size) { - FIXME("%p, %s, %d, %p.\n", iface, debugstr_w(buffer), buf_size, size); + FIXME("%p, %s, %ld, %p.\n", iface, debugstr_w(buffer), buf_size, size); return E_NOTIMPL; } @@ -1038,7 +1038,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_SetEventContextCallbacks(IDebugClie static HRESULT STDMETHODCALLTYPE debugclient_SetClientContext(IDebugClient7 *iface, void *context, ULONG size) { - FIXME("%p, %p, %d.\n", iface, context, size); + FIXME("%p, %p, %ld.\n", iface, context, size); return E_NOTIMPL; } @@ -1178,7 +1178,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadVirtual(IDebugDataSpaces *i HRESULT hr = S_OK; SIZE_T length; - TRACE("%p, %s, %p, %u, %p.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len); + TRACE("%p, %s, %p, %lu, %p.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len); if (!(target = debug_client_get_target(debug_client))) return E_UNEXPECTED; @@ -1191,7 +1191,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadVirtual(IDebugDataSpaces *i else { hr = HRESULT_FROM_WIN32(GetLastError()); - WARN("Failed to read process memory %#x.\n", hr); + WARN("Failed to read process memory %#lx.\n", hr); } return hr; @@ -1200,7 +1200,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadVirtual(IDebugDataSpaces *i static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteVirtual(IDebugDataSpaces *iface, ULONG64 offset, void *buffer, ULONG buffer_size, ULONG *written) { - FIXME("%p, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, written); + FIXME("%p, %s, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, written); return E_NOTIMPL; } @@ -1208,7 +1208,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteVirtual(IDebugDataSpaces * static HRESULT STDMETHODCALLTYPE debugdataspaces_SearchVirtual(IDebugDataSpaces *iface, ULONG64 offset, ULONG64 length, void *pattern, ULONG pattern_size, ULONG pattern_granularity, ULONG64 *ret_offset) { - FIXME("%p, %s, %s, %p, %u, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(length), + FIXME("%p, %s, %s, %p, %lu, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(length), pattern, pattern_size, pattern_granularity, ret_offset); return E_NOTIMPL; @@ -1217,7 +1217,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_SearchVirtual(IDebugDataSpaces static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadVirtualUncached(IDebugDataSpaces *iface, ULONG64 offset, void *buffer, ULONG buffer_size, ULONG *read_len) { - FIXME("%p, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len); + FIXME("%p, %s, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len); return E_NOTIMPL; } @@ -1225,7 +1225,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadVirtualUncached(IDebugDataS static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteVirtualUncached(IDebugDataSpaces *iface, ULONG64 offset, void *buffer, ULONG buffer_size, ULONG *written) { - FIXME("%p, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, written); + FIXME("%p, %s, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, written); return E_NOTIMPL; } @@ -1233,7 +1233,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteVirtualUncached(IDebugData static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadPointersVirtual(IDebugDataSpaces *iface, ULONG count, ULONG64 offset, ULONG64 *pointers) { - FIXME("%p, %u, %s, %p stub.\n", iface, count, wine_dbgstr_longlong(offset), pointers); + FIXME("%p, %lu, %s, %p stub.\n", iface, count, wine_dbgstr_longlong(offset), pointers); return E_NOTIMPL; } @@ -1241,7 +1241,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadPointersVirtual(IDebugDataS static HRESULT STDMETHODCALLTYPE debugdataspaces_WritePointersVirtual(IDebugDataSpaces *iface, ULONG count, ULONG64 offset, ULONG64 *pointers) { - FIXME("%p, %u, %s, %p stub.\n", iface, count, wine_dbgstr_longlong(offset), pointers); + FIXME("%p, %lu, %s, %p stub.\n", iface, count, wine_dbgstr_longlong(offset), pointers); return E_NOTIMPL; } @@ -1249,7 +1249,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_WritePointersVirtual(IDebugData static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadPhysical(IDebugDataSpaces *iface, ULONG64 offset, void *buffer, ULONG buffer_size, ULONG *read_len) { - FIXME("%p, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len); + FIXME("%p, %s, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len); return E_NOTIMPL; } @@ -1257,7 +1257,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadPhysical(IDebugDataSpaces * static HRESULT STDMETHODCALLTYPE debugdataspaces_WritePhysical(IDebugDataSpaces *iface, ULONG64 offset, void *buffer, ULONG buffer_size, ULONG *written) { - FIXME("%p, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, written); + FIXME("%p, %s, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, written); return E_NOTIMPL; } @@ -1265,7 +1265,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_WritePhysical(IDebugDataSpaces static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadControl(IDebugDataSpaces *iface, ULONG processor, ULONG64 offset, void *buffer, ULONG buffer_size, ULONG *read_len) { - FIXME("%p, %u, %s, %p, %u, %p stub.\n", iface, processor, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len); + FIXME("%p, %lu, %s, %p, %lu, %p stub.\n", iface, processor, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len); return E_NOTIMPL; } @@ -1273,7 +1273,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadControl(IDebugDataSpaces *i static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteControl(IDebugDataSpaces *iface, ULONG processor, ULONG64 offset, void *buffer, ULONG buffer_size, ULONG *written) { - FIXME("%p, %u, %s, %p, %u, %p stub.\n", iface, processor, wine_dbgstr_longlong(offset), buffer, buffer_size, written); + FIXME("%p, %lu, %s, %p, %lu, %p stub.\n", iface, processor, wine_dbgstr_longlong(offset), buffer, buffer_size, written); return E_NOTIMPL; } @@ -1281,7 +1281,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteControl(IDebugDataSpaces * static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadIo(IDebugDataSpaces *iface, ULONG type, ULONG bus_number, ULONG address_space, ULONG64 offset, void *buffer, ULONG buffer_size, ULONG *read_len) { - FIXME("%p, %u, %u, %u, %s, %p, %u, %p stub.\n", iface, type, bus_number, address_space, wine_dbgstr_longlong(offset), + FIXME("%p, %lu, %lu, %lu, %s, %p, %lu, %p stub.\n", iface, type, bus_number, address_space, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len); return E_NOTIMPL; @@ -1290,7 +1290,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadIo(IDebugDataSpaces *iface, static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteIo(IDebugDataSpaces *iface, ULONG type, ULONG bus_number, ULONG address_space, ULONG64 offset, void *buffer, ULONG buffer_size, ULONG *written) { - FIXME("%p, %u, %u, %u, %s, %p, %u, %p stub.\n", iface, type, bus_number, address_space, wine_dbgstr_longlong(offset), + FIXME("%p, %lu, %lu, %lu, %s, %p, %lu, %p stub.\n", iface, type, bus_number, address_space, wine_dbgstr_longlong(offset), buffer, buffer_size, written); return E_NOTIMPL; @@ -1298,14 +1298,14 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteIo(IDebugDataSpaces *iface static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadMsr(IDebugDataSpaces *iface, ULONG msr, ULONG64 *value) { - FIXME("%p, %u, %p stub.\n", iface, msr, value); + FIXME("%p, %lu, %p stub.\n", iface, msr, value); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteMsr(IDebugDataSpaces *iface, ULONG msr, ULONG64 value) { - FIXME("%p, %u, %s stub.\n", iface, msr, wine_dbgstr_longlong(value)); + FIXME("%p, %lu, %s stub.\n", iface, msr, wine_dbgstr_longlong(value)); return E_NOTIMPL; } @@ -1313,7 +1313,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteMsr(IDebugDataSpaces *ifac static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadBusData(IDebugDataSpaces *iface, ULONG data_type, ULONG bus_number, ULONG slot_number, ULONG offset, void *buffer, ULONG buffer_size, ULONG *read_len) { - FIXME("%p, %u, %u, %u, %u, %p, %u, %p stub.\n", iface, data_type, bus_number, slot_number, offset, buffer, + FIXME("%p, %lu, %lu, %lu, %lu, %p, %lu, %p stub.\n", iface, data_type, bus_number, slot_number, offset, buffer, buffer_size, read_len); return E_NOTIMPL; @@ -1322,7 +1322,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadBusData(IDebugDataSpaces *i static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteBusData(IDebugDataSpaces *iface, ULONG data_type, ULONG bus_number, ULONG slot_number, ULONG offset, void *buffer, ULONG buffer_size, ULONG *written) { - FIXME("%p, %u, %u, %u, %u, %p, %u, %p stub.\n", iface, data_type, bus_number, slot_number, offset, buffer, + FIXME("%p, %lu, %lu, %lu, %lu, %p, %lu, %p stub.\n", iface, data_type, bus_number, slot_number, offset, buffer, buffer_size, written); return E_NOTIMPL; @@ -1338,7 +1338,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_CheckLowMemory(IDebugDataSpaces static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadDebuggerData(IDebugDataSpaces *iface, ULONG index, void *buffer, ULONG buffer_size, ULONG *data_size) { - FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, data_size); + FIXME("%p, %lu, %p, %lu, %p stub.\n", iface, index, buffer, buffer_size, data_size); return E_NOTIMPL; } @@ -1346,7 +1346,7 @@ static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadDebuggerData(IDebugDataSpac static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadProcessorSystemData(IDebugDataSpaces *iface, ULONG processor, ULONG index, void *buffer, ULONG buffer_size, ULONG *data_size) { - FIXME("%p, %u, %u, %p, %u, %p stub.\n", iface, processor, index, buffer, buffer_size, data_size); + FIXME("%p, %lu, %lu, %p, %lu, %p stub.\n", iface, processor, index, buffer, buffer_size, data_size); return E_NOTIMPL; } @@ -1408,21 +1408,21 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolOptions(IDebugSymbols3 *i static HRESULT STDMETHODCALLTYPE debugsymbols_AddSymbolOptions(IDebugSymbols3 *iface, ULONG options) { - FIXME("%p, %#x stub.\n", iface, options); + FIXME("%p, %#lx stub.\n", iface, options); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE debugsymbols_RemoveSymbolOptions(IDebugSymbols3 *iface, ULONG options) { - FIXME("%p, %#x stub.\n", iface, options); + FIXME("%p, %#lx stub.\n", iface, options); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE debugsymbols_SetSymbolOptions(IDebugSymbols3 *iface, ULONG options) { - FIXME("%p, %#x stub.\n", iface, options); + FIXME("%p, %#lx stub.\n", iface, options); return E_NOTIMPL; } @@ -1430,7 +1430,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_SetSymbolOptions(IDebugSymbols3 *i static HRESULT STDMETHODCALLTYPE debugsymbols_GetNameByOffset(IDebugSymbols3 *iface, ULONG64 offset, char *buffer, ULONG buffer_size, ULONG *name_size, ULONG64 *displacement) { - FIXME("%p, %s, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, + FIXME("%p, %s, %p, %lu, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, name_size, displacement); return E_NOTIMPL; @@ -1447,7 +1447,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByName(IDebugSymbols3 *if static HRESULT STDMETHODCALLTYPE debugsymbols_GetNearNameByOffset(IDebugSymbols3 *iface, ULONG64 offset, LONG delta, char *buffer, ULONG buffer_size, ULONG *name_size, ULONG64 *displacement) { - FIXME("%p, %s, %d, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), delta, buffer, buffer_size, + FIXME("%p, %s, %ld, %p, %lu, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), delta, buffer, buffer_size, name_size, displacement); return E_NOTIMPL; @@ -1456,7 +1456,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetNearNameByOffset(IDebugSymbols3 static HRESULT STDMETHODCALLTYPE debugsymbols_GetLineByOffset(IDebugSymbols3 *iface, ULONG64 offset, ULONG *line, char *buffer, ULONG buffer_size, ULONG *file_size, ULONG64 *displacement) { - FIXME("%p, %s, %p, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), line, buffer, buffer_size, + FIXME("%p, %s, %p, %p, %lu, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), line, buffer, buffer_size, file_size, displacement); return E_NOTIMPL; @@ -1465,7 +1465,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetLineByOffset(IDebugSymbols3 *if static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByLine(IDebugSymbols3 *iface, ULONG line, const char *file, ULONG64 *offset) { - FIXME("%p, %u, %s, %p stub.\n", iface, line, debugstr_a(file), offset); + FIXME("%p, %lu, %s, %p stub.\n", iface, line, debugstr_a(file), offset); return E_NOTIMPL; } @@ -1496,7 +1496,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByIndex(IDebugSymbols3 *i const struct module_info *info; struct target_process *target; - TRACE("%p, %u, %p.\n", iface, index, base); + TRACE("%p, %lu, %p.\n", iface, index, base); if (!(target = debug_client_get_target(debug_client))) return E_UNEXPECTED; @@ -1512,7 +1512,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByIndex(IDebugSymbols3 *i static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleName(IDebugSymbols3 *iface, const char *name, ULONG start_index, ULONG *index, ULONG64 *base) { - FIXME("%p, %s, %u, %p, %p stub.\n", iface, debugstr_a(name), start_index, index, base); + FIXME("%p, %s, %lu, %p, %p stub.\n", iface, debugstr_a(name), start_index, index, base); return E_NOTIMPL; } @@ -1524,7 +1524,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByOffset(IDebugSymbols3 * static struct target_process *target; const struct module_info *info; - TRACE("%p, %s, %u, %p, %p.\n", iface, wine_dbgstr_longlong(offset), start_index, index, base); + TRACE("%p, %s, %lu, %p, %p.\n", iface, wine_dbgstr_longlong(offset), start_index, index, base); if (!(target = debug_client_get_target(debug_client))) return E_UNEXPECTED; @@ -1551,7 +1551,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNames(IDebugSymbols3 *ifa ULONG module_name_buffer_size, ULONG *module_name_size, char *loaded_image_name, ULONG loaded_image_name_buffer_size, ULONG *loaded_image_size) { - FIXME("%p, %u, %s, %p, %u, %p, %p, %u, %p, %p, %u, %p stub.\n", iface, index, wine_dbgstr_longlong(base), + FIXME("%p, %lu, %s, %p, %lu, %p, %p, %lu, %p, %p, %lu, %p stub.\n", iface, index, wine_dbgstr_longlong(base), image_name, image_name_buffer_size, image_name_size, module_name, module_name_buffer_size, module_name_size, loaded_image_name, loaded_image_name_buffer_size, loaded_image_size); @@ -1566,7 +1566,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleParameters(IDebugSymbols3 struct target_process *target; unsigned int i; - TRACE("%p, %u, %p, %u, %p.\n", iface, count, bases, start, params); + TRACE("%p, %lu, %p, %lu, %p.\n", iface, count, bases, start, params); if (!(target = debug_client_get_target(debug_client))) return E_UNEXPECTED; @@ -1609,7 +1609,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolModule(IDebugSymbols3 *if static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeName(IDebugSymbols3 *iface, ULONG64 base, ULONG type_id, char *buffer, ULONG buffer_size, ULONG *name_size) { - FIXME("%p, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(base), type_id, buffer, + FIXME("%p, %s, %lu, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(base), type_id, buffer, buffer_size, name_size); return E_NOTIMPL; @@ -1626,7 +1626,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeId(IDebugSymbols3 *iface, U static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeSize(IDebugSymbols3 *iface, ULONG64 base, ULONG type_id, ULONG *size) { - FIXME("%p, %s, %u, %p stub.\n", iface, wine_dbgstr_longlong(base), type_id, size); + FIXME("%p, %s, %lu, %p stub.\n", iface, wine_dbgstr_longlong(base), type_id, size); return E_NOTIMPL; } @@ -1634,7 +1634,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeSize(IDebugSymbols3 *iface, static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldOffset(IDebugSymbols3 *iface, ULONG64 base, ULONG type_id, const char *field, ULONG *offset) { - FIXME("%p, %s, %u, %s, %p stub.\n", iface, wine_dbgstr_longlong(base), type_id, debugstr_a(field), offset); + FIXME("%p, %s, %lu, %s, %p stub.\n", iface, wine_dbgstr_longlong(base), type_id, debugstr_a(field), offset); return E_NOTIMPL; } @@ -1658,7 +1658,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetTypeId(IDebugSymbols3 *if static HRESULT STDMETHODCALLTYPE debugsymbols_ReadTypedDataVirtual(IDebugSymbols3 *iface, ULONG64 offset, ULONG64 base, ULONG type_id, void *buffer, ULONG buffer_size, ULONG *read_len) { - FIXME("%p, %s, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base), + FIXME("%p, %s, %s, %lu, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base), type_id, buffer, buffer_size, read_len); return E_NOTIMPL; @@ -1667,7 +1667,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_ReadTypedDataVirtual(IDebugSymbols static HRESULT STDMETHODCALLTYPE debugsymbols_WriteTypedDataVirtual(IDebugSymbols3 *iface, ULONG64 offset, ULONG64 base, ULONG type_id, void *buffer, ULONG buffer_size, ULONG *written) { - FIXME("%p, %s, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base), + FIXME("%p, %s, %s, %lu, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base), type_id, buffer, buffer_size, written); return E_NOTIMPL; @@ -1676,7 +1676,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_WriteTypedDataVirtual(IDebugSymbol static HRESULT STDMETHODCALLTYPE debugsymbols_OutputTypedDataVirtual(IDebugSymbols3 *iface, ULONG output_control, ULONG64 offset, ULONG64 base, ULONG type_id, ULONG flags) { - FIXME("%p, %#x, %s, %s, %u, %#x stub.\n", iface, output_control, wine_dbgstr_longlong(offset), + FIXME("%p, %#lx, %s, %s, %lu, %#lx stub.\n", iface, output_control, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base), type_id, flags); return E_NOTIMPL; @@ -1685,7 +1685,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_OutputTypedDataVirtual(IDebugSymbo static HRESULT STDMETHODCALLTYPE debugsymbols_ReadTypedDataPhysical(IDebugSymbols3 *iface, ULONG64 offset, ULONG64 base, ULONG type_id, void *buffer, ULONG buffer_size, ULONG *read_len) { - FIXME("%p, %s, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base), + FIXME("%p, %s, %s, %lu, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base), type_id, buffer, buffer_size, read_len); return E_NOTIMPL; @@ -1694,7 +1694,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_ReadTypedDataPhysical(IDebugSymbol static HRESULT STDMETHODCALLTYPE debugsymbols_WriteTypedDataPhysical(IDebugSymbols3 *iface, ULONG64 offset, ULONG64 base, ULONG type_id, void *buffer, ULONG buffer_size, ULONG *written) { - FIXME("%p, %s, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base), + FIXME("%p, %s, %s, %lu, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base), type_id, buffer, buffer_size, written); return E_NOTIMPL; @@ -1703,7 +1703,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_WriteTypedDataPhysical(IDebugSymbo static HRESULT STDMETHODCALLTYPE debugsymbols_OutputTypedDataPhysical(IDebugSymbols3 *iface, ULONG output_control, ULONG64 offset, ULONG64 base, ULONG type_id, ULONG flags) { - FIXME("%p, %#x, %s, %s, %u, %#x stub.\n", iface, output_control, wine_dbgstr_longlong(offset), + FIXME("%p, %#lx, %s, %s, %lu, %#lx stub.\n", iface, output_control, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base), type_id, flags); return E_NOTIMPL; @@ -1712,7 +1712,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_OutputTypedDataPhysical(IDebugSymb static HRESULT STDMETHODCALLTYPE debugsymbols_GetScope(IDebugSymbols3 *iface, ULONG64 *instr_offset, DEBUG_STACK_FRAME *frame, void *scope_context, ULONG scope_context_size) { - FIXME("%p, %p, %p, %p, %u stub.\n", iface, instr_offset, frame, scope_context, scope_context_size); + FIXME("%p, %p, %p, %p, %lu stub.\n", iface, instr_offset, frame, scope_context, scope_context_size); return E_NOTIMPL; } @@ -1720,7 +1720,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetScope(IDebugSymbols3 *iface, UL static HRESULT STDMETHODCALLTYPE debugsymbols_SetScope(IDebugSymbols3 *iface, ULONG64 instr_offset, DEBUG_STACK_FRAME *frame, void *scope_context, ULONG scope_context_size) { - FIXME("%p, %s, %p, %p, %u stub.\n", iface, wine_dbgstr_longlong(instr_offset), frame, scope_context, + FIXME("%p, %s, %p, %p, %lu stub.\n", iface, wine_dbgstr_longlong(instr_offset), frame, scope_context, scope_context_size); return E_NOTIMPL; @@ -1736,7 +1736,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_ResetScope(IDebugSymbols3 *iface) static HRESULT STDMETHODCALLTYPE debugsymbols_GetScopeSymbolGroup(IDebugSymbols3 *iface, ULONG flags, IDebugSymbolGroup *update, IDebugSymbolGroup **symbols) { - FIXME("%p, %#x, %p, %p stub.\n", iface, flags, update, symbols); + FIXME("%p, %#lx, %p, %p stub.\n", iface, flags, update, symbols); return E_NOTIMPL; } @@ -1759,7 +1759,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_StartSymbolMatch(IDebugSymbols3 *i static HRESULT STDMETHODCALLTYPE debugsymbols_GetNextSymbolMatch(IDebugSymbols3 *iface, ULONG64 handle, char *buffer, ULONG buffer_size, ULONG *match_size, ULONG64 *offset) { - FIXME("%p, %s, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(handle), buffer, buffer_size, match_size, offset); + FIXME("%p, %s, %p, %lu, %p, %p stub.\n", iface, wine_dbgstr_longlong(handle), buffer, buffer_size, match_size, offset); return E_NOTIMPL; } @@ -1781,7 +1781,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_Reload(IDebugSymbols3 *iface, cons static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolPath(IDebugSymbols3 *iface, char *buffer, ULONG buffer_size, ULONG *path_size) { - FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size); + FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, path_size); return E_NOTIMPL; } @@ -1803,7 +1803,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_AppendSymbolPath(IDebugSymbols3 *i static HRESULT STDMETHODCALLTYPE debugsymbols_GetImagePath(IDebugSymbols3 *iface, char *buffer, ULONG buffer_size, ULONG *path_size) { - FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size); + FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, path_size); return E_NOTIMPL; } @@ -1825,7 +1825,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_AppendImagePath(IDebugSymbols3 *if static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePath(IDebugSymbols3 *iface, char *buffer, ULONG buffer_size, ULONG *path_size) { - FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size); + FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, path_size); return E_NOTIMPL; } @@ -1833,7 +1833,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePath(IDebugSymbols3 *ifac static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePathElement(IDebugSymbols3 *iface, ULONG index, char *buffer, ULONG buffer_size, ULONG *element_size) { - FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, element_size); + FIXME("%p, %lu, %p, %lu, %p stub.\n", iface, index, buffer, buffer_size, element_size); return E_NOTIMPL; } @@ -1855,7 +1855,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_AppendSourcePath(IDebugSymbols3 *i static HRESULT STDMETHODCALLTYPE debugsymbols_FindSourceFile(IDebugSymbols3 *iface, ULONG start, const char *file, ULONG flags, ULONG *found_element, char *buffer, ULONG buffer_size, ULONG *found_size) { - FIXME("%p, %u, %s, %#x, %p, %p, %u, %p stub.\n", iface, start, debugstr_a(file), flags, found_element, buffer, + FIXME("%p, %lu, %s, %#lx, %p, %p, %lu, %p stub.\n", iface, start, debugstr_a(file), flags, found_element, buffer, buffer_size, found_size); return E_NOTIMPL; @@ -1864,7 +1864,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_FindSourceFile(IDebugSymbols3 *ifa static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceFileLineOffsets(IDebugSymbols3 *iface, const char *file, ULONG64 *buffer, ULONG buffer_lines, ULONG *file_lines) { - FIXME("%p, %s, %p, %u, %p stub.\n", iface, debugstr_a(file), buffer, buffer_lines, file_lines); + FIXME("%p, %s, %p, %lu, %p stub.\n", iface, debugstr_a(file), buffer, buffer_lines, file_lines); return E_NOTIMPL; } @@ -1880,7 +1880,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleVersionInformation(IDebug DWORD handle; UINT size; - TRACE("%p, %u, %s, %s, %p, %u, %p.\n", iface, index, wine_dbgstr_longlong(base), debugstr_a(item), buffer, + TRACE("%p, %lu, %s, %s, %p, %lu, %p.\n", iface, index, wine_dbgstr_longlong(base), debugstr_a(item), buffer, buffer_size, info_size); if (!(target = debug_client_get_target(debug_client))) @@ -1934,7 +1934,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNameString(IDebugSymbols3 struct target_process *target; HRESULT hr; - TRACE("%p, %u, %u, %s, %p, %u, %p.\n", iface, which, index, wine_dbgstr_longlong(base), buffer, buffer_size, + TRACE("%p, %lu, %lu, %s, %p, %lu, %p.\n", iface, which, index, wine_dbgstr_longlong(base), buffer, buffer_size, name_size); if (!(target = debug_client_get_target(debug_client))) @@ -1960,10 +1960,10 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNameString(IDebugSymbols3 case DEBUG_MODNAME_LOADED_IMAGE: case DEBUG_MODNAME_SYMBOL_FILE: case DEBUG_MODNAME_MAPPED_IMAGE: - FIXME("Unsupported name info %d.\n", which); + FIXME("Unsupported name info %ld.\n", which); return E_NOTIMPL; default: - WARN("Unknown name info %d.\n", which); + WARN("Unknown name info %ld.\n", which); return E_INVALIDARG; } @@ -1973,7 +1973,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNameString(IDebugSymbols3 static HRESULT STDMETHODCALLTYPE debugsymbols_GetConstantName(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id, ULONG64 value, char *buffer, ULONG buffer_size, ULONG *name_size) { - FIXME("%p, %s, %u, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, + FIXME("%p, %s, %lu, %s, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, wine_dbgstr_longlong(value), buffer, buffer_size, name_size); return E_NOTIMPL; @@ -1982,7 +1982,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetConstantName(IDebugSymbols3 *if static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldName(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id, ULONG field_index, char *buffer, ULONG buffer_size, ULONG *name_size) { - FIXME("%p, %s, %u, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, field_index, buffer, + FIXME("%p, %s, %lu, %lu, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, field_index, buffer, buffer_size, name_size); return E_NOTIMPL; @@ -1997,21 +1997,21 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeOptions(IDebugSymbols3 *ifa static HRESULT STDMETHODCALLTYPE debugsymbols_AddTypeOptions(IDebugSymbols3 *iface, ULONG options) { - FIXME("%p, %#x stub.\n", iface, options); + FIXME("%p, %#lx stub.\n", iface, options); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE debugsymbols_RemoveTypeOptions(IDebugSymbols3 *iface, ULONG options) { - FIXME("%p, %#x stub.\n", iface, options); + FIXME("%p, %#lx stub.\n", iface, options); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE debugsymbols_SetTypeOptions(IDebugSymbols3 *iface, ULONG options) { - FIXME("%p, %#x stub.\n", iface, options); + FIXME("%p, %#lx stub.\n", iface, options); return E_NOTIMPL; } @@ -2019,7 +2019,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_SetTypeOptions(IDebugSymbols3 *ifa static HRESULT STDMETHODCALLTYPE debugsymbols_GetNameByOffsetWide(IDebugSymbols3 *iface, ULONG64 offset, WCHAR *buffer, ULONG buffer_size, ULONG *name_size, ULONG64 *displacement) { - FIXME("%p, %s, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, name_size, + FIXME("%p, %s, %p, %lu, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, name_size, displacement); return E_NOTIMPL; @@ -2036,7 +2036,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByNameWide(IDebugSymbols3 static HRESULT STDMETHODCALLTYPE debugsymbols_GetNearNameByOffsetWide(IDebugSymbols3 *iface, ULONG64 offset, LONG delta, WCHAR *buffer, ULONG buffer_size, ULONG *name_size, ULONG64 *displacement) { - FIXME("%p, %s, %d, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), delta, buffer, buffer_size, + FIXME("%p, %s, %ld, %p, %lu, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), delta, buffer, buffer_size, name_size, displacement); return E_NOTIMPL; @@ -2045,7 +2045,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetNearNameByOffsetWide(IDebugSymb static HRESULT STDMETHODCALLTYPE debugsymbols_GetLineByOffsetWide(IDebugSymbols3 *iface, ULONG64 offset, ULONG *line, WCHAR *buffer, ULONG buffer_size, ULONG *file_size, ULONG64 *displacement) { - FIXME("%p, %s, %p, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), line, buffer, buffer_size, + FIXME("%p, %s, %p, %p, %lu, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), line, buffer, buffer_size, file_size, displacement); return E_NOTIMPL; @@ -2054,7 +2054,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetLineByOffsetWide(IDebugSymbols3 static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByLineWide(IDebugSymbols3 *iface, ULONG line, const WCHAR *file, ULONG64 *offset) { - FIXME("%p, %u, %s, %p stub.\n", iface, line, debugstr_w(file), offset); + FIXME("%p, %lu, %s, %p stub.\n", iface, line, debugstr_w(file), offset); return E_NOTIMPL; } @@ -2062,7 +2062,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByLineWide(IDebugSymbols3 static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleNameWide(IDebugSymbols3 *iface, const WCHAR *name, ULONG start_index, ULONG *index, ULONG64 *base) { - FIXME("%p, %s, %u, %p, %p stub.\n", iface, debugstr_w(name), start_index, index, base); + FIXME("%p, %s, %lu, %p, %p stub.\n", iface, debugstr_w(name), start_index, index, base); return E_NOTIMPL; } @@ -2078,7 +2078,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolModuleWide(IDebugSymbols3 static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeNameWide(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id, WCHAR *buffer, ULONG buffer_size, ULONG *name_size) { - FIXME("%p, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, buffer, buffer_size, + FIXME("%p, %s, %lu, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, buffer, buffer_size, name_size); return E_NOTIMPL; @@ -2095,7 +2095,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeIdWide(IDebugSymbols3 *ifac static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldOffsetWide(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id, const WCHAR *field, ULONG *offset) { - FIXME("%p, %s, %u, %s, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, debugstr_w(field), offset); + FIXME("%p, %s, %lu, %s, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, debugstr_w(field), offset); return E_NOTIMPL; } @@ -2111,7 +2111,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolTypeIdWide(IDebugSymbols3 static HRESULT STDMETHODCALLTYPE debugsymbols_GetScopeSymbolGroup2(IDebugSymbols3 *iface, ULONG flags, PDEBUG_SYMBOL_GROUP2 update, PDEBUG_SYMBOL_GROUP2 *symbols) { - FIXME("%p, %#x, %p, %p stub.\n", iface, flags, update, symbols); + FIXME("%p, %#lx, %p, %p stub.\n", iface, flags, update, symbols); return E_NOTIMPL; } @@ -2134,7 +2134,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_StartSymbolMatchWide(IDebugSymbols static HRESULT STDMETHODCALLTYPE debugsymbols_GetNextSymbolMatchWide(IDebugSymbols3 *iface, ULONG64 handle, WCHAR *buffer, ULONG buffer_size, ULONG *match_size, ULONG64 *offset) { - FIXME("%p, %s, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(handle), buffer, buffer_size, match_size, offset); + FIXME("%p, %s, %p, %lu, %p, %p stub.\n", iface, wine_dbgstr_longlong(handle), buffer, buffer_size, match_size, offset); return E_NOTIMPL; } @@ -2149,7 +2149,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_ReloadWide(IDebugSymbols3 *iface, static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolPathWide(IDebugSymbols3 *iface, WCHAR *buffer, ULONG buffer_size, ULONG *path_size) { - FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size); + FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, path_size); return E_NOTIMPL; } @@ -2171,7 +2171,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_AppendSymbolPathWide(IDebugSymbols static HRESULT STDMETHODCALLTYPE debugsymbols_GetImagePathWide(IDebugSymbols3 *iface, WCHAR *buffer, ULONG buffer_size, ULONG *path_size) { - FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size); + FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, path_size); return E_NOTIMPL; } @@ -2193,7 +2193,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_AppendImagePathWide(IDebugSymbols3 static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePathWide(IDebugSymbols3 *iface, WCHAR *buffer, ULONG buffer_size, ULONG *path_size) { - FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size); + FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, path_size); return E_NOTIMPL; } @@ -2201,7 +2201,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePathWide(IDebugSymbols3 * static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePathElementWide(IDebugSymbols3 *iface, ULONG index, WCHAR *buffer, ULONG buffer_size, ULONG *element_size) { - FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, element_size); + FIXME("%p, %lu, %p, %lu, %p stub.\n", iface, index, buffer, buffer_size, element_size); return E_NOTIMPL; } @@ -2223,7 +2223,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_AppendSourcePathWide(IDebugSymbols static HRESULT STDMETHODCALLTYPE debugsymbols_FindSourceFileWide(IDebugSymbols3 *iface, ULONG start_element, const WCHAR *file, ULONG flags, ULONG *found_element, WCHAR *buffer, ULONG buffer_size, ULONG *found_size) { - FIXME("%p, %u, %s, %#x, %p, %p, %u, %p stub.\n", iface, start_element, debugstr_w(file), flags, found_element, + FIXME("%p, %lu, %s, %#lx, %p, %p, %lu, %p stub.\n", iface, start_element, debugstr_w(file), flags, found_element, buffer, buffer_size, found_size); return E_NOTIMPL; @@ -2232,7 +2232,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_FindSourceFileWide(IDebugSymbols3 static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceFileLineOffsetsWide(IDebugSymbols3 *iface, const WCHAR *file, ULONG64 *buffer, ULONG buffer_lines, ULONG *file_lines) { - FIXME("%p, %s, %p, %u, %p stub.\n", iface, debugstr_w(file), buffer, buffer_lines, file_lines); + FIXME("%p, %s, %p, %lu, %p stub.\n", iface, debugstr_w(file), buffer, buffer_lines, file_lines); return E_NOTIMPL; } @@ -2240,7 +2240,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceFileLineOffsetsWide(IDebu static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleVersionInformationWide(IDebugSymbols3 *iface, ULONG index, ULONG64 base, const WCHAR *item, void *buffer, ULONG buffer_size, ULONG *version_info_size) { - FIXME("%p, %u, %s, %s, %p, %u, %p stub.\n", iface, index, wine_dbgstr_longlong(base), debugstr_w(item), buffer, + FIXME("%p, %lu, %s, %s, %p, %lu, %p stub.\n", iface, index, wine_dbgstr_longlong(base), debugstr_w(item), buffer, buffer_size, version_info_size); return E_NOTIMPL; @@ -2249,7 +2249,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleVersionInformationWide(ID static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNameStringWide(IDebugSymbols3 *iface, ULONG which, ULONG index, ULONG64 base, WCHAR *buffer, ULONG buffer_size, ULONG *name_size) { - FIXME("%p, %u, %u, %s, %p, %u, %p stub.\n", iface, which, index, wine_dbgstr_longlong(base), buffer, buffer_size, + FIXME("%p, %lu, %lu, %s, %p, %lu, %p stub.\n", iface, which, index, wine_dbgstr_longlong(base), buffer, buffer_size, name_size); return E_NOTIMPL; @@ -2258,7 +2258,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNameStringWide(IDebugSymb static HRESULT STDMETHODCALLTYPE debugsymbols_GetConstantNameWide(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id, ULONG64 value, WCHAR *buffer, ULONG buffer_size, ULONG *name_size) { - FIXME("%p, %s, %u, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, + FIXME("%p, %s, %lu, %s, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, wine_dbgstr_longlong(value), buffer, buffer_size, name_size); return E_NOTIMPL; @@ -2267,7 +2267,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetConstantNameWide(IDebugSymbols3 static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldNameWide(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id, ULONG field_index, WCHAR *buffer, ULONG buffer_size, ULONG *name_size) { - FIXME("%p, %s, %u, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, field_index, buffer, + FIXME("%p, %s, %lu, %lu, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, field_index, buffer, buffer_size, name_size); return E_NOTIMPL; @@ -2275,7 +2275,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldNameWide(IDebugSymbols3 *i static HRESULT STDMETHODCALLTYPE debugsymbols_IsManagedModule(IDebugSymbols3 *iface, ULONG index, ULONG64 base) { - FIXME("%p, %u, %s stub.\n", iface, index, wine_dbgstr_longlong(base)); + FIXME("%p, %lu, %s stub.\n", iface, index, wine_dbgstr_longlong(base)); return E_NOTIMPL; } @@ -2283,7 +2283,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_IsManagedModule(IDebugSymbols3 *if static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleName2(IDebugSymbols3 *iface, const char *name, ULONG start_index, ULONG flags, ULONG *index, ULONG64 *base) { - FIXME("%p, %s, %u, %#x, %p, %p stub.\n", iface, debugstr_a(name), start_index, flags, index, base); + FIXME("%p, %s, %lu, %#lx, %p, %p stub.\n", iface, debugstr_a(name), start_index, flags, index, base); return E_NOTIMPL; } @@ -2291,7 +2291,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleName2(IDebugSymbo static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleName2Wide(IDebugSymbols3 *iface, const WCHAR *name, ULONG start_index, ULONG flags, ULONG *index, ULONG64 *base) { - FIXME("%p, %s, %u, %#x, %p, %p stub.\n", iface, debugstr_w(name), start_index, flags, index, base); + FIXME("%p, %s, %lu, %#lx, %p, %p stub.\n", iface, debugstr_w(name), start_index, flags, index, base); return E_NOTIMPL; } @@ -2299,7 +2299,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleName2Wide(IDebugS static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByOffset2(IDebugSymbols3 *iface, ULONG64 offset, ULONG start_index, ULONG flags, ULONG *index, ULONG64 *base) { - FIXME("%p, %s, %u, %#x, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), start_index, flags, index, base); + FIXME("%p, %s, %lu, %#lx, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), start_index, flags, index, base); return E_NOTIMPL; } @@ -2307,7 +2307,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByOffset2(IDebugSymbols3 static HRESULT STDMETHODCALLTYPE debugsymbols_AddSyntheticModule(IDebugSymbols3 *iface, ULONG64 base, ULONG size, const char *image_path, const char *module_name, ULONG flags) { - FIXME("%p, %s, %u, %s, %s, %#x stub.\n", iface, wine_dbgstr_longlong(base), size, debugstr_a(image_path), + FIXME("%p, %s, %lu, %s, %s, %#lx stub.\n", iface, wine_dbgstr_longlong(base), size, debugstr_a(image_path), debugstr_a(module_name), flags); return E_NOTIMPL; @@ -2316,7 +2316,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_AddSyntheticModule(IDebugSymbols3 static HRESULT STDMETHODCALLTYPE debugsymbols_AddSyntheticModuleWide(IDebugSymbols3 *iface, ULONG64 base, ULONG size, const WCHAR *image_path, const WCHAR *module_name, ULONG flags) { - FIXME("%p, %s, %u, %s, %s, %#x stub.\n", iface, wine_dbgstr_longlong(base), size, debugstr_w(image_path), + FIXME("%p, %s, %lu, %s, %s, %#lx stub.\n", iface, wine_dbgstr_longlong(base), size, debugstr_w(image_path), debugstr_w(module_name), flags); return E_NOTIMPL; @@ -2338,7 +2338,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetCurrentScopeFrameIndex(IDebugSy static HRESULT STDMETHODCALLTYPE debugsymbols_SetScopeFrameByIndex(IDebugSymbols3 *iface, ULONG index) { - FIXME("%p, %u stub.\n", iface, index); + FIXME("%p, %lu stub.\n", iface, index); return E_NOTIMPL; } @@ -2346,7 +2346,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_SetScopeFrameByIndex(IDebugSymbols static HRESULT STDMETHODCALLTYPE debugsymbols_SetScopeFromJitDebugInfo(IDebugSymbols3 *iface, ULONG output_control, ULONG64 info_offset) { - FIXME("%p, %u, %s stub.\n", iface, output_control, wine_dbgstr_longlong(info_offset)); + FIXME("%p, %lu, %s stub.\n", iface, output_control, wine_dbgstr_longlong(info_offset)); return E_NOTIMPL; } @@ -2361,7 +2361,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_SetScopeFromStoredEvent(IDebugSymb static HRESULT STDMETHODCALLTYPE debugsymbols_OutputSymbolByOffset(IDebugSymbols3 *iface, ULONG output_control, ULONG flags, ULONG64 offset) { - FIXME("%p, %u, %#x, %s stub.\n", iface, output_control, flags, wine_dbgstr_longlong(offset)); + FIXME("%p, %lu, %#lx, %s stub.\n", iface, output_control, flags, wine_dbgstr_longlong(offset)); return E_NOTIMPL; } @@ -2369,7 +2369,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_OutputSymbolByOffset(IDebugSymbols static HRESULT STDMETHODCALLTYPE debugsymbols_GetFunctionEntryByOffset(IDebugSymbols3 *iface, ULONG64 offset, ULONG flags, void *buffer, ULONG buffer_size, ULONG *needed_size) { - FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, buffer, buffer_size, + FIXME("%p, %s, %#lx, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, buffer, buffer_size, needed_size); return E_NOTIMPL; @@ -2378,7 +2378,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetFunctionEntryByOffset(IDebugSym static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldTypeAndOffset(IDebugSymbols3 *iface, ULONG64 module, ULONG container_type_id, const char *field, ULONG *field_type_id, ULONG *offset) { - FIXME("%p, %s, %u, %s, %p, %p stub.\n", iface, wine_dbgstr_longlong(module), container_type_id, debugstr_a(field), + FIXME("%p, %s, %lu, %s, %p, %p stub.\n", iface, wine_dbgstr_longlong(module), container_type_id, debugstr_a(field), field_type_id, offset); return E_NOTIMPL; @@ -2387,7 +2387,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldTypeAndOffset(IDebugSymbol static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldTypeAndOffsetWide(IDebugSymbols3 *iface, ULONG64 module, ULONG container_type_id, const WCHAR *field, ULONG *field_type_id, ULONG *offset) { - FIXME("%p, %s, %u, %s, %p, %p stub.\n", iface, wine_dbgstr_longlong(module), container_type_id, debugstr_w(field), + FIXME("%p, %s, %lu, %s, %p, %p stub.\n", iface, wine_dbgstr_longlong(module), container_type_id, debugstr_w(field), field_type_id, offset); return E_NOTIMPL; @@ -2396,7 +2396,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldTypeAndOffsetWide(IDebugSy static HRESULT STDMETHODCALLTYPE debugsymbols_AddSyntheticSymbol(IDebugSymbols3 *iface, ULONG64 offset, ULONG size, const char *name, ULONG flags, DEBUG_MODULE_AND_ID *id) { - FIXME("%p, %s, %u, %s, %#x, %p stub.\n", iface, wine_dbgstr_longlong(offset), size, debugstr_a(name), flags, id); + FIXME("%p, %s, %lu, %s, %#lx, %p stub.\n", iface, wine_dbgstr_longlong(offset), size, debugstr_a(name), flags, id); return E_NOTIMPL; } @@ -2404,7 +2404,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_AddSyntheticSymbol(IDebugSymbols3 static HRESULT STDMETHODCALLTYPE debugsymbols_AddSyntheticSymbolWide(IDebugSymbols3 *iface, ULONG64 offset, ULONG size, const WCHAR *name, ULONG flags, DEBUG_MODULE_AND_ID *id) { - FIXME("%p, %s, %u, %s, %#x, %p stub.\n", iface, wine_dbgstr_longlong(offset), size, debugstr_w(name), flags, id); + FIXME("%p, %s, %lu, %s, %#lx, %p stub.\n", iface, wine_dbgstr_longlong(offset), size, debugstr_w(name), flags, id); return E_NOTIMPL; } @@ -2419,7 +2419,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_RemoveSyntheticSymbol(IDebugSymbol static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntriesByOffset(IDebugSymbols3 *iface, ULONG64 offset, ULONG flags, DEBUG_MODULE_AND_ID *ids, LONG64 *displacements, ULONG count, ULONG *entries) { - FIXME("%p, %s, %#x, %p, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, ids, displacements, count, + FIXME("%p, %s, %#lx, %p, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, ids, displacements, count, entries); return E_NOTIMPL; @@ -2428,7 +2428,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntriesByOffset(IDebugSym static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntriesByName(IDebugSymbols3 *iface, const char *symbol, ULONG flags, DEBUG_MODULE_AND_ID *ids, ULONG count, ULONG *entries) { - FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, debugstr_a(symbol), flags, ids, count, entries); + FIXME("%p, %s, %#lx, %p, %lu, %p stub.\n", iface, debugstr_a(symbol), flags, ids, count, entries); return E_NOTIMPL; } @@ -2436,7 +2436,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntriesByName(IDebugSymbo static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntriesByNameWide(IDebugSymbols3 *iface, const WCHAR *symbol, ULONG flags, DEBUG_MODULE_AND_ID *ids, ULONG count, ULONG *entries) { - FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, debugstr_w(symbol), flags, ids, count, entries); + FIXME("%p, %s, %#lx, %p, %lu, %p stub.\n", iface, debugstr_w(symbol), flags, ids, count, entries); return E_NOTIMPL; } @@ -2460,7 +2460,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryInformation(IDebugSy static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryString(IDebugSymbols3 *iface, DEBUG_MODULE_AND_ID *id, ULONG which, char *buffer, ULONG buffer_size, ULONG *string_size) { - FIXME("%p, %p, %u, %p, %u, %p stub.\n", iface, id, which, buffer, buffer_size, string_size); + FIXME("%p, %p, %lu, %p, %lu, %p stub.\n", iface, id, which, buffer, buffer_size, string_size); return E_NOTIMPL; } @@ -2468,7 +2468,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryString(IDebugSymbols static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryStringWide(IDebugSymbols3 *iface, DEBUG_MODULE_AND_ID *id, ULONG which, WCHAR *buffer, ULONG buffer_size, ULONG *string_size) { - FIXME("%p, %p, %u, %p, %u, %p stub.\n", iface, id, which, buffer, buffer_size, string_size); + FIXME("%p, %p, %lu, %p, %lu, %p stub.\n", iface, id, which, buffer, buffer_size, string_size); return E_NOTIMPL; } @@ -2476,7 +2476,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryStringWide(IDebugSym static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryOffsetRegions(IDebugSymbols3 *iface, DEBUG_MODULE_AND_ID *id, ULONG flags, DEBUG_OFFSET_REGION *regions, ULONG regions_count, ULONG *regions_avail) { - FIXME("%p, %p, %#x, %p, %u, %p stub.\n", iface, id, flags, regions, regions_count, regions_avail); + FIXME("%p, %p, %#lx, %p, %lu, %p stub.\n", iface, id, flags, regions, regions_count, regions_avail); return E_NOTIMPL; } @@ -2484,7 +2484,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryOffsetRegions(IDebug static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryBySymbolEntry(IDebugSymbols3 *iface, DEBUG_MODULE_AND_ID *from_id, ULONG flags, DEBUG_MODULE_AND_ID *to_id) { - FIXME("%p, %p, %#x, %p stub.\n", iface, from_id, flags, to_id); + FIXME("%p, %p, %#lx, %p stub.\n", iface, from_id, flags, to_id); return E_NOTIMPL; } @@ -2492,7 +2492,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryBySymbolEntry(IDebug static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntriesByOffset(IDebugSymbols3 *iface, ULONG64 offset, ULONG flags, DEBUG_SYMBOL_SOURCE_ENTRY *entries, ULONG count, ULONG *entries_avail) { - FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, entries, count, entries_avail); + FIXME("%p, %s, %#lx, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, entries, count, entries_avail); return E_NOTIMPL; } @@ -2500,7 +2500,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntriesByOffset(IDebugSym static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntriesByLine(IDebugSymbols3 *iface, ULONG line, const char *file, ULONG flags, DEBUG_SYMBOL_SOURCE_ENTRY *entries, ULONG count, ULONG *entries_avail) { - FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, debugstr_a(file), flags, entries, count, entries_avail); + FIXME("%p, %s, %#lx, %p, %lu, %p stub.\n", iface, debugstr_a(file), flags, entries, count, entries_avail); return E_NOTIMPL; } @@ -2508,7 +2508,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntriesByLine(IDebugSymbo static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntriesByLineWide(IDebugSymbols3 *iface, ULONG line, const WCHAR *file, ULONG flags, DEBUG_SYMBOL_SOURCE_ENTRY *entries, ULONG count, ULONG *entries_avail) { - FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, debugstr_w(file), flags, entries, count, entries_avail); + FIXME("%p, %s, %#lx, %p, %lu, %p stub.\n", iface, debugstr_w(file), flags, entries, count, entries_avail); return E_NOTIMPL; } @@ -2516,7 +2516,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntriesByLineWide(IDebugS static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntryString(IDebugSymbols3 *iface, DEBUG_SYMBOL_SOURCE_ENTRY *entry, ULONG which, char *buffer, ULONG buffer_size, ULONG *string_size) { - FIXME("%p, %p, %u, %p, %u, %p stub.\n", iface, entry, which, buffer, buffer_size, string_size); + FIXME("%p, %p, %lu, %p, %lu, %p stub.\n", iface, entry, which, buffer, buffer_size, string_size); return E_NOTIMPL; } @@ -2524,7 +2524,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntryString(IDebugSymbols static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntryStringWide(IDebugSymbols3 *iface, DEBUG_SYMBOL_SOURCE_ENTRY *entry, ULONG which, WCHAR *buffer, ULONG buffer_size, ULONG *string_size) { - FIXME("%p, %p, %u, %p, %u, %p stub.\n", iface, entry, which, buffer, buffer_size, string_size); + FIXME("%p, %p, %lu, %p, %lu, %p stub.\n", iface, entry, which, buffer, buffer_size, string_size); return E_NOTIMPL; } @@ -2532,7 +2532,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntryStringWide(IDebugSym static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntryOffsetRegions(IDebugSymbols3 *iface, DEBUG_SYMBOL_SOURCE_ENTRY *entry, ULONG flags, DEBUG_OFFSET_REGION *regions, ULONG count, ULONG *regions_avail) { - FIXME("%p, %p, %#x, %p, %u, %p stub.\n", iface, entry, flags, regions, count, regions_avail); + FIXME("%p, %p, %#lx, %p, %lu, %p stub.\n", iface, entry, flags, regions, count, regions_avail); return E_NOTIMPL; } @@ -2540,7 +2540,7 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntryOffsetRegions(IDebug static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntryBySourceEntry(IDebugSymbols3 *iface, DEBUG_SYMBOL_SOURCE_ENTRY *from_entry, ULONG flags, DEBUG_SYMBOL_SOURCE_ENTRY *to_entry) { - FIXME("%p, %p, %#x, %p stub.\n", iface, from_entry, flags, to_entry); + FIXME("%p, %p, %#lx, %p stub.\n", iface, from_entry, flags, to_entry); return E_NOTIMPL; } @@ -2707,7 +2707,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetInterrupt(IDebugControl2 *iface static HRESULT STDMETHODCALLTYPE debugcontrol_SetInterrupt(IDebugControl2 *iface, ULONG flags) { - FIXME("%p, %#x stub.\n", iface, flags); + FIXME("%p, %#lx stub.\n", iface, flags); return E_NOTIMPL; } @@ -2721,7 +2721,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetInterruptTimeout(IDebugControl2 static HRESULT STDMETHODCALLTYPE debugcontrol_SetInterruptTimeout(IDebugControl2 *iface, ULONG timeout) { - FIXME("%p, %u stub.\n", iface, timeout); + FIXME("%p, %lu stub.\n", iface, timeout); return E_NOTIMPL; } @@ -2729,7 +2729,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_SetInterruptTimeout(IDebugControl2 static HRESULT STDMETHODCALLTYPE debugcontrol_GetLogFile(IDebugControl2 *iface, char *buffer, ULONG buffer_size, ULONG *file_size, BOOL *append) { - FIXME("%p, %p, %u, %p, %p stub.\n", iface, buffer, buffer_size, file_size, append); + FIXME("%p, %p, %lu, %p, %p stub.\n", iface, buffer, buffer_size, file_size, append); return E_NOTIMPL; } @@ -2755,7 +2755,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetLogMask(IDebugControl2 *iface, static HRESULT STDMETHODCALLTYPE debugcontrol_SetLogMask(IDebugControl2 *iface, ULONG mask) { - FIXME("%p, %#x stub.\n", iface, mask); + FIXME("%p, %#lx stub.\n", iface, mask); return E_NOTIMPL; } @@ -2763,7 +2763,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_SetLogMask(IDebugControl2 *iface, static HRESULT STDMETHODCALLTYPE debugcontrol_Input(IDebugControl2 *iface, char *buffer, ULONG buffer_size, ULONG *input_size) { - FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, input_size); + FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, input_size); return E_NOTIMPL; } @@ -2777,7 +2777,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_ReturnInput(IDebugControl2 *iface, static HRESULT STDMETHODVCALLTYPE debugcontrol_Output(IDebugControl2 *iface, ULONG mask, const char *format, ...) { - FIXME("%p, %#x, %s stub.\n", iface, mask, debugstr_a(format)); + FIXME("%p, %#lx, %s stub.\n", iface, mask, debugstr_a(format)); return E_NOTIMPL; } @@ -2785,7 +2785,7 @@ static HRESULT STDMETHODVCALLTYPE debugcontrol_Output(IDebugControl2 *iface, ULO static HRESULT STDMETHODCALLTYPE debugcontrol_OutputVaList(IDebugControl2 *iface, ULONG mask, const char *format, va_list args) { - FIXME("%p, %#x, %s stub.\n", iface, mask, debugstr_a(format)); + FIXME("%p, %#lx, %s stub.\n", iface, mask, debugstr_a(format)); return E_NOTIMPL; } @@ -2793,7 +2793,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_OutputVaList(IDebugControl2 *iface static HRESULT STDMETHODVCALLTYPE debugcontrol_ControlledOutput(IDebugControl2 *iface, ULONG output_control, ULONG mask, const char *format, ...) { - FIXME("%p, %u, %#x, %s stub.\n", iface, output_control, mask, debugstr_a(format)); + FIXME("%p, %lu, %#lx, %s stub.\n", iface, output_control, mask, debugstr_a(format)); return E_NOTIMPL; } @@ -2801,7 +2801,7 @@ static HRESULT STDMETHODVCALLTYPE debugcontrol_ControlledOutput(IDebugControl2 * static HRESULT STDMETHODCALLTYPE debugcontrol_ControlledOutputVaList(IDebugControl2 *iface, ULONG output_control, ULONG mask, const char *format, va_list args) { - FIXME("%p, %u, %#x, %s stub.\n", iface, output_control, mask, debugstr_a(format)); + FIXME("%p, %lu, %#lx, %s stub.\n", iface, output_control, mask, debugstr_a(format)); return E_NOTIMPL; } @@ -2809,7 +2809,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_ControlledOutputVaList(IDebugContr static HRESULT STDMETHODVCALLTYPE debugcontrol_OutputPrompt(IDebugControl2 *iface, ULONG output_control, const char *format, ...) { - FIXME("%p, %u, %s stub.\n", iface, output_control, debugstr_a(format)); + FIXME("%p, %lu, %s stub.\n", iface, output_control, debugstr_a(format)); return E_NOTIMPL; } @@ -2817,7 +2817,7 @@ static HRESULT STDMETHODVCALLTYPE debugcontrol_OutputPrompt(IDebugControl2 *ifac static HRESULT STDMETHODCALLTYPE debugcontrol_OutputPromptVaList(IDebugControl2 *iface, ULONG output_control, const char *format, va_list args) { - FIXME("%p, %u, %s stub.\n", iface, output_control, debugstr_a(format)); + FIXME("%p, %lu, %s stub.\n", iface, output_control, debugstr_a(format)); return E_NOTIMPL; } @@ -2825,7 +2825,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_OutputPromptVaList(IDebugControl2 static HRESULT STDMETHODCALLTYPE debugcontrol_GetPromptText(IDebugControl2 *iface, char *buffer, ULONG buffer_size, ULONG *text_size) { - FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, text_size); + FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, text_size); return E_NOTIMPL; } @@ -2833,14 +2833,14 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetPromptText(IDebugControl2 *ifac static HRESULT STDMETHODCALLTYPE debugcontrol_OutputCurrentState(IDebugControl2 *iface, ULONG output_control, ULONG flags) { - FIXME("%p, %u, %#x stub.\n", iface, output_control, flags); + FIXME("%p, %lu, %#lx stub.\n", iface, output_control, flags); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE debugcontrol_OutputVersionInformation(IDebugControl2 *iface, ULONG output_control) { - FIXME("%p, %u stub.\n", iface, output_control); + FIXME("%p, %lu stub.\n", iface, output_control); return E_NOTIMPL; } @@ -2870,7 +2870,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_Assemble(IDebugControl2 *iface, UL static HRESULT STDMETHODCALLTYPE debugcontrol_Disassemble(IDebugControl2 *iface, ULONG64 offset, ULONG flags, char *buffer, ULONG buffer_size, ULONG *disassm_size, ULONG64 *end_offset) { - FIXME("%p, %s, %#x, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, buffer, buffer_size, + FIXME("%p, %s, %#lx, %p, %lu, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, buffer, buffer_size, disassm_size, end_offset); return E_NOTIMPL; @@ -2886,7 +2886,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetDisassembleEffectiveOffset(IDeb static HRESULT STDMETHODCALLTYPE debugcontrol_OutputDisassembly(IDebugControl2 *iface, ULONG output_control, ULONG64 offset, ULONG flags, ULONG64 *end_offset) { - FIXME("%p, %u, %s, %#x, %p stub.\n", iface, output_control, wine_dbgstr_longlong(offset), flags, end_offset); + FIXME("%p, %lu, %s, %#lx, %p stub.\n", iface, output_control, wine_dbgstr_longlong(offset), flags, end_offset); return E_NOTIMPL; } @@ -2895,7 +2895,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_OutputDisassemblyLines(IDebugContr ULONG prev_lines, ULONG total_lines, ULONG64 offset, ULONG flags, ULONG *offset_line, ULONG64 *start_offset, ULONG64 *end_offset, ULONG64 *line_offsets) { - FIXME("%p, %u, %u, %u, %s, %#x, %p, %p, %p, %p stub.\n", iface, output_control, prev_lines, total_lines, + FIXME("%p, %lu, %lu, %lu, %s, %#lx, %p, %p, %p, %p stub.\n", iface, output_control, prev_lines, total_lines, wine_dbgstr_longlong(offset), flags, offset_line, start_offset, end_offset, line_offsets); return E_NOTIMPL; @@ -2904,7 +2904,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_OutputDisassemblyLines(IDebugContr static HRESULT STDMETHODCALLTYPE debugcontrol_GetNearInstruction(IDebugControl2 *iface, ULONG64 offset, LONG delta, ULONG64 *instr_offset) { - FIXME("%p, %s, %d, %p stub.\n", iface, wine_dbgstr_longlong(offset), delta, instr_offset); + FIXME("%p, %s, %ld, %p stub.\n", iface, wine_dbgstr_longlong(offset), delta, instr_offset); return E_NOTIMPL; } @@ -2912,7 +2912,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetNearInstruction(IDebugControl2 static HRESULT STDMETHODCALLTYPE debugcontrol_GetStackTrace(IDebugControl2 *iface, ULONG64 frame_offset, ULONG64 stack_offset, ULONG64 instr_offset, DEBUG_STACK_FRAME *frames, ULONG frames_size, ULONG *frames_filled) { - FIXME("%p, %s, %s, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(frame_offset), + FIXME("%p, %s, %s, %s, %p, %lu, %p stub.\n", iface, wine_dbgstr_longlong(frame_offset), wine_dbgstr_longlong(stack_offset), wine_dbgstr_longlong(instr_offset), frames, frames_size, frames_filled); return E_NOTIMPL; @@ -2928,7 +2928,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetReturnOffset(IDebugControl2 *if static HRESULT STDMETHODCALLTYPE debugcontrol_OutputStackTrace(IDebugControl2 *iface, ULONG output_control, DEBUG_STACK_FRAME *frames, ULONG frames_size, ULONG flags) { - FIXME("%p, %u, %p, %u, %#x stub.\n", iface, output_control, frames, frames_size, flags); + FIXME("%p, %lu, %p, %lu, %#lx stub.\n", iface, output_control, frames, frames_size, flags); return E_NOTIMPL; } @@ -2990,7 +2990,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetNumberPossibleExecutingProcesso static HRESULT STDMETHODCALLTYPE debugcontrol_GetPossibleExecutingProcessorTypes(IDebugControl2 *iface, ULONG start, ULONG count, ULONG *types) { - FIXME("%p, %u, %u, %p stub.\n", iface, start, count, types); + FIXME("%p, %lu, %lu, %p stub.\n", iface, start, count, types); return E_NOTIMPL; } @@ -3006,7 +3006,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetSystemVersion(IDebugControl2 *i ULONG *minor, char *sp_string, ULONG sp_string_size, ULONG *sp_string_used, ULONG *sp_number, char *build_string, ULONG build_string_size, ULONG *build_string_used) { - FIXME("%p, %p, %p, %p, %p, %u, %p, %p, %p, %u, %p stub.\n", iface, platform_id, major, minor, sp_string, + FIXME("%p, %p, %p, %p, %p, %lu, %p, %p, %p, %lu, %p stub.\n", iface, platform_id, major, minor, sp_string, sp_string_size, sp_string_used, sp_number, build_string, build_string_size, build_string_used); return E_NOTIMPL; @@ -3045,7 +3045,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_IsPointer64Bit(IDebugControl2 *ifa hr = S_OK; break; default: - FIXME("Unexpected cpu type %#x.\n", target->cpu_type); + FIXME("Unexpected cpu type %#lx.\n", target->cpu_type); hr = E_UNEXPECTED; } @@ -3070,7 +3070,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetNumberSupportedProcessorTypes(I static HRESULT STDMETHODCALLTYPE debugcontrol_GetSupportedProcessorTypes(IDebugControl2 *iface, ULONG start, ULONG count, ULONG *types) { - FIXME("%p, %u, %u, %p stub.\n", iface, start, count, types); + FIXME("%p, %lu, %lu, %p stub.\n", iface, start, count, types); return E_NOTIMPL; } @@ -3079,7 +3079,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetProcessorTypeNames(IDebugContro ULONG full_name_buffer_size, ULONG *full_name_size, char *abbrev_name, ULONG abbrev_name_buffer_size, ULONG *abbrev_name_size) { - FIXME("%p, %u, %p, %u, %p, %p, %u, %p stub.\n", iface, type, full_name, full_name_buffer_size, full_name_size, + FIXME("%p, %lu, %p, %lu, %p, %p, %lu, %p stub.\n", iface, type, full_name, full_name_buffer_size, full_name_size, abbrev_name, abbrev_name_buffer_size, abbrev_name_size); return E_NOTIMPL; @@ -3094,7 +3094,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetEffectiveProcessorType(IDebugCo static HRESULT STDMETHODCALLTYPE debugcontrol_SetEffectiveProcessorType(IDebugControl2 *iface, ULONG type) { - FIXME("%p, %u stub.\n", iface, type); + FIXME("%p, %lu stub.\n", iface, type); return E_NOTIMPL; } @@ -3108,7 +3108,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetExecutionStatus(IDebugControl2 static HRESULT STDMETHODCALLTYPE debugcontrol_SetExecutionStatus(IDebugControl2 *iface, ULONG status) { - FIXME("%p, %u stub.\n", iface, status); + FIXME("%p, %lu stub.\n", iface, status); return E_NOTIMPL; } @@ -3122,7 +3122,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetCodeLevel(IDebugControl2 *iface static HRESULT STDMETHODCALLTYPE debugcontrol_SetCodeLevel(IDebugControl2 *iface, ULONG level) { - FIXME("%p, %u stub.\n", iface, level); + FIXME("%p, %lu stub.\n", iface, level); return E_NOTIMPL; } @@ -3142,7 +3142,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_AddEngineOptions(IDebugControl2 *i { struct debug_client *debug_client = impl_from_IDebugControl2(iface); - TRACE("%p, %#x.\n", iface, options); + TRACE("%p, %#lx.\n", iface, options); if (options & ~DEBUG_ENGOPT_ALL) return E_INVALIDARG; @@ -3156,7 +3156,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_RemoveEngineOptions(IDebugControl2 { struct debug_client *debug_client = impl_from_IDebugControl2(iface); - TRACE("%p, %#x.\n", iface, options); + TRACE("%p, %#lx.\n", iface, options); debug_client->engine_options &= ~options; @@ -3167,7 +3167,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_SetEngineOptions(IDebugControl2 *i { struct debug_client *debug_client = impl_from_IDebugControl2(iface); - TRACE("%p, %#x.\n", iface, options); + TRACE("%p, %#lx.\n", iface, options); if (options & ~DEBUG_ENGOPT_ALL) return E_INVALIDARG; @@ -3188,7 +3188,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetSystemErrorControl(IDebugContro static HRESULT STDMETHODCALLTYPE debugcontrol_SetSystemErrorControl(IDebugControl2 *iface, ULONG output_level, ULONG break_level) { - FIXME("%p, %u, %u stub.\n", iface, output_level, break_level); + FIXME("%p, %lu, %lu stub.\n", iface, output_level, break_level); return E_NOTIMPL; } @@ -3196,14 +3196,14 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_SetSystemErrorControl(IDebugContro static HRESULT STDMETHODCALLTYPE debugcontrol_GetTextMacro(IDebugControl2 *iface, ULONG slot, char *buffer, ULONG buffer_size, ULONG *macro_size) { - FIXME("%p, %u, %p, %u, %p stub.\n", iface, slot, buffer, buffer_size, macro_size); + FIXME("%p, %lu, %p, %lu, %p stub.\n", iface, slot, buffer, buffer_size, macro_size); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE debugcontrol_SetTextMacro(IDebugControl2 *iface, ULONG slot, const char *macro) { - FIXME("%p, %u, %s stub.\n", iface, slot, debugstr_a(macro)); + FIXME("%p, %lu, %s stub.\n", iface, slot, debugstr_a(macro)); return E_NOTIMPL; } @@ -3217,7 +3217,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetRadix(IDebugControl2 *iface, UL static HRESULT STDMETHODCALLTYPE debugcontrol_SetRadix(IDebugControl2 *iface, ULONG radix) { - FIXME("%p, %u stub.\n", iface, radix); + FIXME("%p, %lu stub.\n", iface, radix); return E_NOTIMPL; } @@ -3225,7 +3225,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_SetRadix(IDebugControl2 *iface, UL static HRESULT STDMETHODCALLTYPE debugcontrol_Evaluate(IDebugControl2 *iface, const char *expression, ULONG desired_type, DEBUG_VALUE *value, ULONG *remainder_index) { - FIXME("%p, %s, %u, %p, %p stub.\n", iface, debugstr_a(expression), desired_type, value, remainder_index); + FIXME("%p, %s, %lu, %p, %p stub.\n", iface, debugstr_a(expression), desired_type, value, remainder_index); return E_NOTIMPL; } @@ -3233,7 +3233,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_Evaluate(IDebugControl2 *iface, co static HRESULT STDMETHODCALLTYPE debugcontrol_CoerceValue(IDebugControl2 *iface, DEBUG_VALUE input, ULONG output_type, DEBUG_VALUE *output) { - FIXME("%p, %u, %p stub.\n", iface, output_type, output); + FIXME("%p, %lu, %p stub.\n", iface, output_type, output); return E_NOTIMPL; } @@ -3241,7 +3241,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_CoerceValue(IDebugControl2 *iface, static HRESULT STDMETHODCALLTYPE debugcontrol_CoerceValues(IDebugControl2 *iface, ULONG count, DEBUG_VALUE *input, ULONG *output_types, DEBUG_VALUE *output) { - FIXME("%p, %u, %p, %p, %p stub.\n", iface, count, input, output_types, output); + FIXME("%p, %lu, %p, %p, %p stub.\n", iface, count, input, output_types, output); return E_NOTIMPL; } @@ -3249,7 +3249,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_CoerceValues(IDebugControl2 *iface static HRESULT STDMETHODCALLTYPE debugcontrol_Execute(IDebugControl2 *iface, ULONG output_control, const char *command, ULONG flags) { - FIXME("%p, %u, %s, %#x stub.\n", iface, output_control, debugstr_a(command), flags); + FIXME("%p, %lu, %s, %#lx stub.\n", iface, output_control, debugstr_a(command), flags); return E_NOTIMPL; } @@ -3257,7 +3257,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_Execute(IDebugControl2 *iface, ULO static HRESULT STDMETHODCALLTYPE debugcontrol_ExecuteCommandFile(IDebugControl2 *iface, ULONG output_control, const char *command_file, ULONG flags) { - FIXME("%p, %u, %s, %#x stub.\n", iface, output_control, debugstr_a(command_file), flags); + FIXME("%p, %lu, %s, %#lx stub.\n", iface, output_control, debugstr_a(command_file), flags); return E_NOTIMPL; } @@ -3272,14 +3272,14 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetNumberBreakpoints(IDebugControl static HRESULT STDMETHODCALLTYPE debugcontrol_GetBreakpointByIndex(IDebugControl2 *iface, ULONG index, IDebugBreakpoint **bp) { - FIXME("%p, %u, %p stub.\n", iface, index, bp); + FIXME("%p, %lu, %p stub.\n", iface, index, bp); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE debugcontrol_GetBreakpointById(IDebugControl2 *iface, ULONG id, IDebugBreakpoint **bp) { - FIXME("%p, %u, %p stub.\n", iface, id, bp); + FIXME("%p, %lu, %p stub.\n", iface, id, bp); return E_NOTIMPL; } @@ -3287,7 +3287,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetBreakpointById(IDebugControl2 * static HRESULT STDMETHODCALLTYPE debugcontrol_GetBreakpointParameters(IDebugControl2 *iface, ULONG count, ULONG *ids, ULONG start, DEBUG_BREAKPOINT_PARAMETERS *parameters) { - FIXME("%p, %u, %p, %u, %p stub.\n", iface, count, ids, start, parameters); + FIXME("%p, %lu, %p, %lu, %p stub.\n", iface, count, ids, start, parameters); return E_NOTIMPL; } @@ -3295,7 +3295,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetBreakpointParameters(IDebugCont static HRESULT STDMETHODCALLTYPE debugcontrol_AddBreakpoint(IDebugControl2 *iface, ULONG type, ULONG desired_id, IDebugBreakpoint **bp) { - FIXME("%p, %u, %u, %p stub.\n", iface, type, desired_id, bp); + FIXME("%p, %lu, %lu, %p stub.\n", iface, type, desired_id, bp); return E_NOTIMPL; } @@ -3310,7 +3310,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_RemoveBreakpoint(IDebugControl2 *i static HRESULT STDMETHODCALLTYPE debugcontrol_AddExtension(IDebugControl2 *iface, const char *path, ULONG flags, ULONG64 *handle) { - FIXME("%p, %s, %#x, %p stub.\n", iface, debugstr_a(path), flags, handle); + FIXME("%p, %s, %#lx, %p stub.\n", iface, debugstr_a(path), flags, handle); return E_NOTIMPL; } @@ -3373,7 +3373,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetNumberEventFilters(IDebugContro static HRESULT STDMETHODCALLTYPE debugcontrol_GetEventFilterText(IDebugControl2 *iface, ULONG index, char *buffer, ULONG buffer_size, ULONG *text_size) { - FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, text_size); + FIXME("%p, %lu, %p, %lu, %p stub.\n", iface, index, buffer, buffer_size, text_size); return E_NOTIMPL; } @@ -3381,7 +3381,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetEventFilterText(IDebugControl2 static HRESULT STDMETHODCALLTYPE debugcontrol_GetEventFilterCommand(IDebugControl2 *iface, ULONG index, char *buffer, ULONG buffer_size, ULONG *command_size) { - FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, command_size); + FIXME("%p, %lu, %p, %lu, %p stub.\n", iface, index, buffer, buffer_size, command_size); return E_NOTIMPL; } @@ -3389,7 +3389,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetEventFilterCommand(IDebugContro static HRESULT STDMETHODCALLTYPE debugcontrol_SetEventFilterCommand(IDebugControl2 *iface, ULONG index, const char *command) { - FIXME("%p, %u, %s stub.\n", iface, index, debugstr_a(command)); + FIXME("%p, %lu, %s stub.\n", iface, index, debugstr_a(command)); return E_NOTIMPL; } @@ -3397,7 +3397,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_SetEventFilterCommand(IDebugContro static HRESULT STDMETHODCALLTYPE debugcontrol_GetSpecificFilterParameters(IDebugControl2 *iface, ULONG start, ULONG count, DEBUG_SPECIFIC_FILTER_PARAMETERS *parameters) { - FIXME("%p, %u, %u, %p stub.\n", iface, start, count, parameters); + FIXME("%p, %lu, %lu, %p stub.\n", iface, start, count, parameters); return E_NOTIMPL; } @@ -3405,7 +3405,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetSpecificFilterParameters(IDebug static HRESULT STDMETHODCALLTYPE debugcontrol_SetSpecificFilterParameters(IDebugControl2 *iface, ULONG start, ULONG count, DEBUG_SPECIFIC_FILTER_PARAMETERS *parameters) { - FIXME("%p, %u, %u, %p stub.\n", iface, start, count, parameters); + FIXME("%p, %lu, %lu, %p stub.\n", iface, start, count, parameters); return E_NOTIMPL; } @@ -3413,7 +3413,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_SetSpecificFilterParameters(IDebug static HRESULT STDMETHODCALLTYPE debugcontrol_GetSpecificFilterArgument(IDebugControl2 *iface, ULONG index, char *buffer, ULONG buffer_size, ULONG *argument_size) { - FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, argument_size); + FIXME("%p, %lu, %p, %lu, %p stub.\n", iface, index, buffer, buffer_size, argument_size); return E_NOTIMPL; } @@ -3421,7 +3421,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetSpecificFilterArgument(IDebugCo static HRESULT STDMETHODCALLTYPE debugcontrol_SetSpecificFilterArgument(IDebugControl2 *iface, ULONG index, const char *argument) { - FIXME("%p, %u, %s stub.\n", iface, index, debugstr_a(argument)); + FIXME("%p, %lu, %s stub.\n", iface, index, debugstr_a(argument)); return E_NOTIMPL; } @@ -3429,7 +3429,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_SetSpecificFilterArgument(IDebugCo static HRESULT STDMETHODCALLTYPE debugcontrol_GetExceptionFilterParameters(IDebugControl2 *iface, ULONG count, ULONG *codes, ULONG start, DEBUG_EXCEPTION_FILTER_PARAMETERS *parameters) { - FIXME("%p, %u, %p, %u, %p stub.\n", iface, count, codes, start, parameters); + FIXME("%p, %lu, %p, %lu, %p stub.\n", iface, count, codes, start, parameters); return E_NOTIMPL; } @@ -3437,7 +3437,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetExceptionFilterParameters(IDebu static HRESULT STDMETHODCALLTYPE debugcontrol_SetExceptionFilterParameters(IDebugControl2 *iface, ULONG count, DEBUG_EXCEPTION_FILTER_PARAMETERS *parameters) { - FIXME("%p, %u, %p stub.\n", iface, count, parameters); + FIXME("%p, %lu, %p stub.\n", iface, count, parameters); return E_NOTIMPL; } @@ -3445,7 +3445,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_SetExceptionFilterParameters(IDebu static HRESULT STDMETHODCALLTYPE debugcontrol_GetExceptionFilterSecondCommand(IDebugControl2 *iface, ULONG index, char *buffer, ULONG buffer_size, ULONG *command_size) { - FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, command_size); + FIXME("%p, %lu, %p, %lu, %p stub.\n", iface, index, buffer, buffer_size, command_size); return E_NOTIMPL; } @@ -3453,7 +3453,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetExceptionFilterSecondCommand(ID static HRESULT STDMETHODCALLTYPE debugcontrol_SetExceptionFilterSecondCommand(IDebugControl2 *iface, ULONG index, const char *command) { - FIXME("%p, %u, %s stub.\n", iface, index, debugstr_a(command)); + FIXME("%p, %lu, %s stub.\n", iface, index, debugstr_a(command)); return E_NOTIMPL; } @@ -3463,7 +3463,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_WaitForEvent(IDebugControl2 *iface struct debug_client *debug_client = impl_from_IDebugControl2(iface); struct target_process *target; - TRACE("%p, %#x, %u.\n", iface, flags, timeout); + TRACE("%p, %#lx, %lu.\n", iface, flags, timeout); /* FIXME: only one target is used currently */ @@ -3490,7 +3490,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_WaitForEvent(IDebugControl2 *iface { status = NtSuspendProcess(target->handle); if (status) - WARN("Failed to suspend a process, status %#x.\n", status); + WARN("Failed to suspend a process, status %#lx.\n", status); } return S_OK; @@ -3507,7 +3507,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetLastEventInformation(IDebugCont ULONG *tid, void *extra_info, ULONG extra_info_size, ULONG *extra_info_used, char *description, ULONG desc_size, ULONG *desc_used) { - FIXME("%p, %p, %p, %p, %p, %u, %p, %p, %u, %p stub.\n", iface, type, pid, tid, extra_info, extra_info_size, + FIXME("%p, %p, %p, %p, %p, %lu, %p, %p, %lu, %p stub.\n", iface, type, pid, tid, extra_info, extra_info_size, extra_info_used, description, desc_size, desc_used); return E_NOTIMPL; @@ -3515,14 +3515,14 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetLastEventInformation(IDebugCont static HRESULT STDMETHODCALLTYPE debugcontrol_GetCurrentTimeDate(IDebugControl2 *iface, ULONG timedate) { - FIXME("%p, %u stub.\n", iface, timedate); + FIXME("%p, %lu stub.\n", iface, timedate); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE debugcontrol_GetCurrentSystemUpTime(IDebugControl2 *iface, ULONG uptime) { - FIXME("%p, %u stub.\n", iface, uptime); + FIXME("%p, %lu stub.\n", iface, uptime); return E_NOTIMPL; } @@ -3545,7 +3545,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetNumberTextReplacement(IDebugCon ULONG index, char *src_buffer, ULONG src_buffer_size, ULONG *src_size, char *dst_buffer, ULONG dst_buffer_size, ULONG *dst_size) { - FIXME("%p, %s, %u, %p, %u, %p, %p, %u, %p stub.\n", iface, debugstr_a(src_text), index, src_buffer, + FIXME("%p, %s, %lu, %p, %lu, %p, %p, %lu, %p stub.\n", iface, debugstr_a(src_text), index, src_buffer, src_buffer_size, src_size, dst_buffer, dst_buffer_size, dst_size); return E_NOTIMPL; @@ -3569,7 +3569,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_RemoveTextReplacements(IDebugContr static HRESULT STDMETHODCALLTYPE debugcontrol_OutputTextReplacements(IDebugControl2 *iface, ULONG output_control, ULONG flags) { - FIXME("%p, %u, %#x stub.\n", iface, output_control, flags); + FIXME("%p, %lu, %#lx stub.\n", iface, output_control, flags); return E_NOTIMPL; } @@ -3705,7 +3705,7 @@ static ULONG STDMETHODCALLTYPE debugadvanced_Release(IDebugAdvanced *iface) static HRESULT STDMETHODCALLTYPE debugadvanced_GetThreadContext(IDebugAdvanced *iface, void *context, ULONG context_size) { - FIXME("%p, %p, %u stub.\n", iface, context, context_size); + FIXME("%p, %p, %lu stub.\n", iface, context, context_size); return E_NOTIMPL; } @@ -3713,7 +3713,7 @@ static HRESULT STDMETHODCALLTYPE debugadvanced_GetThreadContext(IDebugAdvanced * static HRESULT STDMETHODCALLTYPE debugadvanced_SetThreadContext(IDebugAdvanced *iface, void *context, ULONG context_size) { - FIXME("%p, %p, %u stub.\n", iface, context, context_size); + FIXME("%p, %p, %lu stub.\n", iface, context, context_size); return E_NOTIMPL; } @@ -3773,14 +3773,14 @@ static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetCurrentThreadId(IDebugSys static HRESULT STDMETHODCALLTYPE debugsystemobjects_SetCurrentThreadId(IDebugSystemObjects *iface, ULONG id) { - FIXME("%p, %u stub.\n", iface, id); + FIXME("%p, %lu stub.\n", iface, id); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE debugsystemobjects_SetCurrentProcessId(IDebugSystemObjects *iface, ULONG id) { - FIXME("%p, %u stub.\n", iface, id); + FIXME("%p, %lu stub.\n", iface, id); return E_NOTIMPL; } @@ -3803,7 +3803,7 @@ static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetTotalNumberThreads(IDebug static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetThreadIdsByIndex(IDebugSystemObjects *iface, ULONG start, ULONG count, ULONG *ids, ULONG *sysids) { - FIXME("%p, %u, %u, %p, %p stub.\n", iface, start, count, ids, sysids); + FIXME("%p, %lu, %lu, %p, %p stub.\n", iface, start, count, ids, sysids); return E_NOTIMPL; } @@ -3811,7 +3811,7 @@ static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetThreadIdsByIndex(IDebugSy static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetThreadIdByProcessor(IDebugSystemObjects *iface, ULONG processor, ULONG *id) { - FIXME("%p, %u, %p stub.\n", iface, processor, id); + FIXME("%p, %lu, %p stub.\n", iface, processor, id); return E_NOTIMPL; } @@ -3857,7 +3857,7 @@ static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetCurrentThreadSystemId(IDe static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetThreadIdBySystemId(IDebugSystemObjects *iface, ULONG sysid, ULONG *id) { - FIXME("%p, %u, %p stub.\n", iface, sysid, id); + FIXME("%p, %lu, %p stub.\n", iface, sysid, id); return E_NOTIMPL; } @@ -3887,7 +3887,7 @@ static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetNumberProcesses(IDebugSys static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetProcessIdsByIndex(IDebugSystemObjects *iface, ULONG start, ULONG count, ULONG *ids, ULONG *sysids) { - FIXME("%p, %u, %u, %p, %p stub.\n", iface, start, count, ids, sysids); + FIXME("%p, %lu, %lu, %p, %p stub.\n", iface, start, count, ids, sysids); return E_NOTIMPL; } @@ -3933,7 +3933,7 @@ static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetCurrentProcessSystemId(ID static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetProcessIdBySystemId(IDebugSystemObjects *iface, ULONG sysid, ULONG *id) { - FIXME("%p, %u, %p stub.\n", iface, sysid, id); + FIXME("%p, %lu, %p stub.\n", iface, sysid, id); return E_NOTIMPL; } @@ -3957,7 +3957,7 @@ static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetProcessIdByHandle(IDebugS static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetCurrentProcessExecutableName(IDebugSystemObjects *iface, char *buffer, ULONG buffer_size, ULONG *exe_size) { - FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, exe_size); + FIXME("%p, %p, %lu, %p stub.\n", iface, buffer, buffer_size, exe_size); return E_NOTIMPL; } @@ -4059,7 +4059,7 @@ HRESULT WINAPI DebugCreate(REFIID riid, void **obj) */ HRESULT WINAPI DebugCreateEx(REFIID riid, DWORD flags, void **obj) { - FIXME("(%s, %#x, %p): stub\n", debugstr_guid(riid), flags, obj); + FIXME("%s, %#lx, %p: stub\n", debugstr_guid(riid), flags, obj); return E_NOTIMPL; } -- 2.34.1

1 0