- wine-devel - winehq.org

[PATCH] mshtml: implement the IsNoCacheReponse method
by Pat Leamon 10 Mar '22

10 Mar '22

From: Pat Leamon <pat.leamon(a)gmail.com> Implements IsNoCacheReponse based on IsNoStoreReponse implementation. Signed-off-by: Pat Leamon <pat.leamon(a)gmail.com> --- dlls/mshtml/nsio.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index fc6602eddf4..33d26670e4c 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1501,10 +1501,15 @@ static nsresult NSAPI nsChannel_IsNoStoreResponse(nsIHttpChannel *iface, cpp_boo static nsresult NSAPI nsChannel_IsNoCacheResponse(nsIHttpChannel *iface, cpp_bool *_retval) { nsChannel *This = impl_from_nsIHttpChannel(iface); + http_header_t *header; - FIXME("(%p)->(%p)\n", This, _retval); + static const WCHAR cache_controlW[] = {'C','a','c','h','e','-','C','o','n','t','r','o','l'}; - return NS_ERROR_NOT_IMPLEMENTED; + TRACE("(%p)->(%p)\n", This, _retval); + + header = find_http_header(&This->response_headers, cache_controlW, ARRAY_SIZE(cache_controlW)); + *_retval = header && !wcsicmp(header->data, L"no-cache"); + return NS_OK; } static nsresult NSAPI nsChannel_IsPrivateResponse(nsIHttpChannel *iface, cpp_bool *_retval) -- 2.25.1

2 1

[PATCH] mshtml: Implement nsIHttpChannel::IsNoCacheReponse.
by Jacek Caban 10 Mar '22

10 Mar '22

From: Pat Leamon <pat.leamon(a)gmail.com> Signed-off-by: Pat Leamon <pleamonhp(a)yahoo.com.au> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Supersedes 229496, adds a comment about Gecko handling of max-age header. dlls/mshtml/nsio.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)

1 0

[PATCH v4 4/8] server: Defer postprocessing until after setting initial status in send_socket handler.
by Jinoh Kang 10 Mar '22

10 Mar '22

This allows the client to postpone the initial I/O until the server has queued the I/O request. The server should perform the postprocessing only after the initial I/O has been done. In the case of send_socket, the manipulation of event flags shall ideally be done *after* (not *before*) the client has attempted the initial I/O, since the outbound queue status of the socket may change in the meanwhile. Also, the implicitly bound address is available only after the send* system call has been performed. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v1 -> v2: - pass around total size of data to be transmitted - detect short write in send_socket_initial_callback v2 -> v3: no changes v3 -> v4: no changes dlls/ntdll/unix/socket.c | 15 ++++++++++++++ server/protocol.def | 1 + server/sock.c | 42 +++++++++++++++++++++++++++------------- 3 files changed, 45 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 23059e3cff8..d04ebb7f874 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -873,6 +873,7 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi NTSTATUS status; unsigned int i; ULONG options; + data_size_t data_size; async_size = offsetof( struct async_send_ioctl, iov[count] ); @@ -906,6 +907,18 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi async->iov_cursor = 0; async->sent_len = 0; + data_size = 0; + for (i = 0; i < count; ++i) + { + SIZE_T len = async->iov[i].iov_len; + if (len > (SIZE_T)(data_size_t)-1 || (data_size_t)(data_size + len) < data_size) + { + release_fileio( &async->io ); + return STATUS_NO_MEMORY; + } + data_size += len; + } + status = try_send( fd, async ); if (status != STATUS_SUCCESS && status != STATUS_DEVICE_NOT_READY) @@ -919,6 +932,7 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi SERVER_START_REQ( send_socket ) { + req->data_size = data_size; req->status = status; req->total = async->sent_len; req->async = server_async( handle, &async->io, event, apc, apc_user, iosb_client_ptr(io) ); @@ -1099,6 +1113,7 @@ static NTSTATUS sock_transmit( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, SERVER_START_REQ( send_socket ) { + req->data_size = async->head_len + async->file_len + async->tail_len; req->status = STATUS_PENDING; req->total = 0; req->async = server_async( handle, &async->io, event, apc, apc_user, iosb_client_ptr(io) ); diff --git a/server/protocol.def b/server/protocol.def index 9d90544fa41..2e57c91ccad 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1461,6 +1461,7 @@ enum server_fd_type /* Perform a send on a socket */ @REQ(send_socket) + data_size_t data_size; /* total number of bytes to send (>= total) */ async_data_t async; /* async I/O parameters */ unsigned int status; /* status of initial call */ unsigned int total; /* number of bytes already sent */ diff --git a/server/sock.c b/server/sock.c index 91f98556552..0e386e3537c 100644 --- a/server/sock.c +++ b/server/sock.c @@ -3454,16 +3454,17 @@ DECL_HANDLER(recv_socket) release_object( sock ); } -DECL_HANDLER(send_socket) +static void send_socket_initial_callback( void *private, struct async *async, struct fd *fd, unsigned int status ) { - struct sock *sock = (struct sock *)get_handle_obj( current->process, req->async.handle, 0, &sock_ops ); - unsigned int status = req->status; - timeout_t timeout = 0; - struct async *async; - struct fd *fd; + struct sock *sock = get_fd_user( fd ); + struct iosb *iosb; + int is_short_write = 0; - if (!sock) return; - fd = sock->fd; + if ((iosb = async_get_iosb( async ))) + { + is_short_write = iosb->result < (unsigned long)private; + release_object( iosb ); + } if (sock->type == WS_SOCK_DGRAM) { @@ -3476,13 +3477,29 @@ DECL_HANDLER(send_socket) sock->bound = 1; } - if (status != STATUS_SUCCESS) + if (status != STATUS_SUCCESS || is_short_write) { - /* send() calls only clear and reselect events if unsuccessful. */ + /* send() calls only clear and reselect events if unsuccessful. + * Also treat short writes as being unsuccessful. + */ sock->pending_events &= ~AFD_POLL_WRITE; sock->reported_events &= ~AFD_POLL_WRITE; } + sock_reselect( sock ); +} + +DECL_HANDLER(send_socket) +{ + struct sock *sock = (struct sock *)get_handle_obj( current->process, req->async.handle, 0, &sock_ops ); + unsigned int status = req->status; + timeout_t timeout = 0; + struct async *async; + struct fd *fd; + + if (!sock) return; + fd = sock->fd; + /* If we had a short write and the socket is nonblocking (and the client is * not trying to force the operation to be asynchronous), return success. * Windows actually refuses to send any data in this case, and returns @@ -3518,15 +3535,14 @@ DECL_HANDLER(send_socket) } set_error( status ); + async_set_initial_status_callback( async, send_socket_initial_callback, (void *)(unsigned long)req->data_size ); + if (timeout) async_set_timeout( async, timeout, STATUS_IO_TIMEOUT ); if (status == STATUS_PENDING) queue_async( &sock->write_q, async ); - /* always reselect; we changed reported_events above */ - sock_reselect( sock ); - reply->wait = async_handoff( async, NULL, 0 ); reply->options = get_fd_options( fd ); release_object( async ); -- 2.34.1

2 12

[PATCH 1/4] windows.media.speech: Import DEFINE_INSPECTABLE macros.
by Bernhard Kölbl 10 Mar '22

10 Mar '22

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/private.h | 42 +++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index b1df726413d..2694b23beab 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -46,4 +46,46 @@ extern IActivationFactory *synthesizer_factory; + + +#define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ + static inline impl_type *impl_from( iface_type *iface ) \ + { \ + return CONTAINING_RECORD( iface, impl_type, iface_mem ); \ + } \ + static HRESULT WINAPI pfx##_QueryInterface( iface_type *iface, REFIID iid, void **out ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_QueryInterface( (IInspectable *)(expr), iid, out ); \ + } \ + static ULONG WINAPI pfx##_AddRef( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_AddRef( (IInspectable *)(expr) ); \ + } \ + static ULONG WINAPI pfx##_Release( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_Release( (IInspectable *)(expr) ); \ + } \ + static HRESULT WINAPI pfx##_GetIids( iface_type *iface, ULONG *iid_count, IID **iids ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetIids( (IInspectable *)(expr), iid_count, iids ); \ + } \ + static HRESULT WINAPI pfx##_GetRuntimeClassName( iface_type *iface, HSTRING *class_name ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetRuntimeClassName( (IInspectable *)(expr), class_name ); \ + } \ + static HRESULT WINAPI pfx##_GetTrustLevel( iface_type *iface, TrustLevel *trust_level ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetTrustLevel( (IInspectable *)(expr), trust_level ); \ + } +#define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, base_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, &impl->base_iface ) +#define DEFINE_IINSPECTABLE_OUTER( pfx, iface_type, impl_type, outer_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, impl->outer_iface ) + #endif -- 2.35.1

3 9

[PATCH 8/8] win32u: Move NtUserUpdateLayeredWindow implementation from user32.
by Jacek Caban 10 Mar '22

10 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 15 +------- dlls/user32/win.c | 49 +++---------------------- dlls/win32u/driver.c | 7 ++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 4 +++ dlls/win32u/window.c | 70 ++++++++++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 9 +++++ include/ntuser.h | 3 ++ 9 files changed, 100 insertions(+), 60 deletions(-)

2 1

[PATCH 7/8] win32u: Move NtUserSetLayeredWindowAttributes implementation from user32.
by Jacek Caban 10 Mar '22

10 Mar '22

2 1

[PATCH 6/8] win32u: Move WM_WINE_UPDATEWINDOWSTATE implementation from user32.
by Jacek Caban 10 Mar '22

10 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 3 --- dlls/user32/user_main.c | 2 ++ dlls/user32/user_private.h | 1 - dlls/user32/win.c | 2 +- dlls/win32u/message.c | 11 ++++++++++ dlls/win32u/ntuser_private.h | 4 ++++ dlls/win32u/sysparams.c | 42 ++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 3 +++ dlls/win32u/window.c | 26 ++++++++++++++++++++++ 9 files changed, 89 insertions(+), 5 deletions(-)

2 1

[PATCH 5/8] win32u: Move GetWindowPlacement and MonitorFromWindow implementation from user32.
by Jacek Caban 10 Mar '22

10 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/sysparams.c | 19 +--- dlls/user32/winpos.c | 80 +--------------- dlls/win32u/region.c | 2 +- dlls/win32u/sysparams.c | 23 ++++- dlls/win32u/win32u_private.h | 6 +- dlls/win32u/window.c | 174 +++++++++++++++++++++++++++++++++-- include/ntuser.h | 2 + 7 files changed, 201 insertions(+), 105 deletions(-)

2 1

[PATCH 3/8] win32u: Move NtUserMoveWindow implementation from user32.
by Jacek Caban 10 Mar '22

10 Mar '22

2 1

[PATCH 4/8] win32u: Move NtUserWindowFromPoint implementation from user32.
by Jacek Caban 10 Mar '22

10 Mar '22

2 1

[PATCH 2/8] win32u: Move NtUserSetWindowRgn implementation from user32.
by Jacek Caban 10 Mar '22

10 Mar '22

2 1

[PATCH 1/8] win32u: Move NtUserGetWindowRgnEx implementation from user32.
by Jacek Caban 10 Mar '22

10 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winpos.c | 45 ++------------------------------------ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 48 +++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 ++++++++ include/ntuser.h | 1 + 7 files changed, 63 insertions(+), 44 deletions(-)

2 1

[PATCH vkd3d 1/8] vkd3d-shader/hlsl: Write SM4 uint bitwise AND.
by Giovanni Mascellani 10 Mar '22

10 Mar '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 6996bb2d..69d02911 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1621,6 +1621,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op_with_two_destinations(buffer, VKD3D_SM4_OP_IMUL, &expr->node, 1, arg1, arg2); break; + case HLSL_OP2_BIT_AND: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_AND, &expr->node, arg1, arg2); + break; + default: hlsl_fixme(ctx, &expr->node.loc, "SM4 uint \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); break; -- 2.35.1

1 7

[PATCH] comctl32/tests: Fix a possible test failure.
by Zhiyi Zhang 10 Mar '22

10 Mar '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52639 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/toolbar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 80f9e067c00..31c360304c6 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -2639,6 +2639,7 @@ static void test_visual(void) SendMessageA(toolbar, TB_BUTTONSTRUCTSIZE, sizeof(tbbutton), 0); ret = SendMessageA(toolbar, TB_ADDBUTTONSA, 1, (LPARAM)&tbbutton); ok(ret, "TB_ADDBUTTONSA failed.\n"); + flush_events(); theme = pGetWindowTheme(toolbar); ok(!theme, "Expected theme not opened by window.\n"); @@ -2650,7 +2651,6 @@ static void test_visual(void) ret = RedrawWindow(toolbar, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_ERASE | RDW_ERASENOW | RDW_UPDATENOW); ok(ret, "RedrawWindow failed.\n"); - flush_events(); mem_dc1 = CreateCompatibleDC(toolbar_dc); mem_bitmap1 = CreateCompatibleBitmap(toolbar_dc, width, height); -- 2.32.0

1 0

[PATCH 3/3] crypt32: Add support for decoding OCSP responses.
by Hans Leidekker 10 Mar '22

10 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/decode.c | 93 +++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 73 +++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 1550b3d6f85..dde049b3c40 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -6147,6 +6147,96 @@ static BOOL WINAPI CRYPT_AsnDecodeEccSignature(DWORD dwCertEncodingType, return ret; } +static BOOL CRYPT_AsnDecodeOCSPResponseStatus(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + if (!cbEncoded) + { + SetLastError(CRYPT_E_ASN1_EOD); + return FALSE; + } + if (pbEncoded[0] != ASN_ENUMERATED) + { + SetLastError(CRYPT_E_ASN1_BADTAG); + return FALSE; + } + + return CRYPT_AsnDecodeIntInternal(pbEncoded, cbEncoded, dwFlags, pvStructInfo, + pcbStructInfo, pcbDecoded); +} + +static BOOL CRYPT_AsnDecodeOCSPResponseBytes(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + DWORD dataLen; + BOOL ret; + + if (!cbEncoded) + { + SetLastError(CRYPT_E_ASN1_EOD); + return FALSE; + } + if (pbEncoded[0] != (ASN_CONTEXT | ASN_CONSTRUCTOR)) + { + SetLastError(CRYPT_E_ASN1_BADTAG); + return FALSE; + } + + if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) + { + struct AsnDecodeSequenceItem items[] = { + { ASN_OBJECTIDENTIFIER, 0, + CRYPT_AsnDecodeOidIgnoreTag, sizeof(LPSTR), FALSE, TRUE, + 0, 0 }, + { ASN_OCTETSTRING, sizeof(LPSTR), + CRYPT_AsnDecodeOctets, sizeof(CRYPT_OBJID_BLOB), FALSE, TRUE, + sizeof(LPSTR) + offsetof(CRYPT_OBJID_BLOB, pbData), 0 }, + }; + BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); + DWORD bytesNeeded; + + if (dataLen) + { + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), + pbEncoded + 1 + lenBytes, cbEncoded - 1 - lenBytes, dwFlags, NULL, + pvStructInfo, pcbStructInfo, &bytesNeeded, NULL); + if (ret) *pcbDecoded = bytesNeeded + lenBytes + 1; + } + } + return ret; +} + +static BOOL WINAPI CRYPT_AsnDecodeOCSPResponse(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + CRYPT_DECODE_PARA *pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret; + struct AsnDecodeSequenceItem items[] = { + { ASN_ENUMERATED, offsetof(OCSP_RESPONSE_INFO, dwStatus), + CRYPT_AsnDecodeOCSPResponseStatus, sizeof(DWORD), FALSE, FALSE, + 0, 0 }, + { ASN_CONTEXT | ASN_CONSTRUCTOR, offsetof(OCSP_RESPONSE_INFO, pszObjId), + CRYPT_AsnDecodeOCSPResponseBytes, sizeof(LPSTR) + sizeof(CRYPT_OBJID_BLOB), TRUE, TRUE, + offsetof(OCSP_RESPONSE_INFO, pszObjId), 0 }, + }; + + __TRY + { + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, + pcbStructInfo, NULL, NULL); + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, LPCSTR lpszStructType) { @@ -6295,6 +6385,9 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, case LOWORD(CNG_RSA_PUBLIC_KEY_BLOB): decodeFunc = CRYPT_AsnDecodeRsaPubKey_Bcrypt; break; + case LOWORD(OCSP_RESPONSE): + decodeFunc = CRYPT_AsnDecodeOCSPResponse; + break; default: FIXME("Unimplemented decoder for lpszStructType OID %d\n", LOWORD(lpszStructType)); } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index c47fd823673..11840d817fe 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -8760,6 +8760,78 @@ static void test_encodeOCSPRequestInfo(DWORD dwEncoding) LocalFree(buf); } +static const BYTE ocsp_response[] = { + 0x30, 0x03, 0x0a, 0x01, 0x06 +}; + +static const BYTE ocsp_response2[] = { + 0x30, 0x82, 0x01, 0xd3, 0x0a, 0x01, 0x00, 0xa0, 0x82, 0x01, 0xcc, 0x30, + 0x82, 0x01, 0xc8, 0x06, 0x09, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x30, + 0x01, 0x01, 0x04, 0x82, 0x01, 0xb9, 0x30, 0x82, 0x01, 0xb5, 0x30, 0x81, + 0x9e, 0xa2, 0x16, 0x04, 0x14, 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, + 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, + 0xf4, 0x18, 0x0f, 0x32, 0x30, 0x32, 0x32, 0x30, 0x33, 0x30, 0x37, 0x31, + 0x38, 0x33, 0x36, 0x34, 0x33, 0x5a, 0x30, 0x73, 0x30, 0x71, 0x30, 0x49, + 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04, + 0x14, 0xe4, 0xe3, 0x95, 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, 0x1f, 0xf0, + 0x98, 0x0c, 0x0b, 0x4e, 0xc0, 0x09, 0x8a, 0xab, 0xd8, 0x04, 0x14, 0xb7, + 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, + 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4, 0x02, 0x10, 0x08, 0x49, 0x8f, + 0x6d, 0xd9, 0xef, 0xfb, 0x40, 0x55, 0x1e, 0xac, 0x54, 0x54, 0x87, 0xc1, + 0xb1, 0x80, 0x00, 0x18, 0x0f, 0x32, 0x30, 0x32, 0x32, 0x30, 0x33, 0x30, + 0x37, 0x31, 0x38, 0x32, 0x31, 0x30, 0x31, 0x5a, 0xa0, 0x11, 0x18, 0x0f, + 0x32, 0x30, 0x32, 0x32, 0x30, 0x33, 0x31, 0x34, 0x31, 0x37, 0x33, 0x36, + 0x30, 0x31, 0x5a, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, + 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0x2a, + 0xf3, 0x5f, 0xf7, 0x72, 0x6b, 0x27, 0x38, 0x6b, 0xae, 0x66, 0x42, 0xe0, + 0x3b, 0xc6, 0x44, 0x5f, 0x95, 0xe2, 0x1f, 0xbc, 0x3f, 0xb3, 0x1d, 0x6c, + 0x6c, 0x7c, 0x91, 0xb3, 0x02, 0x23, 0x0f, 0xf0, 0x13, 0x5f, 0x62, 0x92, + 0x0d, 0x91, 0xa9, 0x8f, 0x66, 0xe9, 0x18, 0xe3, 0xb1, 0xe0, 0x4c, 0x63, + 0x40, 0x9e, 0x14, 0x26, 0x28, 0x7a, 0x5e, 0x51, 0x99, 0x43, 0x1c, 0xd5, + 0xbd, 0x84, 0x88, 0x68, 0xd9, 0x0e, 0xd9, 0xf4, 0x78, 0x48, 0x9f, 0x01, + 0x4c, 0x34, 0x14, 0x1e, 0x7c, 0x72, 0x9c, 0xdd, 0x94, 0xcb, 0x6e, 0x28, + 0xf5, 0x76, 0x75, 0xa2, 0xbe, 0x4b, 0x52, 0xac, 0x38, 0x9d, 0xce, 0x52, + 0x68, 0x33, 0xbc, 0x52, 0xc7, 0xdc, 0x2f, 0x19, 0xff, 0x15, 0x9c, 0x4b, + 0xdb, 0x83, 0x4e, 0xd7, 0xf6, 0x9b, 0x7f, 0x76, 0x58, 0xa5, 0x46, 0x49, + 0xe3, 0x2d, 0x41, 0x26, 0xf8, 0xce, 0xb7, 0x56, 0x61, 0xb2, 0x88, 0x65, + 0x2b, 0xb8, 0x4d, 0xf2, 0xf2, 0x32, 0x50, 0x53, 0x8b, 0x0d, 0xc6, 0x58, + 0xac, 0xd8, 0xe4, 0x8d, 0x38, 0x9e, 0x61, 0xeb, 0x6b, 0xd2, 0xd6, 0x50, + 0x8d, 0xfa, 0x93, 0x47, 0x4e, 0x6e, 0x2b, 0xd3, 0xb9, 0xdc, 0xb9, 0xb5, + 0x86, 0x46, 0xcb, 0xda, 0xd9, 0xd8, 0xd5, 0x99, 0x7a, 0x7c, 0x73, 0xee, + 0xc1, 0x52, 0x8e, 0xc5, 0xca, 0x28, 0x1d, 0x15, 0x94, 0x06, 0xa0, 0xa5, + 0x01, 0xf3, 0xbd, 0x67, 0x3f, 0x3d, 0x46, 0x63, 0xc5, 0xba, 0xd5, 0x12, + 0xde, 0xb4, 0xc5, 0x86, 0xfe, 0x97, 0x6b, 0x70, 0xfe, 0xa4, 0x6a, 0x25, + 0x63, 0x8e, 0xcf, 0xa4, 0x13, 0x1c, 0x2b, 0xf7, 0xf4, 0xc9, 0x79, 0x8e, + 0x07, 0xa3, 0x25, 0x9f, 0xcf, 0x33, 0x65, 0x49, 0x84, 0xad, 0x7f, 0x90, + 0x44, 0x85, 0xd8, 0xa7, 0x73, 0x53, 0x56, 0x73, 0xca, 0x15, 0x39, 0x99, + 0x5f, 0x39, 0xfd +}; + +static void test_decodeOCSPResponseInfo(DWORD dwEncoding) +{ + OCSP_RESPONSE_INFO *info; + DWORD size; + BOOL ret; + + ret = pCryptDecodeObjectEx(dwEncoding, OCSP_RESPONSE, ocsp_response, sizeof(ocsp_response), + CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + ok(ret, "got %08lx\n", GetLastError()); + ok(info->dwStatus == OCSP_UNAUTHORIZED_RESPONSE, "got %lu\n", info->dwStatus); + ok(info->pszObjId == NULL, "got %s\n", wine_dbgstr_a(info->pszObjId)); + ok(!info->Value.cbData, "got %lu\n", info->Value.cbData); + ok(info->Value.pbData == NULL, "got %p\n", info->Value.pbData); + LocalFree(info); + + ret = pCryptDecodeObjectEx(dwEncoding, OCSP_RESPONSE, ocsp_response2, sizeof(ocsp_response2), + CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + ok(ret, "got %08lx\n", GetLastError()); + ok(info->dwStatus == OCSP_SUCCESSFUL_RESPONSE, "got %lu\n", info->dwStatus); + ok(!strcmp(info->pszObjId, szOID_PKIX_OCSP_BASIC_SIGNED_RESPONSE), "got %s\n", wine_dbgstr_a(info->pszObjId)); + ok(info->Value.cbData == 441, "got %lu\n", info->Value.cbData); + ok(info->Value.pbData != NULL, "got %p\n", info->Value.pbData); + LocalFree(info); +} + START_TEST(encode) { static const DWORD encodings[] = { X509_ASN_ENCODING, PKCS_7_ASN_ENCODING, @@ -8854,6 +8926,7 @@ START_TEST(encode) test_decodeCertPolicyConstraints(encodings[i]); test_decodeRsaPrivateKey(encodings[i]); test_encodeOCSPRequestInfo(encodings[i]); + test_decodeOCSPResponseInfo(encodings[i]); } testPortPublicKeyInfo(); } -- 2.30.2

1 0

[PATCH 2/3] crypt32: Add partial support for encoding signed OCSP requests.
by Hans Leidekker 10 Mar '22

10 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/encode.c | 30 ++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 24 +++++++++++++++++++++++- 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 3391e61679c..8086ad2fc0a 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -4664,6 +4664,33 @@ static BOOL WINAPI CRYPT_AsnEncodeOCSPRequest(DWORD dwCertEncodingType, return ret; } +static BOOL WINAPI CRYPT_AsnEncodeOCSPSignedRequest(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret; + + __TRY + { + const OCSP_SIGNED_REQUEST_INFO *info = pvStructInfo; + struct AsnEncodeSequenceItem items[] = { + { &info->ToBeSigned, CRYPT_CopyEncodedBlob, 0 }, + }; + + if (info->pOptionalSignatureInfo) FIXME("pOptionalSignatureInfo not supported\n"); + + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, + ARRAY_SIZE(items), dwFlags, pEncodePara, pbEncoded, pcbEncoded); + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, LPCSTR lpszStructType) { @@ -4807,6 +4834,9 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, case LOWORD(OCSP_REQUEST): encodeFunc = CRYPT_AsnEncodeOCSPRequest; break; + case LOWORD(OCSP_SIGNED_REQUEST): + encodeFunc = CRYPT_AsnEncodeOCSPSignedRequest; + break; default: FIXME("Unimplemented encoder for lpszStructType OID %d\n", LOWORD(lpszStructType)); } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 747b4a7d18f..c47fd823673 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -8667,6 +8667,14 @@ static void test_encodeOCSPRequestInfo(DWORD dwEncoding) 0x0c, 0x0b, 0x4e, 0xc0, 0x09, 0x8a, 0xab, 0xd8, 0x04, 0x14, 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4, 0x02, 0x10, 0xb1, 0xc1, 0x87, 0x54, 0x54, 0xac, 0x1e, 0x55, 0x40, 0xfb, 0xef, 0xd9, 0x6d, 0x8f, 0x49, 0x08}; + static const BYTE expected4[] = + {0x30, 0x6a, 0x30, 0x68, 0xa1, 0x17, 0x82, 0x15, 0x2a, 0x2e, 0x63, 0x6d, 0x2e, 0x73, 0x74, 0x65, + 0x61, 0x6d, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x65, 0x64, 0x2e, 0x63, 0x6f, 0x6d, 0x30, 0x4d, 0x30, + 0x4b, 0x30, 0x49, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14, + 0xe4, 0xe3, 0x95, 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, 0x1f, 0xf0, 0x98, 0x0c, 0x0b, 0x4e, 0xc0, + 0x09, 0x8a, 0xab, 0xd8, 0x04, 0x14, 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, + 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4, 0x02, 0x10, 0xb1, 0xc1, 0x87, 0x54, + 0x54, 0xac, 0x1e, 0x55, 0x40, 0xfb, 0xef, 0xd9, 0x6d, 0x8f, 0x49, 0x08}; static const BYTE issuer_name[] = {0xe4, 0xe3 ,0x95, 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, 0x1f, 0xf0, 0x98, 0x0c, 0x0b, 0x4e, 0xc0, 0x09, 0x8a, 0xab, 0xd8}; @@ -8678,8 +8686,9 @@ static void test_encodeOCSPRequestInfo(DWORD dwEncoding) OCSP_REQUEST_ENTRY entry[2]; CERT_ALT_NAME_ENTRY name; OCSP_REQUEST_INFO info; + OCSP_SIGNED_REQUEST_INFO info_signed; DWORD size; - BYTE *buf; + BYTE *buf, *buf2; BOOL ret; memset(&entry, 0, sizeof(entry)); @@ -8707,7 +8716,20 @@ static void test_encodeOCSPRequestInfo(DWORD dwEncoding) ok(ret, "got %08lx\n", GetLastError()); ok(size == sizeof(expected), "got %lu\n", size); ok(!memcmp(buf, expected, sizeof(expected)), "unexpected value\n"); + + /* wrapped in OCSP_SIGNED_REQUEST_INFO */ + info_signed.ToBeSigned.cbData = size; + info_signed.ToBeSigned.pbData = buf; + info_signed.pOptionalSignatureInfo = NULL; + size = 0; + SetLastError(0xdeadbeef); + ret = pCryptEncodeObjectEx(dwEncoding, OCSP_SIGNED_REQUEST, &info_signed, CRYPT_ENCODE_ALLOC_FLAG, NULL, + &buf2, &size); + ok(ret, "got %08lx\n", GetLastError()); + ok(size == sizeof(expected4), "got %lu\n", size); + ok(!memcmp(buf2, expected4, sizeof(expected4)), "unexpected value\n"); LocalFree(buf); + LocalFree(buf2); /* two entries */ entry[1].CertId.HashAlgorithm.pszObjId = (char *)szOID_OIWSEC_sha1; -- 2.30.2

1 0

[PATCH 1/3] crypt32: Requestor name is optional in OCSP request.
by Hans Leidekker 10 Mar '22

10 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/encode.c | 21 ++++++++++++--------- dlls/crypt32/tests/encode.c | 21 +++++++++++++++++++++ 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index a506f197be1..3391e61679c 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -4632,18 +4632,21 @@ static BOOL WINAPI CRYPT_AsnEncodeOCSPRequest(DWORD dwCertEncodingType, { struct AsnConstructedItem name; struct AsnEncodeSequenceItem items[2]; - DWORD count = 1; - - name.tag = 1; - name.pvStructInfo = info->pRequestorName; - name.encodeFunc = CRYPT_AsnEncodeAltNameEntry; - items[0].pvStructInfo = &name; - items[0].encodeFunc = CRYPT_AsnEncodeConstructed; + DWORD count = 0; + if (info->pRequestorName) + { + name.tag = 1; + name.pvStructInfo = info->pRequestorName; + name.encodeFunc = CRYPT_AsnEncodeAltNameEntry; + items[count].pvStructInfo = &name; + items[count].encodeFunc = CRYPT_AsnEncodeConstructed; + count++; + } if (info->cRequestEntry) { - items[1].pvStructInfo = &info->cRequestEntry; - items[1].encodeFunc = CRYPT_AsnEncodeOCSPRequestEntries; + items[count].pvStructInfo = &info->cRequestEntry; + items[count].encodeFunc = CRYPT_AsnEncodeOCSPRequestEntries; count++; } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 9d12223c54c..747b4a7d18f 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -8656,6 +8656,17 @@ static void test_encodeOCSPRequestInfo(DWORD dwEncoding) 0xd8, 0x04, 0x14, 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4, 0x02, 0x10, 0xb1, 0xc1, 0x87, 0x54, 0x54, 0xac, 0x1e, 0x55, 0x40, 0xfb, 0xef, 0xd9, 0x6d, 0x8f, 0x49, 0x08}; + static const BYTE expected3[] = + {0x30, 0x81, 0x9d, 0x30, 0x81, 0x9a, 0x30, 0x4b, 0x30, 0x49, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, + 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14, 0xe4, 0xe3, 0x95, 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, + 0x1f, 0xf0, 0x98, 0x0c, 0x0b, 0x4e, 0xc0, 0x09, 0x8a, 0xab, 0xd8, 0x04, 0x14, 0xb7, 0x6b, 0xa2, + 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, + 0xf4, 0x02, 0x10, 0xb1, 0xc1, 0x87, 0x54, 0x54, 0xac, 0x1e, 0x55, 0x40, 0xfb, 0xef, 0xd9, 0x6d, + 0x8f, 0x49, 0x08, 0x30, 0x4b, 0x30, 0x49, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, + 0x05, 0x00, 0x04, 0x14, 0xe4, 0xe3, 0x95, 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, 0x1f, 0xf0, 0x98, + 0x0c, 0x0b, 0x4e, 0xc0, 0x09, 0x8a, 0xab, 0xd8, 0x04, 0x14, 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, + 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4, 0x02, 0x10, + 0xb1, 0xc1, 0x87, 0x54, 0x54, 0xac, 0x1e, 0x55, 0x40, 0xfb, 0xef, 0xd9, 0x6d, 0x8f, 0x49, 0x08}; static const BYTE issuer_name[] = {0xe4, 0xe3 ,0x95, 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, 0x1f, 0xf0, 0x98, 0x0c, 0x0b, 0x4e, 0xc0, 0x09, 0x8a, 0xab, 0xd8}; @@ -8715,6 +8726,16 @@ static void test_encodeOCSPRequestInfo(DWORD dwEncoding) ok(size == sizeof(expected2), "got %lu\n", size); ok(!memcmp(buf, expected2, sizeof(expected2)), "unexpected value\n"); LocalFree(buf); + + /* requestor name not set */ + info.pRequestorName = NULL; + size = 0; + SetLastError(0xdeadbeef); + ret = pCryptEncodeObjectEx(dwEncoding, OCSP_REQUEST, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(ret, "got %08lx\n", GetLastError()); + ok(size == sizeof(expected3), "got %lu\n", size); + ok(!memcmp(buf, expected3, sizeof(expected3)), "unexpected value\n"); + LocalFree(buf); } START_TEST(encode) -- 2.30.2

1 0

[PATCH 4/6] combase: Start surrogate local server when required.
by Dmitry Timoshkov 10 Mar '22

10 Mar '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20296 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/combase/rpc.c | 49 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index 0a86183030a..40f900175dd 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -522,6 +522,52 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) return S_OK; } +static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process) +{ + static const WCHAR processidW[] = L" /PROCESSID:"; + HKEY key; + HRESULT hr; + WCHAR command[MAX_PATH + ARRAY_SIZE(processidW) + CHARS_IN_GUID]; + DWORD size; + STARTUPINFOW sinfo; + PROCESS_INFORMATION pinfo; + LONG ret; + + TRACE("Attempting to start surrogate server for %s\n", debugstr_guid(rclsid)); + + hr = open_appidkey_from_clsid(rclsid, KEY_READ, &key); + if (FAILED(hr)) + return hr; + + size = (MAX_PATH + 1) * sizeof(WCHAR); + ret = RegQueryValueExW(key, L"DllSurrogate", NULL, NULL, (LPBYTE)command, &size); + RegCloseKey(key); + if (ret || !size || !command[0]) + { + TRACE("No value for DllSurrogate key\n"); + wcscpy(command, L"dllhost.exe"); + } + + /* Surrogate EXE servers are started with the /PROCESSID:{GUID} switch. */ + wcscat(command, processidW); + StringFromGUID2(rclsid, command + wcslen(command), CHARS_IN_GUID); + + memset(&sinfo, 0, sizeof(sinfo)); + sinfo.cb = sizeof(sinfo); + + TRACE("Activating surrogate local server %s\n", debugstr_w(command)); + + if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo)) + { + WARN("failed to run surrogate local server %s\n", debugstr_w(command)); + return HRESULT_FROM_WIN32(GetLastError()); + } + *process = pinfo.hProcess; + CloseHandle(pinfo.hThread); + + return S_OK; +} + HRESULT rpc_get_local_class_object(REFCLSID rclsid, REFIID riid, void **obj) { PMInterfacePointer objref = NULL; @@ -546,7 +592,8 @@ HRESULT rpc_get_local_class_object(REFCLSID rclsid, REFIID riid, void **obj) if (tries == 1) { - if ((hr = create_local_service(rclsid)) && (hr = create_server(rclsid, &process)) ) + if ((hr = create_local_service(rclsid)) && (hr = create_server(rclsid, &process)) && + (hr = create_surrogate_server(rclsid, &process)) ) return hr; } -- 2.35.1

2 1

[PATCH 3/6] dllhost: Periodically call CoFreeUnusedLibraries().
by Dmitry Timoshkov 10 Mar '22

10 Mar '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/dllhost/dllhost.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index 241b79d13a0..dc89c978510 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -352,7 +352,8 @@ int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int sho goto cleanup; } - WaitForSingleObject(surrogate.event, INFINITE); + while (WaitForSingleObject(surrogate.event, 30000) != WAIT_OBJECT_0) + CoFreeUnusedLibraries(); } cleanup: -- 2.35.1

2 1

[PATCH 2/6] dllhost: Implement IMarshal::MarshalInterface().
by Dmitry Timoshkov 10 Mar '22

10 Mar '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/dllhost/dllhost.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index bfe1d4cbbd6..241b79d13a0 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -147,9 +147,11 @@ static ULONG WINAPI marshal_Release(IMarshal *iface) static HRESULT WINAPI marshal_GetUnmarshalClass(IMarshal *iface, REFIID iid, void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *clsid) { - FIXME("(%p,%s,%p,%08lx,%p,%08lx,%p): stub\n", iface, wine_dbgstr_guid(iid), pv, + TRACE("(%p,%s,%p,%08lx,%p,%08lx,%p)\n", iface, wine_dbgstr_guid(iid), pv, dwDestContext, pvDestContext, mshlflags, clsid); - return E_NOTIMPL; + + *clsid = CLSID_StdMarshal; + return S_OK; } static HRESULT WINAPI marshal_GetMarshalSizeMax(IMarshal *iface, REFIID iid, void *pv, @@ -163,8 +165,19 @@ static HRESULT WINAPI marshal_GetMarshalSizeMax(IMarshal *iface, REFIID iid, voi static HRESULT WINAPI marshal_MarshalInterface(IMarshal *iface, IStream *stream, REFIID iid, void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags) { - FIXME("(%p,%s,%p,%08lx,%p,%08lx): stub\n", stream, wine_dbgstr_guid(iid), pv, dwDestContext, pvDestContext, mshlflags); - return E_NOTIMPL; + struct factory *factory = impl_from_IMarshal(iface); + IUnknown *object; + HRESULT hr; + + TRACE("(%p,%s,%p,%08lx,%p,%08lx)\n", stream, wine_dbgstr_guid(iid), pv, dwDestContext, pvDestContext, mshlflags); + + hr = CoGetClassObject(&factory->clsid, CLSCTX_INPROC_SERVER, NULL, iid, (void **)&object); + if (hr == S_OK) + { + hr = CoMarshalInterface(stream, iid, object, dwDestContext, pvDestContext, mshlflags); + IUnknown_Release(object); + } + return hr; } static HRESULT WINAPI marshal_UnmarshalInterface(IMarshal *iface, IStream *stream, -- 2.35.1

2 1

[PATCH 1/6] dllhost: Implement ISurrogate::FreeSurrogate().
by Dmitry Timoshkov 10 Mar '22

10 Mar '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/dllhost/dllhost.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index 691f233906a..bfe1d4cbbd6 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -204,6 +204,7 @@ struct surrogate ISurrogate ISurrogate_iface; IClassFactory *factory; DWORD cookie; + HANDLE event; LONG ref; }; @@ -267,15 +268,35 @@ static HRESULT WINAPI surrogate_LoadDllServer(ISurrogate *iface, const CLSID *cl if (hr != S_OK) IClassFactory_Release(&factory->IClassFactory_iface); else + { surrogate->factory = &factory->IClassFactory_iface; + surrogate->event = CreateEventW(NULL, FALSE, FALSE, NULL); + } return hr; } static HRESULT WINAPI surrogate_FreeSurrogate(ISurrogate *iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + struct surrogate *surrogate = impl_from_ISurrogate(iface); + + TRACE("(%p)\n", iface); + + if (surrogate->cookie) + { + CoRevokeClassObject(surrogate->cookie); + surrogate->cookie = 0; + } + + if (surrogate->factory) + { + IClassFactory_Release(surrogate->factory); + surrogate->factory = NULL; + } + + SetEvent(surrogate->event); + + return S_OK; } static const ISurrogateVtbl Surrogate_Vtbl = @@ -301,6 +322,7 @@ int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int sho surrogate.ISurrogate_iface.lpVtbl = &Surrogate_Vtbl; surrogate.factory = NULL; surrogate.cookie = 0; + surrogate.event = NULL; surrogate.ref = 1; CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -317,8 +339,7 @@ int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int sho goto cleanup; } - /* FIXME: wait for FreeSurrogate being called */ - Sleep(INFINITE); + WaitForSingleObject(surrogate.event, INFINITE); } cleanup: -- 2.35.1

2 1

[PATCH v2 1/6] windows.gaming.input: Implement IRawGameControllerStatics_get_RawGameControllers.
by Rémi Bernon 10 Mar '22

10 Mar '22

It is important to add RawGameController instances to the vector in the initialization callback, because some games check the vector, as well as the Gamepad class vector in the OnGameControllerAdded callback. This also removes the OnGameControllerAdded failure case, to avoid leaking controllers that were already added to the controller vector, and instead rely on the OnGameControllerRemoved call to do the cleanup. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: * Initialize controller state in GetReading calls, * Fix IWineGameControllerProvider query failure support in the class destruction. dlls/dinput/tests/joystick8.c | 9 +-- dlls/windows.gaming.input/controller.c | 82 +++++++++++++++++++++----- dlls/windows.gaming.input/manager.c | 6 +- 3 files changed, 70 insertions(+), 27 deletions(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 2d801aacda2..e74e76482f9 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -3340,17 +3340,10 @@ static void test_windows_gaming_input(void) ok( hr == S_OK, "get_RawGameControllers returned %#lx\n", hr ); hr = IVectorView_RawGameController_get_Size( controllers_view, &size ); ok( hr == S_OK, "get_Size returned %#lx\n", hr ); - todo_wine ok( size == 1, "got size %u\n", size ); hr = IVectorView_RawGameController_GetAt( controllers_view, 0, &raw_controller ); - todo_wine ok( hr == S_OK, "GetAt returned %#lx\n", hr ); IVectorView_RawGameController_Release( controllers_view ); - if (hr != S_OK) - { - IRawGameControllerStatics_Release( controller_statics ); - goto done; - } /* HID gamepads aren't exposed as WGI gamepads on Windows */ @@ -3372,6 +3365,7 @@ static void test_windows_gaming_input(void) check_interface( raw_controller, &IID_IInspectable, TRUE ); check_interface( raw_controller, &IID_IAgileObject, TRUE ); check_interface( raw_controller, &IID_IRawGameController, TRUE ); + todo_wine check_interface( raw_controller, &IID_IRawGameController2, TRUE ); check_interface( raw_controller, &IID_IGameController, TRUE ); check_interface( raw_controller, &IID_IGamepad, FALSE ); @@ -3384,6 +3378,7 @@ static void test_windows_gaming_input(void) check_interface( game_controller, &IID_IInspectable, TRUE ); check_interface( game_controller, &IID_IAgileObject, TRUE ); check_interface( game_controller, &IID_IRawGameController, TRUE ); + todo_wine check_interface( game_controller, &IID_IRawGameController2, TRUE ); check_interface( game_controller, &IID_IGameController, TRUE ); check_interface( game_controller, &IID_IGamepad, FALSE ); diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c index 9fb1b1a69a2..51ede5a0e47 100644 --- a/dlls/windows.gaming.input/controller.c +++ b/dlls/windows.gaming.input/controller.c @@ -24,6 +24,36 @@ WINE_DEFAULT_DEBUG_CHANNEL(input); +static CRITICAL_SECTION controller_cs; +static CRITICAL_SECTION_DEBUG controller_cs_debug = +{ + 0, 0, &controller_cs, + { &controller_cs_debug.ProcessLocksList, &controller_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": controller_cs") } +}; +static CRITICAL_SECTION controller_cs = { &controller_cs_debug, -1, 0, 0, 0, 0 }; + +static IVector_RawGameController *controllers; + +static HRESULT init_controllers(void) +{ + static const struct vector_iids iids = + { + .vector = &IID_IVector_RawGameController, + .view = &IID_IVectorView_RawGameController, + .iterable = &IID_IIterable_RawGameController, + .iterator = &IID_IIterator_RawGameController, + }; + HRESULT hr; + + EnterCriticalSection( &controller_cs ); + if (controllers) hr = S_OK; + else hr = vector_create( &iids, (void **)&controllers ); + LeaveCriticalSection( &controller_cs ); + + return hr; +} + struct controller { IGameControllerImpl IGameControllerImpl_iface; @@ -118,13 +148,19 @@ static HRESULT WINAPI controller_Initialize( IGameControllerImpl *iface, IGameCo IGameControllerProvider *provider ) { struct controller *impl = impl_from_IGameControllerImpl( iface ); + HRESULT hr; TRACE( "iface %p, outer %p, provider %p.\n", iface, outer, provider ); impl->IGameController_outer = outer; IGameControllerProvider_AddRef( (impl->provider = provider) ); - return S_OK; + EnterCriticalSection( &controller_cs ); + if (SUCCEEDED(hr = init_controllers())) + hr = IVector_RawGameController_Append( controllers, &impl->IRawGameController_iface ); + LeaveCriticalSection( &controller_cs ); + + return hr; } static const struct IGameControllerImplVtbl controller_vtbl = @@ -381,23 +417,14 @@ static HRESULT WINAPI statics_remove_RawGameControllerRemoved( IRawGameControlle static HRESULT WINAPI statics_get_RawGameControllers( IRawGameControllerStatics *iface, IVectorView_RawGameController **value ) { - static const struct vector_iids iids = - { - .vector = &IID_IVector_RawGameController, - .view = &IID_IVectorView_RawGameController, - .iterable = &IID_IIterable_RawGameController, - .iterator = &IID_IIterator_RawGameController, - }; - IVector_RawGameController *controllers; HRESULT hr; TRACE( "iface %p, value %p.\n", iface, value ); - if (SUCCEEDED(hr = vector_create( &iids, (void **)&controllers ))) - { + EnterCriticalSection( &controller_cs ); + if (SUCCEEDED(hr = init_controllers())) hr = IVector_RawGameController_GetView( controllers, value ); - IVector_RawGameController_Release( controllers ); - } + LeaveCriticalSection( &controller_cs ); return hr; } @@ -468,8 +495,33 @@ static HRESULT WINAPI controller_factory_OnGameControllerAdded( ICustomGameContr static HRESULT WINAPI controller_factory_OnGameControllerRemoved( ICustomGameControllerFactory *iface, IGameController *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + IRawGameController *controller; + BOOLEAN found; + UINT32 index; + HRESULT hr; + + TRACE( "iface %p, value %p.\n", iface, value ); + + if (FAILED(hr = IGameController_QueryInterface( value, &IID_IRawGameController, (void **)&controller ))) + return hr; + + EnterCriticalSection( &controller_cs ); + if (SUCCEEDED(hr = init_controllers())) + { + if (FAILED(hr = IVector_RawGameController_IndexOf( controllers, controller, &index, &found )) || !found) + WARN( "Could not find controller %p, hr %#lx!\n", controller, hr ); + else + hr = IVector_RawGameController_RemoveAt( controllers, index ); + } + LeaveCriticalSection( &controller_cs ); + + if (FAILED(hr)) + WARN( "Failed to remove controller %p, hr %#lx!\n", controller, hr ); + else if (found) + TRACE( "Removed controller %p.\n", controller ); + IRawGameController_Release( controller ); + + return S_OK; } static const struct ICustomGameControllerFactoryVtbl controller_factory_vtbl = diff --git a/dlls/windows.gaming.input/manager.c b/dlls/windows.gaming.input/manager.c index 489588a68ab..6a8963a1fc4 100644 --- a/dlls/windows.gaming.input/manager.c +++ b/dlls/windows.gaming.input/manager.c @@ -502,11 +502,7 @@ void manager_on_provider_created( IGameControllerProvider *provider ) controller = LIST_ENTRY( entry, struct controller, entry ); hr = ICustomGameControllerFactory_OnGameControllerAdded( controller->factory, &controller->IGameController_iface ); - if (FAILED(hr)) - { - list_remove( &controller->entry ); - IGameController_Release( &controller->IGameController_iface ); - } + if (FAILED(hr)) WARN( "OnGameControllerAdded failed, hr %#lx\n", hr ); if (next == &controller_list) break; } -- 2.35.1

2 6

[PATCH] dlls/wmp/tests: enable compilation with long types
by Eric Pouech 10 Mar '22

10 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wmp/tests/Makefile.in | 1 dlls/wmp/tests/media.c | 168 +++++++++++++++++++++---------------------- dlls/wmp/tests/oleobj.c | 172 ++++++++++++++++++++++---------------------- 3 files changed, 170 insertions(+), 171 deletions(-) diff --git a/dlls/wmp/tests/Makefile.in b/dlls/wmp/tests/Makefile.in index 4b97242f3aa..089d9e7f3e1 100644 --- a/dlls/wmp/tests/Makefile.in +++ b/dlls/wmp/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wmp.dll IMPORTS = ole32 oleaut32 user32 gdi32 diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index fa6cb6490f1..f78e741a189 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -36,7 +36,7 @@ #define CHECK_EXPECT(kind, index) \ do { \ - ok(expect_ ##kind & (1 << index), "unexpected event for " #kind ", index:%d\n", index); \ + ok(expect_ ##kind & (1 << index), "unexpected event for " #kind ", index:%ld\n", index); \ called_ ## kind |= (1 << index); \ }while(0) @@ -81,7 +81,7 @@ static inline WCHAR *load_resource(const WCHAR *name) lstrcatW(pathW, name); file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); - ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", wine_dbgstr_w(pathW), + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %ld\n", wine_dbgstr_w(pathW), GetLastError()); res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); @@ -146,7 +146,7 @@ static HRESULT WINAPI WMPOCXEvents_Invoke(IDispatch *iface, DISPID dispIdMember, case DISPID_WMPCOREEVENT_OPENSTATECHANGE: CHECK_EXPECT(OPENSTATE, V_UI4(pDispParams->rgvarg)); if (winetest_debug > 1) - trace("DISPID_WMPCOREEVENT_OPENSTATECHANGE, %d\n", V_UI4(pDispParams->rgvarg)); + trace("DISPID_WMPCOREEVENT_OPENSTATECHANGE, %ld\n", V_UI4(pDispParams->rgvarg)); break; case DISPID_WMPCOREEVENT_PLAYSTATECHANGE: CHECK_EXPECT(PLAYSTATE, V_UI4(pDispParams->rgvarg)); @@ -156,7 +156,7 @@ static HRESULT WINAPI WMPOCXEvents_Invoke(IDispatch *iface, DISPID dispIdMember, SetEvent(completed_event); } if (winetest_debug > 1) - trace("DISPID_WMPCOREEVENT_PLAYSTATECHANGE, %d\n", V_UI4(pDispParams->rgvarg)); + trace("DISPID_WMPCOREEVENT_PLAYSTATECHANGE, %ld\n", V_UI4(pDispParams->rgvarg)); break; case DISPID_WMPCOREEVENT_MEDIACHANGE: if (winetest_debug > 1) @@ -172,7 +172,7 @@ static HRESULT WINAPI WMPOCXEvents_Invoke(IDispatch *iface, DISPID dispIdMember, break; default: if (winetest_debug > 1) - trace("event: %d\n", dispIdMember); + trace("event: %ld\n", dispIdMember); break; } @@ -227,22 +227,22 @@ static void test_completion_event(void) win_skip("CLSID_WindowsMediaPlayer not registered\n"); return; } - ok(hres == S_OK, "Could not create CLSID_WindowsMediaPlayer instance: %08x\n", hres); + ok(hres == S_OK, "Could not create CLSID_WindowsMediaPlayer instance: %08lx\n", hres); hres = IOleObject_QueryInterface(oleobj, &IID_IConnectionPointContainer, (void**)&container); - ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08lx\n", hres); if(FAILED(hres)) return; hres = IConnectionPointContainer_FindConnectionPoint(container, &IID__WMPOCXEvents, &point); IConnectionPointContainer_Release(container); - ok(hres == S_OK, "FindConnectionPoint failed: %08x\n", hres); + ok(hres == S_OK, "FindConnectionPoint failed: %08lx\n", hres); hres = IConnectionPoint_Advise(point, (IUnknown*)&WMPOCXEvents, &dw); - ok(hres == S_OK, "Advise failed: %08x\n", hres); + ok(hres == S_OK, "Advise failed: %08lx\n", hres); hres = IOleObject_QueryInterface(oleobj, &IID_IWMPPlayer4, (void**)&player4); - ok(hres == S_OK, "Could not get IWMPPlayer4 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IWMPPlayer4 iface: %08lx\n", hres); filename = SysAllocString(load_resource(mp3file1s)); @@ -260,7 +260,7 @@ static void test_completion_event(void) SET_EXPECT(OPENSTATE, wmposMediaChanging); SET_EXPECT(PLAYSTATE, wmppsReady); hres = IWMPPlayer4_put_URL(player4, filename); - ok(hres == S_OK, "IWMPPlayer4_put_URL failed: %08x\n", hres); + ok(hres == S_OK, "IWMPPlayer4_put_URL failed: %08lx\n", hres); res = pump_messages(3000, 1, &completed_event); ok(res == WAIT_OBJECT_0, "Timed out while waiting for media to complete\n"); @@ -281,7 +281,7 @@ static void test_completion_event(void) CLEAR_CALLED(OPENSTATE, wmposMediaOpening); hres = IConnectionPoint_Unadvise(point, dw); - ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + ok(hres == S_OK, "Unadvise failed: %08lx\n", hres); IConnectionPoint_Release(point); IWMPPlayer4_Release(player4); @@ -315,47 +315,47 @@ static BOOL test_wmp(void) win_skip("CLSID_WindowsMediaPlayer not registered\n"); return FALSE; } - ok(hres == S_OK, "Could not create CLSID_WindowsMediaPlayer instance: %08x\n", hres); + ok(hres == S_OK, "Could not create CLSID_WindowsMediaPlayer instance: %08lx\n", hres); hres = IOleObject_QueryInterface(oleobj, &IID_IConnectionPointContainer, (void**)&container); - ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08lx\n", hres); hres = IConnectionPointContainer_FindConnectionPoint(container, &IID__WMPOCXEvents, &point); IConnectionPointContainer_Release(container); - ok(hres == S_OK, "FindConnectionPoint failed: %08x\n", hres); + ok(hres == S_OK, "FindConnectionPoint failed: %08lx\n", hres); hres = IConnectionPoint_Advise(point, (IUnknown*)&WMPOCXEvents, &dw); - ok(hres == S_OK, "Advise failed: %08x\n", hres); + ok(hres == S_OK, "Advise failed: %08lx\n", hres); hres = IOleObject_QueryInterface(oleobj, &IID_IWMPPlayer4, (void**)&player4); - ok(hres == S_OK, "Could not get IWMPPlayer4 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IWMPPlayer4 iface: %08lx\n", hres); settings = NULL; hres = IWMPPlayer4_get_settings(player4, &settings); - ok(hres == S_OK, "get_settings failed: %08x\n", hres); + ok(hres == S_OK, "get_settings failed: %08lx\n", hres); ok(settings != NULL, "settings = NULL\n"); hres = IWMPSettings_put_autoStart(settings, VARIANT_FALSE); - ok(hres == S_OK, "Could not put autoStart in IWMPSettings: %08x\n", hres); + ok(hres == S_OK, "Could not put autoStart in IWMPSettings: %08lx\n", hres); controls = NULL; hres = IWMPPlayer4_get_controls(player4, &controls); - ok(hres == S_OK, "get_controls failed: %08x\n", hres); + ok(hres == S_OK, "get_controls failed: %08lx\n", hres); ok(controls != NULL, "controls = NULL\n"); bstrcurrentPosition = SysAllocString(L"currentPosition"); hres = IWMPControls_get_isAvailable(controls, bstrcurrentPosition, &vbool); - ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08x\n", hres); + ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08lx\n", hres); ok(vbool == VARIANT_FALSE, "unexpected value\n"); hres = IWMPControls_play(controls); - ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_play is available: %08x\n", hres); + ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_play is available: %08lx\n", hres); hres = IWMPSettings_put_volume(settings, 36); - ok(hres == S_OK, "IWMPSettings_put_volume failed: %08x\n", hres); + ok(hres == S_OK, "IWMPSettings_put_volume failed: %08lx\n", hres); hres = IWMPSettings_get_volume(settings, &progress); - ok(hres == S_OK, "IWMPSettings_get_volume failed: %08x\n", hres); - ok(progress == 36, "unexpected value: %d\n", progress); + ok(hres == S_OK, "IWMPSettings_get_volume failed: %08lx\n", hres); + ok(progress == 36, "unexpected value: %ld\n", progress); filename = SysAllocString(load_resource(mp3file)); @@ -365,7 +365,7 @@ static BOOL test_wmp(void) SET_EXPECT(PLAYSTATE, wmppsTransitioning); SET_EXPECT(PLAYSTATE, wmppsReady); hres = IWMPPlayer4_put_URL(player4, filename); - ok(hres == S_OK, "IWMPPlayer4_put_URL failed: %08x\n", hres); + ok(hres == S_OK, "IWMPPlayer4_put_URL failed: %08lx\n", hres); CHECK_CALLED(OPENSTATE, wmposPlaylistChanging); CHECK_CALLED(OPENSTATE, wmposPlaylistChanged); CHECK_CALLED(OPENSTATE, wmposPlaylistOpenNoMedia); @@ -379,7 +379,7 @@ static BOOL test_wmp(void) /* MediaOpening happens only on xp, 2003 */ SET_EXPECT(OPENSTATE, wmposMediaOpening); hres = IWMPControls_play(controls); - ok(hres == S_OK, "IWMPControls_play failed: %08x\n", hres); + ok(hres == S_OK, "IWMPControls_play failed: %08lx\n", hres); res = pump_messages(1000, 1, &playing_event); ok(res == WAIT_OBJECT_0 || broken(res == WAIT_TIMEOUT), "Timed out while waiting for media to become ready\n"); if (res == WAIT_TIMEOUT) { @@ -397,55 +397,55 @@ static BOOL test_wmp(void) CLEAR_CALLED(OPENSTATE, wmposMediaOpening); hres = IWMPControls_get_isAvailable(controls, bstrcurrentPosition, &vbool); - ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08x\n", hres); + ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08lx\n", hres); ok(vbool == VARIANT_TRUE, "unexpected value\n"); duration = 0.0; hres = IWMPControls_get_currentPosition(controls, &duration); - ok(hres == S_OK, "IWMPControls_get_currentPosition failed: %08x\n", hres); + ok(hres == S_OK, "IWMPControls_get_currentPosition failed: %08lx\n", hres); ok((int)duration == 0, "unexpected value %f\n", duration); duration = 1.1; hres = IWMPControls_put_currentPosition(controls, duration); - ok(hres == S_OK, "IWMPControls_put_currentPosition failed: %08x\n", hres); + ok(hres == S_OK, "IWMPControls_put_currentPosition failed: %08lx\n", hres); duration = 0.0; hres = IWMPControls_get_currentPosition(controls, &duration); - ok(hres == S_OK, "IWMPControls_get_currentPosition failed: %08x\n", hres); + ok(hres == S_OK, "IWMPControls_get_currentPosition failed: %08lx\n", hres); ok(duration >= 1.05 /* save some fp errors */, "unexpected value %f\n", duration); hres = IWMPPlayer4_get_currentMedia(player4, &media); - ok(hres == S_OK, "IWMPPlayer4_get_currentMedia failed: %08x\n", hres); + ok(hres == S_OK, "IWMPPlayer4_get_currentMedia failed: %08lx\n", hres); hres = IWMPMedia_get_duration(media, &duration); - ok(hres == S_OK, "IWMPMedia_get_duration failed: %08x\n", hres); + ok(hres == S_OK, "IWMPMedia_get_duration failed: %08lx\n", hres); ok(floor(duration + 0.5) == 3, "unexpected value: %f\n", duration); IWMPMedia_Release(media); network = NULL; hres = IWMPPlayer4_get_network(player4, &network); - ok(hres == S_OK, "get_network failed: %08x\n", hres); + ok(hres == S_OK, "get_network failed: %08lx\n", hres); ok(network != NULL, "network = NULL\n"); progress = 0; hres = IWMPNetwork_get_bufferingProgress(network, &progress); - ok(hres == S_OK || broken(hres == S_FALSE), "IWMPNetwork_get_bufferingProgress failed: %08x\n", hres); - ok(progress == 100, "unexpected value: %d\n", progress); + ok(hres == S_OK || broken(hres == S_FALSE), "IWMPNetwork_get_bufferingProgress failed: %08lx\n", hres); + ok(progress == 100, "unexpected value: %ld\n", progress); progress = 0; hres = IWMPNetwork_get_downloadProgress(network, &progress); - ok(hres == S_OK, "IWMPNetwork_get_downloadProgress failed: %08x\n", hres); - ok(progress == 100, "unexpected value: %d\n", progress); + ok(hres == S_OK, "IWMPNetwork_get_downloadProgress failed: %08lx\n", hres); + ok(progress == 100, "unexpected value: %ld\n", progress); IWMPNetwork_Release(network); SET_EXPECT(PLAYSTATE, wmppsStopped); /* The following happens on wine only since we close media on stop */ SET_EXPECT(OPENSTATE, wmposPlaylistOpenNoMedia); hres = IWMPControls_stop(controls); - ok(hres == S_OK, "IWMPControls_stop failed: %08x\n", hres); + ok(hres == S_OK, "IWMPControls_stop failed: %08lx\n", hres); CHECK_CALLED(PLAYSTATE, wmppsStopped); todo_wine CHECK_NOT_CALLED(OPENSTATE, wmposPlaylistOpenNoMedia); /* Already Stopped */ hres = IWMPControls_stop(controls); - ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_stop is available: %08x\n", hres); + ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_stop is available: %08lx\n", hres); SET_EXPECT(PLAYSTATE, wmppsPlaying); /* The following happens on wine only since we close media on stop */ @@ -453,7 +453,7 @@ static BOOL test_wmp(void) SET_EXPECT(OPENSTATE, wmposMediaOpen); SET_EXPECT(PLAYSTATE, wmppsTransitioning); hres = IWMPControls_play(controls); - ok(hres == S_OK, "IWMPControls_play failed: %08x\n", hres); + ok(hres == S_OK, "IWMPControls_play failed: %08lx\n", hres); CHECK_CALLED(PLAYSTATE, wmppsPlaying); todo_wine CHECK_NOT_CALLED(OPENSTATE, wmposOpeningUnknownURL); todo_wine CHECK_NOT_CALLED(OPENSTATE, wmposMediaOpen); @@ -461,16 +461,16 @@ static BOOL test_wmp(void) playback_skip: hres = IConnectionPoint_Unadvise(point, dw); - ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + ok(hres == S_OK, "Unadvise failed: %08lx\n", hres); hres = IWMPSettings_get_volume(settings, &progress); - ok(hres == S_OK, "IWMPSettings_get_volume failed: %08x\n", hres); - ok(progress == 36, "unexpected value: %d\n", progress); + ok(hres == S_OK, "IWMPSettings_get_volume failed: %08lx\n", hres); + ok(progress == 36, "unexpected value: %ld\n", progress); hres = IWMPSettings_put_volume(settings, 99); - ok(hres == S_OK, "IWMPSettings_put_volume failed: %08x\n", hres); + ok(hres == S_OK, "IWMPSettings_put_volume failed: %08lx\n", hres); hres = IWMPSettings_get_volume(settings, &progress); - ok(hres == S_OK, "IWMPSettings_get_volume failed: %08x\n", hres); - ok(progress == 99, "unexpected value: %d\n", progress); + ok(hres == S_OK, "IWMPSettings_get_volume failed: %08lx\n", hres); + ok(progress == 99, "unexpected value: %ld\n", progress); IConnectionPoint_Release(point); IWMPSettings_Release(settings); @@ -517,27 +517,27 @@ static void test_media_item(void) win_skip("CLSID_WindowsMediaPlayer is not registered.\n"); return; } - ok(hr == S_OK, "Failed to create media player instance, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create media player instance, hr %#lx.\n", hr); hr = IWMPPlayer4_newMedia(player, NULL, &media); - ok(hr == S_OK, "Failed to create a media item, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create a media item, hr %#lx.\n", hr); hr = IWMPMedia_get_name(media, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IWMPMedia_get_name(media, &str); - ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get item name, hr %#lx.\n", hr); ok(*str == 0, "Unexpected name %s.\n", wine_dbgstr_w(str)); SysFreeString(str); media2 = (void *)0xdeadbeef; hr = IWMPPlayer4_get_currentMedia(player, &media2); - ok(hr == S_FALSE, "Failed to get current media, hr %#x.\n", hr); + ok(hr == S_FALSE, "Failed to get current media, hr %#lx.\n", hr); ok(media2 == NULL, "Unexpected media instance.\n"); hr = IWMPPlayer4_put_currentMedia(player, media); - ok(hr == S_OK, "Failed to set current media, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set current media, hr %#lx.\n", hr); hr = IWMPPlayer4_get_currentMedia(player, &media2); - ok(hr == S_OK, "Failed to get current media, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get current media, hr %#lx.\n", hr); ok(media2 != NULL && media != media2, "Unexpected media instance.\n"); IWMPMedia_Release(media2); @@ -545,38 +545,38 @@ static void test_media_item(void) str = SysAllocStringLen(NULL, 0); hr = IWMPPlayer4_newMedia(player, str, &media); - ok(hr == S_OK, "Failed to create a media item, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create a media item, hr %#lx.\n", hr); SysFreeString(str); hr = IWMPMedia_get_name(media, &str); - ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get item name, hr %#lx.\n", hr); ok(*str == 0, "Unexpected name %s.\n", wine_dbgstr_w(str)); SysFreeString(str); IWMPMedia_Release(media); str = SysAllocString(mp3file); hr = IWMPPlayer4_newMedia(player, str, &media); - ok(hr == S_OK, "Failed to create a media item, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create a media item, hr %#lx.\n", hr); SysFreeString(str); hr = IWMPMedia_get_name(media, &str); - ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get item name, hr %#lx.\n", hr); ok(!lstrcmpW(str, L"test"), "Expected %s, got %s\n", wine_dbgstr_w(L"test"), wine_dbgstr_w(str)); SysFreeString(str); hr = IWMPMedia_put_name(media, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IWMPMedia_get_name(media, &str); - ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get item name, hr %#lx.\n", hr); ok(!lstrcmpW(str, L"test"), "Expected %s, got %s\n", wine_dbgstr_w(L"test"), wine_dbgstr_w(str)); SysFreeString(str); hr = IWMPPlayer4_put_currentMedia(player, media); - ok(hr == S_OK, "Failed to set current media, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set current media, hr %#lx.\n", hr); IWMPMedia_Release(media); hr = IWMPPlayer4_get_currentMedia(player, &media2); - ok(hr == S_OK, "Failed to get current media, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get current media, hr %#lx.\n", hr); ok(media2 != NULL, "Unexpected media instance.\n"); hr = IWMPMedia_get_name(media2, &str); - ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get item name, hr %#lx.\n", hr); ok(!lstrcmpW(str, L"test"), "Expected %s, got %s\n", wine_dbgstr_w(L"test"), wine_dbgstr_w(str)); SysFreeString(str); IWMPMedia_Release(media2); @@ -593,10 +593,10 @@ static void test_media_item(void) str = SysAllocString(pathW); hr = IWMPPlayer4_newMedia(player, str, &media); - ok(hr == S_OK, "Failed to create a media item, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create a media item, hr %#lx.\n", hr); SysFreeString(str); hr = IWMPMedia_get_name(media, &str); - ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get item name, hr %#lx.\n", hr); ok(!lstrcmpW(str, tests[i].expected), "Expected %s, got %s\n", wine_dbgstr_w(tests[i].expected), wine_dbgstr_w(str)); SysFreeString(str); IWMPMedia_Release(media); @@ -617,35 +617,35 @@ static void test_player_url(void) win_skip("CLSID_WindowsMediaPlayer is not registered.\n"); return; } - ok(hr == S_OK, "Failed to create media player instance, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create media player instance, hr %#lx.\n", hr); hr = IWMPPlayer4_get_URL(player, &str); - ok(hr == S_OK, "Failed to get url, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get url, hr %#lx.\n", hr); ok(*str == 0, "Unexpected url %s.\n", wine_dbgstr_w(str)); SysFreeString(str); str2 = SysAllocString(mp3file); hr = IWMPPlayer4_put_URL(player, str2); - ok(hr == S_OK, "Failed to set url, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set url, hr %#lx.\n", hr); hr = IWMPPlayer4_put_URL(player, NULL); - ok(hr == S_OK, "Failed to set url, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set url, hr %#lx.\n", hr); hr = IWMPPlayer4_get_URL(player, &str); - ok(hr == S_OK, "Failed to set url, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set url, hr %#lx.\n", hr); ok(*str == 0, "Unexpected url, %s.\n", wine_dbgstr_w(str)); SysFreeString(str); /* Empty url */ hr = IWMPPlayer4_put_URL(player, str2); - ok(hr == S_OK, "Failed to set url, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set url, hr %#lx.\n", hr); str = SysAllocStringLen(NULL, 0); hr = IWMPPlayer4_put_URL(player, str); - ok(hr == S_OK, "Failed to set url, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set url, hr %#lx.\n", hr); SysFreeString(str); hr = IWMPPlayer4_get_URL(player, &str); - ok(hr == S_OK, "Failed to set url, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set url, hr %#lx.\n", hr); ok(*str == 0, "Unexpected url, %s.\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -668,38 +668,38 @@ static void test_playlist(void) win_skip("CLSID_WindowsMediaPlayer is not registered.\n"); return; } - ok(hr == S_OK, "Failed to create media player instance, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create media player instance, hr %#lx.\n", hr); playlist = NULL; hr = IWMPPlayer4_get_currentPlaylist(player, &playlist); - ok(hr == S_OK, "IWMPPlayer4_get_currentPlaylist failed: %08x\n", hr); + ok(hr == S_OK, "IWMPPlayer4_get_currentPlaylist failed: %08lx\n", hr); ok(playlist != NULL, "playlist == NULL\n"); if (0) /* fails on non-English locales */ { hr = IWMPPlaylist_get_name(playlist, &str); - ok(hr == S_OK, "Failed to get playlist name, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get playlist name, hr %#lx.\n", hr); ok(!lstrcmpW(str, nameW), "Expected %s, got %s\n", wine_dbgstr_w(nameW), wine_dbgstr_w(str)); SysFreeString(str); } hr = IWMPPlaylist_get_count(playlist, NULL); - ok(hr == E_POINTER, "Failed to get count, hr %#x.\n", hr); + ok(hr == E_POINTER, "Failed to get count, hr %#lx.\n", hr); count = -1; hr = IWMPPlaylist_get_count(playlist, &count); - ok(hr == S_OK, "Failed to get count, hr %#x.\n", hr); - ok(count == 0, "Expected 0, got %d\n", count); + ok(hr == S_OK, "Failed to get count, hr %#lx.\n", hr); + ok(count == 0, "Expected 0, got %ld\n", count); IWMPPlaylist_Release(playlist); /* newPlaylist doesn't change current playlist */ hr = IWMPPlayer4_newPlaylist(player, NULL, NULL, &playlist); - ok(hr == S_OK, "Failed to create a playlist, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create a playlist, hr %#lx.\n", hr); playlist2 = NULL; hr = IWMPPlayer4_get_currentPlaylist(player, &playlist2); - ok(hr == S_OK, "IWMPPlayer4_get_currentPlaylist failed: %08x\n", hr); + ok(hr == S_OK, "IWMPPlayer4_get_currentPlaylist failed: %08lx\n", hr); ok(playlist2 != NULL && playlist2 != playlist, "Unexpected playlist instance\n"); IWMPPlaylist_Release(playlist2); @@ -707,13 +707,13 @@ static void test_playlist(void) /* different playlists can have the same name */ str = SysAllocString(nameW); hr = IWMPPlaylist_put_name(playlist, str); - ok(hr == S_OK, "Failed to get playlist name, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get playlist name, hr %#lx.\n", hr); playlist2 = NULL; hr = IWMPPlayer4_newPlaylist(player, str, NULL, &playlist2); - ok(hr == S_OK, "Failed to create a playlist, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create a playlist, hr %#lx.\n", hr); hr = IWMPPlaylist_get_name(playlist2, &str2); - ok(hr == S_OK, "Failed to get playlist name, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get playlist name, hr %#lx.\n", hr); ok(playlist != playlist2, "Expected playlists to be different"); ok(!lstrcmpW(str, str2), "Expected names to be the same\n"); SysFreeString(str); diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 80f078e62f5..f36e07dabfc 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -83,7 +83,7 @@ static inline WCHAR *load_resource(const WCHAR *name) lstrcatW(pathW, name); file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); - ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", wine_dbgstr_w(pathW), + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %ld\n", wine_dbgstr_w(pathW), GetLastError()); res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); @@ -513,7 +513,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF CHECK_EXPECT(Invoke_USERMODE); break; default: - ok(0, "unexpected call Invoke(%d)\n", dispIdMember); + ok(0, "unexpected call Invoke(%ld)\n", dispIdMember); } return E_NOTIMPL; @@ -550,7 +550,7 @@ static HRESULT WINAPI WMPOCXEvents_Invoke(IDispatch *iface, DISPID dispIdMember, { switch(dispIdMember) { default: - ok(0, "unexpected call Invoke(%d)\n", dispIdMember); + ok(0, "unexpected call Invoke(%ld)\n", dispIdMember); } return E_NOTIMPL; @@ -691,7 +691,7 @@ static HRESULT WINAPI InPlaceSiteWindowless_OnInPlaceActivateEx( IOleInPlaceSiteWindowless *iface, BOOL *pfNoRedraw, DWORD dwFlags) { CHECK_EXPECT(OnInPlaceActivateEx); - ok(!dwFlags, "dwFlags = %x\n", dwFlags); + ok(!dwFlags, "dwFlags = %lx\n", dwFlags); ok(pfNoRedraw != NULL, "pfNoRedraw = NULL\n"); return S_OK; } @@ -870,21 +870,21 @@ static void test_ConnectionPoint(IOleObject *unk) static DWORD dw = 100; hres = IOleObject_QueryInterface(unk, &IID_IConnectionPointContainer, (void**)&container); - ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08lx\n", hres); if(FAILED(hres)) return; hres = IConnectionPointContainer_FindConnectionPoint(container, &IID__WMPOCXEvents, &point); IConnectionPointContainer_Release(container); - ok(hres == S_OK, "FindConnectionPoint failed: %08x\n", hres); + ok(hres == S_OK, "FindConnectionPoint failed: %08lx\n", hres); if(FAILED(hres)) return; hres = IConnectionPoint_Advise(point, (IUnknown*)&WMPOCXEvents, &dw); - ok(hres == S_OK, "Advise failed: %08x\n", hres); - ok(dw == 1, "dw=%d, expected 1\n", dw); + ok(hres == S_OK, "Advise failed: %08lx\n", hres); + ok(dw == 1, "dw=%ld, expected 1\n", dw); hres = IConnectionPoint_Unadvise(point, dw); - ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + ok(hres == S_OK, "Unadvise failed: %08lx\n", hres); IConnectionPoint_Release(point); } @@ -905,11 +905,11 @@ static void test_wmp_ifaces(IOleObject *oleobj) BSTR url; hres = IOleObject_QueryInterface(oleobj, &IID_IWMPPlayer4, (void**)&player4); - ok(hres == S_OK, "Could not get IWMPPlayer4 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IWMPPlayer4 iface: %08lx\n", hres); controls = NULL; hres = IWMPPlayer4_get_controls(player4, &controls); - ok(hres == S_OK, "get_controls failed: %08x\n", hres); + ok(hres == S_OK, "get_controls failed: %08lx\n", hres); ok(controls != NULL, "controls = NULL\n"); player = NULL; @@ -919,7 +919,7 @@ static void test_wmp_ifaces(IOleObject *oleobj) unk = NULL; hres = IWMPControls_QueryInterface(controls, &IID_IUnknown, (void **)&unk); - ok(hres == S_OK, "Failed to get IUnknown, hr %#x.\n", hres); + ok(hres == S_OK, "Failed to get IUnknown, hr %#lx.\n", hres); ok(unk != NULL, "Unexpected interface pointer.\n"); IUnknown_Release(unk); @@ -928,7 +928,7 @@ static void test_wmp_ifaces(IOleObject *oleobj) /* IWPNetwork */ network = NULL; hres = IWMPPlayer4_get_network(player4, &network); - ok(hres == S_OK, "get_network failed: %08x\n", hres); + ok(hres == S_OK, "get_network failed: %08lx\n", hres); ok(network != NULL, "network = NULL\n"); player = NULL; @@ -940,19 +940,19 @@ static void test_wmp_ifaces(IOleObject *oleobj) playlist = NULL; hres = IWMPPlayer4_QueryInterface(player4, &IID_IWMPPlaylist, (void**)&playlist); - ok(hres == E_NOINTERFACE, "Getting IWMPPlaylist from IWMPPlayer4 succeeded: %08x\n", hres); + ok(hres == E_NOINTERFACE, "Getting IWMPPlaylist from IWMPPlayer4 succeeded: %08lx\n", hres); ok(playlist == NULL, "playlist != NULL\n"); playlist = NULL; hres = IWMPPlayer4_get_currentPlaylist(player4, &playlist); - ok(hres == S_OK, "IWMPPlayer4_get_currentPlaylist failed: %08x\n", hres); + ok(hres == S_OK, "IWMPPlayer4_get_currentPlaylist failed: %08lx\n", hres); ok(playlist != NULL, "playlist != NULL\n"); IWMPPlaylist_Release(playlist); media = NULL; hres = IWMPPlayer4_QueryInterface(player4, &IID_IWMPMedia, (void**)&media); - ok(hres == E_NOINTERFACE, "get_currentMedia SUCCEEDED: %08x\n", hres); + ok(hres == E_NOINTERFACE, "get_currentMedia SUCCEEDED: %08lx\n", hres); ok(media == NULL, "media != NULL\n"); /* Test media put/get */ @@ -966,92 +966,92 @@ static void test_wmp_ifaces(IOleObject *oleobj) SET_EXPECT(GetContainer); SET_EXPECT(Invoke_USERMODE); hres = IWMPPlayer4_put_URL(player4, filename); - ok(hres == S_OK, "IWMPPlayer4_put_URL failed: %08x\n", hres); + ok(hres == S_OK, "IWMPPlayer4_put_URL failed: %08lx\n", hres); todo_wine CHECK_CALLED_OR_BROKEN(GetContainer); todo_wine CHECK_CALLED(Invoke_USERMODE); url = NULL; SET_EXPECT(Invoke_USERMODE); hres = IWMPPlayer4_get_URL(player4, &url); - ok(hres == S_OK, "IWMPPlayer4_get_URL failed: %08x\n", hres); + ok(hres == S_OK, "IWMPPlayer4_get_URL failed: %08lx\n", hres); ok(0 == lstrcmpW(url, filename), "%s != %s\n", wine_dbgstr_w(url), wine_dbgstr_w(filename)); todo_wine CHECK_CALLED(Invoke_USERMODE); SysFreeString(url); hres = IWMPPlayer4_get_currentMedia(player4, &media); - ok(hres == S_OK, "get_currentMedia failed: %08x\n", hres); + ok(hres == S_OK, "get_currentMedia failed: %08lx\n", hres); ok(media != NULL, "media = (%p)\n", media); url = NULL; hres = IWMPMedia_get_sourceURL(media, &url); - ok(hres == S_OK, "IWMPMedia_get_sourceURL failed: %08x\n", hres); + ok(hres == S_OK, "IWMPMedia_get_sourceURL failed: %08lx\n", hres); ok(0 == lstrcmpW(url, filename), "%s != %s\n", wine_dbgstr_w(url), wine_dbgstr_w(filename)); SysFreeString(url); SET_EXPECT(GetContainer); hres = IWMPPlayer4_put_currentMedia(player4, media); - ok(hres == S_OK, "put_currentMedia failed: %08x\n", hres); + ok(hres == S_OK, "put_currentMedia failed: %08lx\n", hres); todo_wine CHECK_CALLED_OR_BROKEN(GetContainer); IWMPMedia_Release(media); hres = IWMPPlayer4_get_currentMedia(player4, &media); - ok(hres == S_OK, "get_currentMedia failed: %08x\n", hres); + ok(hres == S_OK, "get_currentMedia failed: %08lx\n", hres); ok(media != NULL, "media = (%p)\n", media); IWMPMedia_Release(media); settings = NULL; hres = IWMPPlayer4_get_settings(player4, &settings); - ok(hres == S_OK, "get_settings failed: %08x\n", hres); + ok(hres == S_OK, "get_settings failed: %08lx\n", hres); ok(settings != NULL, "settings = NULL\n"); hres = IOleObject_QueryInterface(oleobj, &IID_IWMPSettings, (void**)&settings_qi); - ok(hres == S_OK, "Could not get IWMPSettings iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IWMPSettings iface: %08lx\n", hres); ok(settings == settings_qi, "settings != settings_qi\n"); IWMPSettings_Release(settings_qi); /* Test few settings put/gets */ hres = IWMPSettings_get_autoStart(settings, &vbool); - ok(hres == S_OK, "Could not get autoStart from IWMPSettings: %08x\n", hres); + ok(hres == S_OK, "Could not get autoStart from IWMPSettings: %08lx\n", hres); ok(vbool == VARIANT_TRUE, "autoStart = %x\n", vbool); hres = IWMPSettings_put_autoStart(settings, VARIANT_FALSE); - ok(hres == S_OK, "Could not put autoStart in IWMPSettings: %08x\n", hres); + ok(hres == S_OK, "Could not put autoStart in IWMPSettings: %08lx\n", hres); hres = IWMPSettings_get_autoStart(settings, &vbool); - ok(hres == S_OK, "Could not get autoStart from IWMPSettings: %08x\n", hres); + ok(hres == S_OK, "Could not get autoStart from IWMPSettings: %08lx\n", hres); ok(!vbool, "autoStart = %x\n", vbool); hres = IWMPSettings_get_invokeURLs(settings, &vbool); - ok(hres == S_OK, "Could not get invokeURLs from IWMPSettings: %08x\n", hres); + ok(hres == S_OK, "Could not get invokeURLs from IWMPSettings: %08lx\n", hres); ok(vbool == VARIANT_TRUE, "invokeURLs = %x\n", vbool); hres = IWMPSettings_put_invokeURLs(settings, VARIANT_FALSE); - ok(hres == S_OK, "Could not put invokeURLs in IWMPSettings: %08x\n", hres); + ok(hres == S_OK, "Could not put invokeURLs in IWMPSettings: %08lx\n", hres); hres = IWMPSettings_get_invokeURLs(settings, &vbool); - ok(hres == S_OK, "Could not get invokeURLs from IWMPSettings: %08x\n", hres); + ok(hres == S_OK, "Could not get invokeURLs from IWMPSettings: %08lx\n", hres); ok(!vbool, "invokeURLs = %x\n", vbool); hres = IWMPSettings_get_enableErrorDialogs(settings, &vbool); - ok(hres == S_OK, "Could not get enableErrorDialogs from IWMPSettings: %08x\n", hres); + ok(hres == S_OK, "Could not get enableErrorDialogs from IWMPSettings: %08lx\n", hres); ok(vbool == VARIANT_FALSE, "enableErrorDialogs = %x\n", vbool); hres = IWMPSettings_put_enableErrorDialogs(settings, VARIANT_TRUE); - ok(hres == S_OK, "Could not put enableErrorDialogs in IWMPSettings: %08x\n", hres); + ok(hres == S_OK, "Could not put enableErrorDialogs in IWMPSettings: %08lx\n", hres); hres = IWMPSettings_get_enableErrorDialogs(settings, &vbool); - ok(hres == S_OK, "Could not get enableErrorDialogs from IWMPSettings: %08x\n", hres); + ok(hres == S_OK, "Could not get enableErrorDialogs from IWMPSettings: %08lx\n", hres); ok(vbool == VARIANT_TRUE, "enableErrorDialogs = %x\n", vbool); IWMPSettings_Release(settings); IWMPPlayer4_Release(player4); hres = IOleObject_QueryInterface(oleobj, &IID_IWMPPlayer, (void**)&player); - ok(hres == S_OK, "Could not get IWMPPlayer iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IWMPPlayer iface: %08lx\n", hres); settings = NULL; hres = IWMPPlayer_get_settings(player, &settings); - ok(hres == S_OK, "get_settings failed: %08x\n", hres); + ok(hres == S_OK, "get_settings failed: %08lx\n", hres); ok(settings != NULL, "settings = NULL\n"); hres = IOleObject_QueryInterface(oleobj, &IID_IWMPSettings, (void**)&settings_qi); - ok(hres == S_OK, "Could not get IWMPSettings iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IWMPSettings iface: %08lx\n", hres); ok(settings == settings_qi, "settings != settings_qi\n"); IWMPSettings_Release(settings_qi); @@ -1064,8 +1064,8 @@ static void test_wmp_ifaces(IOleObject *oleobj) #define test_rect_size(a,b,c) _test_rect_size(__LINE__,a,b,c) static void _test_rect_size(unsigned line, const RECT *r, int width, int height) { - ok_(__FILE__,line)(r->right-r->left == width, "width = %d, expected %d\n", r->right-r->left, width); - ok_(__FILE__,line)(r->bottom-r->top == height, "height = %d, expected %d\n", r->bottom-r->top, height); + ok_(__FILE__,line)(r->right-r->left == width, "width = %ld, expected %d\n", r->right-r->left, width); + ok_(__FILE__,line)(r->bottom-r->top == height, "height = %ld, expected %d\n", r->bottom-r->top, height); } static void test_window(HWND hwnd) @@ -1079,13 +1079,13 @@ static void test_window(HWND hwnd) ok(!strncmp(class_name, "ATL:", 4), "class_name = %s %d\n", class_name, i); res = GetWindowInfo(hwnd, &wi); - ok(res, "GetWindowInfo failed: %u\n", GetLastError()); + ok(res, "GetWindowInfo failed: %lu\n", GetLastError()); test_rect_size(&wi.rcWindow, 400, 410); test_rect_size(&wi.rcClient, 400, 410); - ok(wi.dwStyle == (WS_CLIPCHILDREN|WS_CLIPSIBLINGS|WS_VISIBLE|WS_CHILD), "dwStyle = %x\n", wi.dwStyle); - ok(!(wi.dwExStyle & ~0x800 /* undocumented, set by some versions */), "dwExStyle = %x\n", wi.dwExStyle); + ok(wi.dwStyle == (WS_CLIPCHILDREN|WS_CLIPSIBLINGS|WS_VISIBLE|WS_CHILD), "dwStyle = %lx\n", wi.dwStyle); + ok(!(wi.dwExStyle & ~0x800 /* undocumented, set by some versions */), "dwExStyle = %lx\n", wi.dwExStyle); ok(IsWindowVisible(hwnd), "Window is not visible\n"); } @@ -1099,10 +1099,10 @@ static void test_QI(IUnknown *unk) ok(hres == E_NOINTERFACE, "Got IQuickActivate iface when no expected\n"); hres = IUnknown_QueryInterface(unk, &IID_IMarshal, (void**)&tmp); - ok(hres == E_NOINTERFACE, "Could not get IMarshal iface: %08x\n", hres); + ok(hres == E_NOINTERFACE, "Could not get IMarshal iface: %08lx\n", hres); hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceObjectWindowless, (void**)&tmp); - ok(hres == S_OK, "Could not get IOleInPlaceObjectWindowless iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IOleInPlaceObjectWindowless iface: %08lx\n", hres); IUnknown_Release(tmp); } @@ -1113,20 +1113,20 @@ static void test_IConnectionPointContainer(IOleObject *oleobj) HRESULT hres; hres = IOleObject_QueryInterface(oleobj, &IID_IConnectionPointContainer, (void**)&container); - ok(hres == S_OK, "Could not get IConnectionPointContainer iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IConnectionPointContainer iface: %08lx\n", hres); hres = IConnectionPointContainer_FindConnectionPoint(container, &IID_IPropertyNotifySink, &point); - ok(hres == CONNECT_E_NOCONNECTION, "got: %08x\n", hres); + ok(hres == CONNECT_E_NOCONNECTION, "got: %08lx\n", hres); point = NULL; hres = IConnectionPointContainer_FindConnectionPoint(container, &IID_IWMPEvents, &point); - todo_wine ok(hres == S_OK, "got: %08x\n", hres); + todo_wine ok(hres == S_OK, "got: %08lx\n", hres); if(point) IConnectionPoint_Release(point); point = NULL; hres = IConnectionPointContainer_FindConnectionPoint(container, &IID_IWMPEvents2, &point); - todo_wine ok(hres == S_OK, "got: %08x\n", hres); + todo_wine ok(hres == S_OK, "got: %08lx\n", hres); if(point) IConnectionPoint_Release(point); @@ -1146,7 +1146,7 @@ static void test_IConnectionPointContainer(IOleObject *oleobj) point = NULL; hres = IConnectionPointContainer_FindConnectionPoint(container, &IID__WMPOCXEvents, &point); - ok(hres == S_OK, "got: %08x\n", hres); + ok(hres == S_OK, "got: %08lx\n", hres); if(point) IConnectionPoint_Release(point); @@ -1167,40 +1167,40 @@ static void test_extent(IOleObject *oleobj) dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); ReleaseDC(0, hdc); if (dpi_x != 96 || dpi_y != 96) - trace("dpi: %d / %d\n", dpi_y, dpi_y); + trace("dpi: %ld / %ld\n", dpi_y, dpi_y); extent.cx = extent.cy = 0xdeadbeef; hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); - ok(hres == S_OK, "GetExtent failed: %08x\n", hres); + ok(hres == S_OK, "GetExtent failed: %08lx\n", hres); expected.cx = MulDiv(192, 2540, dpi_x); expected.cy = MulDiv(192, 2540, dpi_y); - ok(extent.cx == expected.cx && extent.cy == expected.cy, "size = {%d %d} (expected %d %d)\n", + ok(extent.cx == expected.cx && extent.cy == expected.cy, "size = {%ld %ld} (expected %ld %ld)\n", extent.cx, extent.cy, expected.cx, expected.cy ); extent.cx = 800; extent.cy = 700; hres = IOleObject_SetExtent(oleobj, DVASPECT_CONTENT, &extent); - ok(hres == S_OK, "SetExtent failed: %08x\n", hres); + ok(hres == S_OK, "SetExtent failed: %08lx\n", hres); extent.cx = extent.cy = 0xdeadbeef; hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); - ok(hres == S_OK, "GetExtent failed: %08x\n", hres); - ok(extent.cx == 800 && extent.cy == 700, "size = {%d %d}\n", extent.cx, extent.cy); + ok(hres == S_OK, "GetExtent failed: %08lx\n", hres); + ok(extent.cx == 800 && extent.cy == 700, "size = {%ld %ld}\n", extent.cx, extent.cy); hres = IOleObject_GetExtent(oleobj, 0, &extent); - ok(hres == E_FAIL, "GetExtent failed: %08x\n", hres); + ok(hres == E_FAIL, "GetExtent failed: %08lx\n", hres); hres = IOleObject_GetExtent(oleobj, 7, &extent); - ok(hres == E_FAIL, "GetExtent failed: %08x\n", hres); + ok(hres == E_FAIL, "GetExtent failed: %08lx\n", hres); extent.cx = 900; extent.cy = 800; hres = IOleObject_SetExtent(oleobj, DVASPECT_CONTENT, &expected); - ok(hres == S_OK, "SetExtent failed: %08x\n", hres); + ok(hres == S_OK, "SetExtent failed: %08lx\n", hres); hres = IOleObject_SetExtent(oleobj, 0, &expected); - ok(hres == DV_E_DVASPECT, "SetExtent failed: %08x\n", hres); + ok(hres == DV_E_DVASPECT, "SetExtent failed: %08lx\n", hres); hres = IOleObject_SetExtent(oleobj, 7, &expected); - ok(hres == DV_E_DVASPECT, "SetExtent failed: %08x\n", hres); + ok(hres == DV_E_DVASPECT, "SetExtent failed: %08lx\n", hres); } static void test_wmp(void) @@ -1226,31 +1226,31 @@ static void test_wmp(void) win_skip("CLSID_WindowsMediaPlayer not registered\n"); return; } - ok(hres == S_OK, "Could not create CLSID_WindowsMediaPlayer instance: %08x\n", hres); + ok(hres == S_OK, "Could not create CLSID_WindowsMediaPlayer instance: %08lx\n", hres); hres = IOleObject_QueryInterface(oleobj, &IID_IWMPCore, (void**)&wmpcore); - ok(hres == S_OK, "got 0x%08x\n", hres); + ok(hres == S_OK, "got 0x%08lx\n", hres); hres = IWMPCore_get_versionInfo(wmpcore, NULL); - ok(hres == E_POINTER, "got 0x%08x\n", hres); + ok(hres == E_POINTER, "got 0x%08lx\n", hres); hres = IWMPCore_get_versionInfo(wmpcore, &str); - ok(hres == S_OK, "got 0x%08x\n", hres); + ok(hres == S_OK, "got 0x%08lx\n", hres); SysFreeString(str); IWMPCore_Release(wmpcore); hres = IOleObject_QueryInterface(oleobj, &IID_IProvideClassInfo2, (void**)&class_info); - ok(hres == S_OK, "Could not get IProvideClassInfo2 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IProvideClassInfo2 iface: %08lx\n", hres); hres = IProvideClassInfo2_GetGUID(class_info, GUIDKIND_DEFAULT_SOURCE_DISP_IID, &guid); - ok(hres == S_OK, "GetGUID failed: %08x\n", hres); + ok(hres == S_OK, "GetGUID failed: %08lx\n", hres); ok(IsEqualGUID(&guid, &IID__WMPOCXEvents), "guid = %s\n", wine_dbgstr_guid(&guid)); hres = IProvideClassInfo2_GetClassInfo(class_info, &ti); - ok(hres == S_OK, "Failed to get class info, hr %#x.\n", hres); + ok(hres == S_OK, "Failed to get class info, hr %#lx.\n", hres); hres = ITypeInfo_GetTypeAttr(ti, &attr); - ok(hres == S_OK, "Failed to get type attributes, hr %#x.\n", hres); + ok(hres == S_OK, "Failed to get type attributes, hr %#lx.\n", hres); ok(IsEqualGUID(&CLSID_WindowsMediaPlayer, &attr->guid), "Unexpected typeinfo guid %s\n", wine_dbgstr_guid(&attr->guid)); ITypeInfo_ReleaseTypeAttr(ti, attr); ITypeInfo_Release(ti); @@ -1262,25 +1262,25 @@ static void test_wmp(void) test_extent(oleobj); hres = IOleObject_GetMiscStatus(oleobj, DVASPECT_CONTENT, &misc_status); - ok(hres == S_OK, "GetMiscStatus failed: %08x\n", hres); + ok(hres == S_OK, "GetMiscStatus failed: %08lx\n", hres); ok(misc_status == (OLEMISC_SETCLIENTSITEFIRST|OLEMISC_ACTIVATEWHENVISIBLE|OLEMISC_INSIDEOUT - |OLEMISC_CANTLINKINSIDE|OLEMISC_RECOMPOSEONRESIZE), "misc_status = %x\n", misc_status); + |OLEMISC_CANTLINKINSIDE|OLEMISC_RECOMPOSEONRESIZE), "misc_status = %lx\n", misc_status); hres = IOleObject_QueryInterface(oleobj, &IID_IPersistStreamInit, (void**)&psi); - ok(hres == S_OK, "Could not get IPersistStreamInit iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IPersistStreamInit iface: %08lx\n", hres); hres = IOleObject_QueryInterface(oleobj, &IID_IOleInPlaceObject, (void**)&ipobj); - ok(hres == S_OK, "Could not get IOleInPlaceObject iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IOleInPlaceObject iface: %08lx\n", hres); hres = IPersistStreamInit_InitNew(psi); - ok(hres == E_FAIL || broken(hres == S_OK /* Old WMP */), "InitNew failed: %08x\n", hres); + ok(hres == E_FAIL || broken(hres == S_OK /* Old WMP */), "InitNew failed: %08lx\n", hres); SET_EXPECT(GetContainer); SET_EXPECT(GetExtendedControl); SET_EXPECT(GetWindow); SET_EXPECT(Invoke_USERMODE); hres = IOleObject_SetClientSite(oleobj, &ClientSite); - ok(hres == S_OK, "SetClientSite failed: %08x\n", hres); + ok(hres == S_OK, "SetClientSite failed: %08lx\n", hres); todo_wine CHECK_CALLED(GetContainer); CHECK_CALLED(GetExtendedControl); todo_wine CHECK_CALLED(GetWindow); @@ -1288,17 +1288,17 @@ static void test_wmp(void) client_site = NULL; hres = IOleObject_GetClientSite(oleobj, &client_site); - ok(hres == S_OK, "GetClientSite failed: %08x\n", hres); + ok(hres == S_OK, "GetClientSite failed: %08lx\n", hres); ok(client_site == &ClientSite, "client_site != ClientSite\n"); SET_EXPECT(GetWindow); hres = IPersistStreamInit_InitNew(psi); - ok(hres == S_OK, "InitNew failed: %08x\n", hres); + ok(hres == S_OK, "InitNew failed: %08lx\n", hres); CHECK_CALLED(GetWindow); hwnd = (HWND)0xdeadbeef; hres = IOleInPlaceObject_GetWindow(ipobj, &hwnd); - ok(hres == E_UNEXPECTED, "GetWindow failed: %08x\n", hres); + ok(hres == E_UNEXPECTED, "GetWindow failed: %08lx\n", hres); ok(!hwnd, "hwnd = %p\n", hwnd); SET_EXPECT(GetWindow); @@ -1307,7 +1307,7 @@ static void test_wmp(void) SET_EXPECT(GetWindowContext); SET_EXPECT(ShowObject); hres = IOleObject_DoVerb(oleobj, OLEIVERB_INPLACEACTIVATE, NULL, &ClientSite, 0, container_hwnd, &pos); - ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + ok(hres == S_OK, "DoVerb failed: %08lx\n", hres); CHECK_CALLED(GetWindow); CHECK_CALLED(CanWindowlessActivate); CHECK_CALLED(OnInPlaceActivateEx); @@ -1316,44 +1316,44 @@ static void test_wmp(void) hwnd = NULL; hres = IOleInPlaceObject_GetWindow(ipobj, &hwnd); - ok(hres == S_OK, "GetWindow failed: %08x\n", hres); + ok(hres == S_OK, "GetWindow failed: %08lx\n", hres); ok(hwnd != NULL, "hwnd = NULL\n"); test_window(hwnd); SetRect(&pos, 1, 2, 301, 312); hres = IOleInPlaceObject_SetObjectRects(ipobj, &pos, &pos); - ok(hres == S_OK, "SetObjectRects failed: %08x\n", hres); + ok(hres == S_OK, "SetObjectRects failed: %08lx\n", hres); GetClientRect(hwnd, &pos); test_rect_size(&pos, 300, 310); test_wmp_ifaces(oleobj); hres = IOleObject_DoVerb(oleobj, OLEIVERB_HIDE, NULL, &ClientSite, 0, container_hwnd, &pos); - ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + ok(hres == S_OK, "DoVerb failed: %08lx\n", hres); ok(!IsWindowVisible(hwnd), "Window is visible\n"); SET_EXPECT(OnShowWindow_FALSE); SET_EXPECT(OnInPlaceDeactivate); hres = IOleObject_Close(oleobj, 0); - ok(hres == S_OK, "Close failed: %08x\n", hres); + ok(hres == S_OK, "Close failed: %08lx\n", hres); todo_wine CHECK_CALLED(OnShowWindow_FALSE); CHECK_CALLED(OnInPlaceDeactivate); hwnd = (HWND)0xdeadbeef; hres = IOleInPlaceObject_GetWindow(ipobj, &hwnd); - ok(hres == E_UNEXPECTED, "GetWindow failed: %08x\n", hres); + ok(hres == E_UNEXPECTED, "GetWindow failed: %08lx\n", hres); ok(!hwnd, "hwnd = %p\n", hwnd); hres = IOleObject_Close(oleobj, 0); - ok(hres == S_OK, "Close failed: %08x\n", hres); + ok(hres == S_OK, "Close failed: %08lx\n", hres); hres = IOleObject_SetClientSite(oleobj, NULL); - ok(hres == S_OK, "SetClientSite failed: %08x\n", hres); + ok(hres == S_OK, "SetClientSite failed: %08lx\n", hres); client_site = (void*)0xdeadbeef; hres = IOleObject_GetClientSite(oleobj, &client_site); - ok(hres == E_FAIL || broken(hres == S_OK), "GetClientSite failed: %08x\n", hres); + ok(hres == E_FAIL || broken(hres == S_OK), "GetClientSite failed: %08lx\n", hres); ok(!client_site, "client_site = %p\n", client_site); test_ConnectionPoint(oleobj); @@ -1362,7 +1362,7 @@ static void test_wmp(void) IOleInPlaceObject_Release(ipobj); ref = IOleObject_Release(oleobj); - ok(!ref, "ref = %d\n", ref); + ok(!ref, "ref = %ld\n", ref); } static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

2 1

[PATCH 1/2] dlls/user32/tests: wrap helper macro inside function
by Eric Pouech 10 Mar '22

10 Mar '22

this lets the compiler do the int => long conversions Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/user32/tests/edit.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 6edec12e03b..777c50be337 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2018,8 +2018,11 @@ static void test_margins_font_change(void) } -#define edit_pos_ok(exp, got, txt) \ - ok(exp == got, "wrong " #txt " expected %d got %d\n", exp, got); +#define edit_pos_ok(exp, got, txt) edit_pos_ok_(__LINE__, exp, got, #txt) +static inline void edit_pos_ok_(unsigned line, DWORD exp, DWORD got, const char* txt) +{ + ok_(__FILE__, line)(exp == got, "wrong %s expected %ld got %ld\n", txt, exp, got); +} #define check_pos(hwEdit, set_height, test_top, test_height, test_left) \ do { \

2 2

[tools 1/2] testbot/web: Better initialize and check the Days Stats page parameter.
by Francois Gouget 10 Mar '22

10 Mar '22

Use SetParam() to provide the default value. This allows removing the Days field and GetDisplayValue() method. FormPage::Validate() must be called after the property descriptors have been set otherwise it has no property to check. This removes the need for redefining Validate(). Treat "00" the same as "0". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Stats.pl | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index c96e6fdafb..42408a3a81 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -37,34 +37,18 @@ sub _initialize($$$) { my ($self, $Request, $RequiredRole) = @_; - $self->{Days} = $self->GetParam("Days"); - $self->Validate(); - $self->{start} = Time(); my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Days", "Days to analyze", !1, 1, "N", 2), ); $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); -} - -sub Validate($) -{ - my ($self) = @_; - if (!defined $self->{Days}) - { - $self->{Days} = 7; - $self->{NoStats} = 1; - } - elsif ($self->{Days} !~ /^[0-9]{1,2}$/) + if (!$self->GetParam("Days") or !$self->Validate() or + !int($self->GetParam("Days"))) # 00 case! { - $self->{ErrField} = "Days"; - $self->{ErrMessage} = "The number of days must be between 1 and 99"; + $self->SetParam("Days", 7) if (!defined $self->{ErrMessage}); $self->{NoStats} = 1; - $self->{Days} = 7; - return undef; } - return $self->SUPER::Validate(); } sub GetPageTitle($$) @@ -211,7 +195,7 @@ sub GenerateBody($) my $VMs = CreateVMs(); $VMs->FilterEnabledRole(); my @SortedVMs = sort _CompareVMs @{$VMs->GetItems()}; - my $Stats = GetStatistics($VMs, $self->{Days} * 24 * 60 * 60); + my $Stats = GetStatistics($VMs, $self->GetParam("Days") * 24 * 60 * 60); ### Show global statistics @@ -377,13 +361,6 @@ sub GenerateBody($) print "</tbody></table></div>\n"; } -sub GetDisplayValue($$) -{ - my ($self, $PropertyDescriptor) = @_; - - return $self->{$PropertyDescriptor->GetName()}; -} - sub GetActions($) { #my ($self) = @_; -- 2.30.2

1 1

[tools 1/2] testbot/web: Better initialize and check the Hours Log page parameter.
by Francois Gouget 10 Mar '22

10 Mar '22

Call Validate() to make sure the Hours parameter is usable. Note that due to an implementation detail marking the Hours property as required is not strictly necessary. But it does reflect that we need a value for the Download action. Use SetParam() to provide a default value which removes the need for redefining GetPropertyValue(). Treat "00" the same as "0". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/Log.pl | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index 456e73f55d..f8e4943b3d 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -34,9 +34,16 @@ sub _initialize($$$) my ($self, $Request, $RequiredRole) = @_; my @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Hours", "Hours", !1, !1, "N", 2), + CreateBasicPropertyDescriptor("Hours", "Hours", !1, 1, "N", 2), ); $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); + + if (!$self->GetParam("Hours") or !$self->Validate() or + !int($self->GetParam("Hours"))) # 00 case! + { + $self->SetParam("Hours", 1) if (!defined $self->{ErrMessage}); + $self->SetParam("Action", undef); + } } sub GetPageTitle($$) @@ -46,16 +53,6 @@ sub GetPageTitle($$) return "Engine Log - ${ProjectName} Test Bot"; } -sub GetPropertyValue($$) -{ - my ($self, $PropertyDescriptor) = @_; - - my $PropertyName = $PropertyDescriptor->GetName(); - return 1 if ($PropertyName eq "Hours"); # Provides a default value - - return $self->SUPER::GetPropertyValue($PropertyDescriptor); -} - sub GetHeaderText($) { #my ($self) = @_; -- 2.30.2

1 1

[PATCH] windows.media.speech/tests: Compile with long types.
by Bernhard Kölbl 10 Mar '22

10 Mar '22

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/tests/Makefile.in | 1 - dlls/windows.media.speech/tests/speech.c | 92 ++++++++++----------- 2 files changed, 46 insertions(+), 47 deletions(-) diff --git a/dlls/windows.media.speech/tests/Makefile.in b/dlls/windows.media.speech/tests/Makefile.in index e1616991573..2ee10d3db21 100644 --- a/dlls/windows.media.speech/tests/Makefile.in +++ b/dlls/windows.media.speech/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = windows.media.speech.dll IMPORTS = combase uuid diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 3194a75d6d7..be5499954be 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -48,7 +48,7 @@ static inline LONG get_ref(IUnknown *obj) static inline void check_refcount_(unsigned int line, void *obj, LONG exp) { LONG ref = get_ref(obj); - ok_(__FILE__, line)(exp == ref, "Unexpected refcount %u, expected %u\n", ref, exp); + ok_(__FILE__, line)(exp == ref, "Unexpected refcount %lu, expected %lu\n", ref, exp); } #define check_interface(obj, iid, exp) check_interface_(__LINE__, obj, iid, exp) @@ -61,7 +61,7 @@ static void check_interface_(unsigned int line, void *obj, const IID *iid, BOOL expected_hr = supported ? S_OK : E_NOINTERFACE; hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); - ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#lx, expected %#lx.\n", hr, expected_hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); } @@ -79,19 +79,19 @@ static void test_ActivationFactory(void) ULONG ref; hr = RoInitialize(RO_INIT_MULTITHREADED); - ok(hr == S_OK, "RoInitialize failed, hr %#x.\n", hr); + ok(hr == S_OK, "RoInitialize failed, hr %#lx.\n", hr); hr = WindowsCreateString(synthesizer_name, wcslen(synthesizer_name), &str); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x.\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); hr = WindowsCreateString(recognizer_name, wcslen(recognizer_name), &str2); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x.\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); hr = WindowsCreateString(garbage_name, wcslen(garbage_name), &str3); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x.\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); - ok(hr == S_OK, "RoGetActivationFactory failed, hr %#x.\n", hr); + ok(hr == S_OK, "RoGetActivationFactory failed, hr %#lx.\n", hr); check_refcount(factory, 2); @@ -103,12 +103,12 @@ static void test_ActivationFactory(void) check_interface(factory, &IID_ISpeechRecognizerStatics2, FALSE); hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory2); - ok(hr == S_OK, "RoGetActivationFactory failed, hr %#x.\n", hr); + ok(hr == S_OK, "RoGetActivationFactory failed, hr %#lx.\n", hr); ok(factory == factory2, "Factories pointed at factory %p factory2 %p.\n", factory, factory2); check_refcount(factory2, 3); hr = RoGetActivationFactory(str2, &IID_IActivationFactory, (void **)&factory3); - todo_wine ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "Got unexpected hr %#x.\n", hr); + todo_wine ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "Got unexpected hr %#lx.\n", hr); if (hr == S_OK) /* Win10+ only */ { @@ -121,18 +121,18 @@ static void test_ActivationFactory(void) check_interface(factory3, &IID_ISpeechRecognizerStatics, TRUE); hr = IActivationFactory_QueryInterface(factory3, &IID_ISpeechRecognizerStatics2, (void **)&recognizer_statics2); - ok(hr == S_OK || broken(hr == E_NOINTERFACE), "IActivationFactory_QueryInterface failed, hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "IActivationFactory_QueryInterface failed, hr %#lx.\n", hr); if (hr == S_OK) /* ISpeechRecognizerStatics2 not available in Win10 1507 */ { ref = ISpeechRecognizerStatics2_Release(recognizer_statics2); - ok(ref == 2, "Got unexpected refcount: %u.\n", ref); + ok(ref == 2, "Got unexpected refcount: %lu.\n", ref); } check_interface(factory3, &IID_IInstalledVoicesStatic, FALSE); ref = IActivationFactory_Release(factory3); - ok(ref == 1, "Got unexpected refcount: %u.\n", ref); + ok(ref == 1, "Got unexpected refcount: %lu.\n", ref); } hdll = LoadLibraryW(L"windows.media.speech.dll"); @@ -143,18 +143,18 @@ static void test_ActivationFactory(void) ok(!!pDllGetActivationFactory, "DllGetActivationFactory not found.\n"); hr = pDllGetActivationFactory(str3, &factory4); - ok((hr == CLASS_E_CLASSNOTAVAILABLE), "Got unexpected hr %#x.\n", hr); + ok((hr == CLASS_E_CLASSNOTAVAILABLE), "Got unexpected hr %#lx.\n", hr); FreeLibrary(hdll); } hr = RoGetActivationFactory(str3, &IID_IActivationFactory, (void **)&factory4); - ok((hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#x.\n", hr); + ok((hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#lx.\n", hr); ref = IActivationFactory_Release(factory2); - ok(ref == 2, "Got unexpected refcount: %u.\n", ref); + ok(ref == 2, "Got unexpected refcount: %lu.\n", ref); ref = IActivationFactory_Release(factory); - ok(ref == 1, "Got unexpected refcount: %u.\n", ref); + ok(ref == 1, "Got unexpected refcount: %lu.\n", ref); WindowsDeleteString(str); WindowsDeleteString(str2); @@ -183,10 +183,10 @@ static void test_SpeechSynthesizer(void) ULONG ref; hr = RoInitialize(RO_INIT_MULTITHREADED); - ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); + ok(hr == S_OK, "RoInitialize failed, hr %#lx\n", hr); hr = WindowsCreateString(speech_synthesizer_name, wcslen(speech_synthesizer_name), &str); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); hdll = LoadLibraryW(L"windows.media.speech.dll"); if (hdll) @@ -195,31 +195,31 @@ static void test_SpeechSynthesizer(void) ok(!!pDllGetActivationFactory, "DllGetActivationFactory not found.\n"); hr = WindowsCreateString(unknown_class_name, wcslen(unknown_class_name), &str2); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); hr = pDllGetActivationFactory(str2, &factory); - ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Got unexpected hr %#lx.\n", hr); WindowsDeleteString(str2); hr = WindowsCreateString(speech_synthesizer_name2, wcslen(speech_synthesizer_name2), &str2); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); hr = pDllGetActivationFactory(str2, &factory2); - ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Got unexpected hr %#lx.\n", hr); WindowsDeleteString(str2); hr = pDllGetActivationFactory(str, &factory2); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); } else { - win_skip("Failed to load library, err %u.\n", GetLastError()); + win_skip("Failed to load library, err %lu.\n", GetLastError()); } hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); - ok(hr == S_OK, "RoGetActivationFactory failed, hr %#x\n", hr); + ok(hr == S_OK, "RoGetActivationFactory failed, hr %#lx\n", hr); if (hdll) { @@ -229,47 +229,47 @@ static void test_SpeechSynthesizer(void) } hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#lx\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IAgileObject, (void **)&agile_object); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#lx\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IInstalledVoicesStatic, (void **)&voices_static); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInstalledVoicesStatic failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInstalledVoicesStatic failed, hr %#lx\n", hr); hr = IInstalledVoicesStatic_QueryInterface(voices_static, &IID_IInspectable, (void **)&tmp_inspectable); - ok(hr == S_OK, "IInstalledVoicesStatic_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(hr == S_OK, "IInstalledVoicesStatic_QueryInterface IID_IInspectable failed, hr %#lx\n", hr); ok(tmp_inspectable == inspectable, "IInstalledVoicesStatic_QueryInterface IID_IInspectable returned %p, expected %p\n", tmp_inspectable, inspectable); IInspectable_Release(tmp_inspectable); hr = IInstalledVoicesStatic_QueryInterface(voices_static, &IID_IAgileObject, (void **)&tmp_agile_object); - ok(hr == S_OK, "IInstalledVoicesStatic_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(hr == S_OK, "IInstalledVoicesStatic_QueryInterface IID_IAgileObject failed, hr %#lx\n", hr); ok(tmp_agile_object == agile_object, "IInstalledVoicesStatic_QueryInterface IID_IAgileObject returned %p, expected %p\n", tmp_agile_object, agile_object); IAgileObject_Release(tmp_agile_object); hr = IInstalledVoicesStatic_get_AllVoices(voices_static, &voices); - ok(hr == S_OK, "IInstalledVoicesStatic_get_AllVoices failed, hr %#x\n", hr); + ok(hr == S_OK, "IInstalledVoicesStatic_get_AllVoices failed, hr %#lx\n", hr); hr = IVectorView_VoiceInformation_QueryInterface(voices, &IID_IInspectable, (void **)&tmp_inspectable); - ok(hr == S_OK, "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#lx\n", hr); ok(tmp_inspectable != inspectable, "IVectorView_VoiceInformation_QueryInterface voices returned %p, expected %p\n", tmp_inspectable, inspectable); IInspectable_Release(tmp_inspectable); hr = IVectorView_VoiceInformation_QueryInterface(voices, &IID_IAgileObject, (void **)&tmp_agile_object); - ok(hr == E_NOINTERFACE, "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr); + ok(hr == E_NOINTERFACE, "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#lx\n", hr); size = 0xdeadbeef; hr = IVectorView_VoiceInformation_get_Size(voices, &size); - ok(hr == S_OK, "IVectorView_VoiceInformation_get_Size voices failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_VoiceInformation_get_Size voices failed, hr %#lx\n", hr); todo_wine ok(size != 0 && size != 0xdeadbeef, "IVectorView_VoiceInformation_get_Size returned %u\n", size); voice = (IVoiceInformation *)0xdeadbeef; hr = IVectorView_VoiceInformation_GetAt(voices, size, &voice); - ok(hr == E_BOUNDS, "IVectorView_VoiceInformation_GetAt failed, hr %#x\n", hr); + ok(hr == E_BOUNDS, "IVectorView_VoiceInformation_GetAt failed, hr %#lx\n", hr); ok(voice == NULL, "IVectorView_VoiceInformation_GetAt returned %p\n", voice); hr = IVectorView_VoiceInformation_GetMany(voices, size, 1, &voice, &size); - ok(hr == S_OK, "IVectorView_VoiceInformation_GetMany failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_VoiceInformation_GetMany failed, hr %#lx\n", hr); ok(size == 0, "IVectorView_VoiceInformation_GetMany returned count %u\n", size); IVectorView_VoiceInformation_Release(voices); @@ -280,25 +280,25 @@ static void test_SpeechSynthesizer(void) IInspectable_Release(inspectable); hr = IActivationFactory_QueryInterface(factory, &IID_ISpeechSynthesizer, (void **)&synthesizer); - ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); hr = RoActivateInstance(str, &inspectable); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IInspectable_QueryInterface(inspectable, &IID_ISpeechSynthesizer, (void **)&synthesizer); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IInspectable_QueryInterface(inspectable, &IID_IClosable, (void **)&closable); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ref = IClosable_Release(closable); - ok(ref == 2, "Got unexpected ref %u.\n", ref); + ok(ref == 2, "Got unexpected ref %lu.\n", ref); ref = ISpeechSynthesizer_Release(synthesizer); - ok(ref == 1, "Got unexpected ref %u.\n", ref); + ok(ref == 1, "Got unexpected ref %lu.\n", ref); ref = IInspectable_Release(inspectable); - ok(!ref, "Got unexpected ref %u.\n", ref); + ok(!ref, "Got unexpected ref %lu.\n", ref); IActivationFactory_Release(factory); WindowsDeleteString(str); @@ -315,13 +315,13 @@ static void test_VoiceInformation(void) HRESULT hr; hr = RoInitialize(RO_INIT_MULTITHREADED); - ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); + ok(hr == S_OK, "RoInitialize failed, hr %#lx\n", hr); hr = WindowsCreateString(voice_information_name, wcslen(voice_information_name), &str); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); - ok(hr == REGDB_E_CLASSNOTREG, "RoGetActivationFactory returned unexpected hr %#x\n", hr); + ok(hr == REGDB_E_CLASSNOTREG, "RoGetActivationFactory returned unexpected hr %#lx\n", hr); WindowsDeleteString(str); -- 2.35.1

1 0

[tools v2] testbot/web: Explicitly call exit on return from Redirect().
by Francois Gouget 10 Mar '22

10 Mar '22

Having Redirect() call exit() itself is confusing and requires documenting that it does not return in each call point and/or adding a defensive exit() call anyway. Using the exit(Redirect(...)) construct is more explicit, concise and robust. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Remove a chunk that was patching a debug web page that's specific to my test site. --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 18 +++++++----------- testbot/lib/ObjectModel/CGI/ItemPage.pm | 10 ++++------ testbot/lib/ObjectModel/CGI/Page.pm | 2 +- testbot/lib/WineTestBot/CGI/PageBase.pm | 6 +++--- testbot/web/JobDetails.pl | 8 +++----- testbot/web/Login.pl | 3 +-- testbot/web/Submit.pl | 13 +++---------- testbot/web/admin/Log.pl | 4 ++-- testbot/web/admin/SpecialJobs.pl | 3 +-- testbot/web/admin/UserDetails.pl | 9 +++------ 10 files changed, 28 insertions(+), 48 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index a5e8187009..9027b87758 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -539,20 +539,16 @@ sub OnAction($$) "=" . uri_escape($MasterColValues->[$ColIndex]); } } - $self->{EnclosingPage}->Redirect($Target); - return 1; + exit($self->{EnclosingPage}->Redirect($Target)); } - else + + my $Ok = 1; + foreach my $Key (@{$self->{Collection}->GetKeys()}) { - my $Ok = 1; - foreach my $Key (@{$self->{Collection}->GetKeys()}) + if (defined $self->{EnclosingPage}->GetParam($self->SelName($Key)) && $Ok) { - if (defined($self->{EnclosingPage}->GetParam($self->SelName($Key))) && - $Ok) - { - my $Item = $self->{Collection}->GetItem($Key); - $Ok = $self->CallOnItemAction($Item, $Action); - } + my $Item = $self->{Collection}->GetItem($Key); + $Ok = $self->CallOnItemAction($Item, $Action); } } } diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 6d9449173d..940115475f 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -151,13 +151,11 @@ sub OnAction($$) if ($Action eq "OK") { return !1 if (!$self->Save()); - $self->RedirectToList(); - exit; + exit($self->RedirectToList()); } - elsif ($Action eq "Cancel") + if ($Action eq "Cancel") { - $self->RedirectToList(); - exit; + exit($self->RedirectToList()); } return $self->SUPER::OnAction($Action); @@ -177,7 +175,7 @@ sub RedirectToList($) "=" . url_escape($MasterColValues->[$ColIndex]); } } - $self->Redirect($Target); # does not return + return $self->Redirect($Target); } 1; diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 8abaaaa9d2..b0450d0e78 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -246,7 +246,7 @@ sub Redirect($$) { my ($self, $Location) = @_; - $self->{PageBase}->Redirect($self, $Location); + return $self->{PageBase}->Redirect($self, $Location); } sub GetCurrentSession($) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index d38e8d96b6..b7edd8fcaa 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -56,7 +56,7 @@ sub new($$$$@) ! $Session->User->HasRole($RequiredRole)) { my $LoginURL = "/Login.pl?Target=" . uri_escape($ENV{"REQUEST_URI"}); - $self->Redirect($Page, MakeSecureURL($LoginURL)); + exit($self->Redirect($Page, MakeSecureURL($LoginURL))); } } @@ -75,7 +75,7 @@ sub CheckSecurePage($$) if ($UseSSL && ! SecureConnection()) { - $self->Redirect($Page, MakeSecureURL($ENV{"REQUEST_URI"})); + exit($self->Redirect($Page, MakeSecureURL($ENV{"REQUEST_URI"}))); } } @@ -415,7 +415,7 @@ sub Redirect($$$) } $self->{Request}->headers_out->set("Location", $Location); $self->{Request}->status(Apache2::Const::REDIRECT); - exit; + return 0; # a suitable exit code } sub GetCurrentSession($) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 919c7a5e3b..8d93957ce6 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -52,7 +52,7 @@ sub _initialize($$$) $self->{Job} = CreateJobs()->GetItem($JobId); if (!defined $self->{Job}) { - $self->Redirect("/"); # does not return + exit($self->Redirect("/")); } $self->{JobId} = $JobId; @@ -193,8 +193,7 @@ sub OnCancel($) return !1; } - $self->Redirect("/JobDetails.pl?Key=" . $self->{JobId}); # does not return - exit; + exit($self->Redirect("/JobDetails.pl?Key=" . $self->{JobId})); } sub OnRestart($) @@ -215,8 +214,7 @@ sub OnRestart($) return !1; } - $self->Redirect("/JobDetails.pl?Key=" . $self->{JobId}); # does not return - exit; + exit($self->Redirect("/JobDetails.pl?Key=" . $self->{JobId})); } sub OnAction($$$) diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index d9757edb92..ac64fc28ea 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -135,8 +135,7 @@ sub OnLogIn($) { $Target = "/"; } - $self->Redirect(MakeSecureURL($Target)); # does not return - exit; + exit($self->Redirect(MakeSecureURL($Target))); } sub OnAction($$) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 98d13381e0..79d1c8772d 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -1265,8 +1265,7 @@ sub _SubmitJob($$) return undef; } - $self->Redirect("/JobDetails.pl?Key=". $NewJob->GetKey()); # does not return - exit; + exit($self->Redirect("/JobDetails.pl?Key=". $NewJob->GetKey())); } sub OnSubmit($) @@ -1323,14 +1322,8 @@ sub OnOK($) { my ($self) = @_; - if (defined $self->{JobKey}) - { - $self->Redirect("/JobDetails.pl?Key=$self->{JobKey}"); # does not return - } - else - { - $self->Redirect("/"); # does not return - } + my $Target = defined $self->{JobKey} ? "/JobDetails.pl?Key=$self->{JobKey}" : "/"; + exit($self->Redirect($Target)); } sub OnAction($$) diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index cb253bd03e..456e73f55d 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -71,8 +71,8 @@ sub GetActions($) sub OnDownload($) { my ($self) = @_; - $self->Redirect("/admin/SendLog.pl?Hours=". $self->GetParam("Hours")); # does not return - exit; + + exit($self->Redirect("/admin/SendLog.pl?Hours=". $self->GetParam("Hours"))); } sub OnAction($$) diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl index 534336c483..02d9f8ea9d 100644 --- a/testbot/web/admin/SpecialJobs.pl +++ b/testbot/web/admin/SpecialJobs.pl @@ -237,8 +237,7 @@ sub OnSubmit($) return undef; } - $self->Redirect("/"); # does not return - exit; + exit($self->Redirect("/")); } sub OnAction($$) diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index 2cf0f597fb..8c26930e8e 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -74,8 +74,7 @@ sub OnApprove($) return !1 if (!$self->Save()); $self->{ErrMessage} = $self->{Item}->Approve(); return !1 if (defined $self->{ErrMessage}); - $self->RedirectToList(); # does not return - exit; + exit($self->RedirectToList()); } sub OnReject($) @@ -87,8 +86,7 @@ sub OnReject($) return !1 if (defined $self->{ErrMessage}); # Forcefully log out that user by deleting his web sessions DeleteSessions($self->{Item}); - $self->RedirectToList(); # does not return - exit; + exit($self->RedirectToList()); } sub OnOK($) @@ -101,8 +99,7 @@ sub OnOK($) # Forcefully log out that user by deleting his web sessions DeleteSessions($self->{Item}); } - $self->RedirectToList(); # does not return - exit; + exit($self->RedirectToList()); } sub OnAction($$) -- 2.30.2

1 0

The fu^H^Hpain is almost over
by Eric Pouech 10 Mar '22

10 Mar '22

The migration to long type (after the serie of this morning) is coming to an end What remains to be done: - migration of dlls/oleaut32/tests, dlls/ntdll/tests, dlls/user32/tests - all the D3D related modules (Henri's working on it) [1] - media speech (Berhnard's working on it) At the begining there were 745 modules to be migrated. Current situation: 78 modules yet to be migrated (D3D accounts for 53 of those) What's on hold - all the modules with a Unixlib, and the modules not yet migrated to cross compilation (and tools/winedump) [2]: strategy of migration to long type for ELF compilation (A) still be decided - dlls/user32: pending on (A) & interferes with win32u migration - dlls/nsi/tests: impacted by migration of dlls/nsiproxy.sys (in fact include/wine/nsi.h) and/or (A) For the remaining work: trying to limit the load on Marvin - for the (ntdll|user32)/tests modules: using a sub-module granularity and no serie of patches - that will allow to limit to number of changes per day - for (ntdll|user32)/tests (and the cleanup of kernel32/tests): trying to bypass Marvin for the patch which moves control of long type from module's Makefile to individual .c files cheers [1] dlls/d3d* dlls/d3d*/tests dlls/ddraw* dlls/ddraw*/tests dlls/dxgi* dlls/dxgi*/tests dlls/wined3d [2] Not yet migrated modules to long types | Module | Family | Why_Not_Migrated | | ------ | ------ | ---------------- | | dlls/capi2032 | | Unixlib | | dlls/nsiproxy.sys | nsi | Unixlib | | dlls/ntdll | | Unixlib | | dlls/openal32 | | no-cross | | dlls/opengl32 | | no-cross | | dlls/user32 | win32u | | | dlls/win32u | win32u | Unixlib | | dlls/winealsa.drv | | no-cross,Unixlib | | dlls/wineandroid.drv | | no-cross | | dlls/winecoreaudio.drv | | Unixlib | | dlls/winecrt0 | | (A) | | dlls/winemac.drv | | no-cross | | dlls/wineoss.drv | | no-cross | | dlls/winepulse.drv | | Unixlib | | dlls/wineusb.sys | | no-cross | | dlls/winevulkan | | Unixlib | | dlls/winex11.drv | | no-cross | | dlls/winspool.drv | | Unixlib | | dlls/nsi/tests | nsi | | | dlls/ntdll/tests | | | | dlls/oleaut32/tests | | | | dlls/user32/tests | | | | dlls/windows.media.speech/tests | | | | dlls/winmm/tests | | under review | | tools/winedump | | (A) | Unixlib: module with a Unixlib part no-cross: module not yet cross-compiled / linked with msvcrt/ucrtbase

1 0

[PATCH v4 4/4] ncrypt: Always map bcrypt return values.
by Hans Leidekker 10 Mar '22

10 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f7af49e6610..d7a79faecce 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -37,6 +37,7 @@ static SECURITY_STATUS map_ntstatus(NTSTATUS status) switch (status) { case STATUS_INVALID_HANDLE: return NTE_INVALID_HANDLE; + case NTE_BAD_DATA: return NTE_BAD_DATA; default: FIXME("unhandled status %#lx\n", status); return NTE_INTERNAL_ERROR; @@ -123,7 +124,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n static struct object *create_key_object(enum algid algid, NCRYPT_PROV_HANDLE provider) { struct object *object; - NTSTATUS ret; + NTSTATUS status; if (!(object = allocate_object(KEY))) { @@ -135,10 +136,10 @@ static struct object *create_key_object(enum algid algid, NCRYPT_PROV_HANDLE pro { case RSA: { - ret = BCryptOpenAlgorithmProvider(&object->key.bcrypt_alg, BCRYPT_RSA_ALGORITHM, NULL, 0); - if (ret != ERROR_SUCCESS) + status = BCryptOpenAlgorithmProvider(&object->key.bcrypt_alg, BCRYPT_RSA_ALGORITHM, NULL, 0); + if (status != STATUS_SUCCESS) { - ERR("Error opening algorithm provider\n"); + ERR("Error opening algorithm provider %#lx\n", status); free(object); return NULL; } @@ -174,7 +175,7 @@ SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCR if (!lstrcmpiW(algid, BCRYPT_RSA_ALGORITHM)) { - NTSTATUS ret; + NTSTATUS status; DWORD default_bitlen = 1024; if (!(object = create_key_object(RSA, provider))) @@ -183,13 +184,13 @@ SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCR return NTE_NO_MEMORY; } - ret = BCryptGenerateKeyPair(object->key.bcrypt_alg, &object->key.bcrypt_key, default_bitlen, 0); - if (ret != ERROR_SUCCESS) + status = BCryptGenerateKeyPair(object->key.bcrypt_alg, &object->key.bcrypt_key, default_bitlen, 0); + if (status != STATUS_SUCCESS) { - ERR("Error generating key pair\n"); + ERR("Error generating key pair %#lx\n", status); BCryptCloseAlgorithmProvider(object->key.bcrypt_alg, 0); free(object); - return NTE_INTERNAL_ERROR; + return map_ntstatus(status); } set_object_property(object, NCRYPT_LENGTH_PROPERTY, (BYTE *)&default_bitlen, sizeof(default_bitlen)); @@ -278,15 +279,16 @@ SECURITY_STATUS WINAPI NCryptFreeBuffer(PVOID buf) static SECURITY_STATUS free_key_object(struct key *key) { - NTSTATUS ret = BCryptDestroyKey(key->bcrypt_key); - if (BCryptCloseAlgorithmProvider(key->bcrypt_alg, 0)) return NTE_INVALID_HANDLE; - return ret ? NTE_INVALID_HANDLE : ERROR_SUCCESS; + NTSTATUS status, status2; + status = BCryptDestroyKey(key->bcrypt_key); + if ((status2 = BCryptCloseAlgorithmProvider(key->bcrypt_alg, 0))) return map_ntstatus(status2); + return status ? map_ntstatus(status) : ERROR_SUCCESS; } SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE handle) { struct object *object = (struct object *)handle; - SECURITY_STATUS ret = ERROR_SUCCESS; + SECURITY_STATUS ret = STATUS_SUCCESS; unsigned int i; TRACE("(%#Ix)\n", handle); @@ -378,7 +380,7 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H case BCRYPT_RSAPRIVATE_MAGIC: case BCRYPT_RSAPUBLIC_MAGIC: { - NTSTATUS ret; + NTSTATUS status; BCRYPT_RSAKEY_BLOB *rsablob = (BCRYPT_RSAKEY_BLOB *)data; if (!(object = create_key_object(RSA, provider))) @@ -387,13 +389,13 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H return NTE_NO_MEMORY; } - ret = BCryptImportKeyPair(object->key.bcrypt_alg, NULL, type, &object->key.bcrypt_key, data, datasize, 0); - if (ret != ERROR_SUCCESS) + status = BCryptImportKeyPair(object->key.bcrypt_alg, NULL, type, &object->key.bcrypt_key, data, datasize, 0); + if (status != STATUS_SUCCESS) { - WARN("Error importing key pair with bcrypt %#lx\n", ret); + WARN("Error importing key pair %#lx\n", status); BCryptCloseAlgorithmProvider(object->key.bcrypt_alg, 0); free(object); - return NTE_BAD_DATA; + return map_ntstatus(status); } set_object_property(object, NCRYPT_LENGTH_PROPERTY, (BYTE *)&rsablob->BitLength, sizeof(rsablob->BitLength)); -- 2.30.2

1 0

[PATCH v4 3/4] ncrypt: Implement NCryptFinalizeKey.
by Hans Leidekker 10 Mar '22

10 Mar '22

From: Santino Mazza <mazzasantino1206(a)gmail.com> v4: Map bcrypt return values. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 43 +++++++++++++++++++++++++++++++++++--- dlls/ncrypt/tests/ncrypt.c | 25 ++++++++++++++++++++++ 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f76d5885476..f7af49e6610 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -21,6 +21,8 @@ #include <stdarg.h> #include <stdlib.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "ncrypt.h" @@ -30,6 +32,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); +static SECURITY_STATUS map_ntstatus(NTSTATUS status) +{ + switch (status) + { + case STATUS_INVALID_HANDLE: return NTE_INVALID_HANDLE; + default: + FIXME("unhandled status %#lx\n", status); + return NTE_INTERNAL_ERROR; + } +} + static struct object *allocate_object(enum object_type type) { struct object *ret; @@ -227,10 +240,34 @@ SECURITY_STATUS WINAPI NCryptEnumKeys(NCRYPT_PROV_HANDLE provider, const WCHAR * return NTE_NOT_SUPPORTED; } -SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE key, DWORD flags) +SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE handle, DWORD flags) { - FIXME("(%#Ix, %#lx): stub\n", key, flags); - return NTE_NOT_SUPPORTED; + struct object *object = (struct object *)handle; + DWORD key_length; + struct object_property *prop; + NTSTATUS status; + + TRACE("(%#Ix, %#lx)\n", handle, flags); + + if (!object || object->type != KEY) return NTE_INVALID_HANDLE; + + if (!(prop = get_object_property(object, NCRYPT_LENGTH_PROPERTY))) return NTE_INVALID_HANDLE; + key_length = *(DWORD *)prop->value; + status = BCryptSetProperty(object->key.bcrypt_key, BCRYPT_KEY_LENGTH, (UCHAR *)&key_length, sizeof(key_length), 0); + if (status != STATUS_SUCCESS) + { + ERR("Error setting key length property\n"); + return map_ntstatus(status); + } + + status = BCryptFinalizeKeyPair(object->key.bcrypt_key, 0); + if (status != STATUS_SUCCESS) + { + ERR("Error finalizing key pair\n"); + return map_ntstatus(status); + } + + return ERROR_SUCCESS; } SECURITY_STATUS WINAPI NCryptFreeBuffer(PVOID buf) diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index ec69b236ac9..fc951fef80a 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -306,6 +306,30 @@ static void test_create_persisted_key(void) NCryptFreeObject(prov); } +static void test_finalize_key(void) +{ + NCRYPT_PROV_HANDLE prov; + NCRYPT_KEY_HANDLE key; + SECURITY_STATUS ret; + + ret = NCryptOpenStorageProvider(&prov, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptCreatePersistedKey(prov, &key, BCRYPT_RSA_ALGORITHM, NULL, 0, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptFinalizeKey(key, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptFinalizeKey(key, 0); + ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); + + ret = NCryptFinalizeKey(0, 0); + ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); + + NCryptFreeObject(key); +} + START_TEST(ncrypt) { test_key_import_rsa(); @@ -313,4 +337,5 @@ START_TEST(ncrypt) test_get_property(); test_set_property(); test_create_persisted_key(); + test_finalize_key(); } -- 2.30.2

1 0

[PATCH v4 2/4] bcrypt: Return an error when BCryptFinalizeKeyPair() is called twice.
by Hans Leidekker 10 Mar '22

10 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 1 + dlls/bcrypt/tests/bcrypt.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index e1b32be32a4..6862c5cdcf2 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -846,6 +846,7 @@ static NTSTATUS key_asymmetric_generate( void *args ) int ret; if (!libgnutls_handle) return STATUS_INTERNAL_ERROR; + if (key_data(key)->privkey) return STATUS_INVALID_HANDLE; switch (key->alg_id) { diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 8982e0ae90b..efb5843fa4e 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2157,6 +2157,9 @@ static void test_RSA(void) ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPRIVATE_BLOB, &key, rsaPrivateBlob, sizeof(rsaPrivateBlob), 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ret = BCryptFinalizeKeyPair(key, 0); + ok(ret == STATUS_INVALID_HANDLE, "got %#lx\n", ret); + size = 0; buf = HeapAlloc(GetProcessHeap(), 0, sizeof(rsaPrivateBlob)); ret = BCryptExportKey(key, NULL, BCRYPT_RSAPRIVATE_BLOB, buf, sizeof(rsaPrivateBlob), &size, 0); @@ -2565,6 +2568,9 @@ static void test_BCryptSignHash(void) ret = BCryptFinalizeKeyPair(key, 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ret = BCryptFinalizeKeyPair(key, 0); + ok(ret == STATUS_INVALID_HANDLE, "got %#lx\n", ret); + len = 0; memset(sig, 0, sizeof(sig)); -- 2.30.2

1 0

[PATCH v4 1/4] ncrypt: Implement NCryptCreatePersistedKey.
by Hans Leidekker 10 Mar '22

10 Mar '22

From: Santino Mazza <mazzasantino1206(a)gmail.com> v4: Trim the list of algorithms. Formatting. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 253 +++++++++++++++++++++------------- dlls/ncrypt/ncrypt_internal.h | 11 ++ dlls/ncrypt/tests/ncrypt.c | 8 +- 3 files changed, 177 insertions(+), 95 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 8ace3e55731..f76d5885476 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -30,12 +30,165 @@ WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); +static struct object *allocate_object(enum object_type type) +{ + struct object *ret; + if (!(ret = calloc(1, sizeof(*ret)))) return NULL; + ret->type = type; + return ret; +} + +static struct object_property *get_object_property(struct object *object, const WCHAR *name) +{ + unsigned int i; + for (i = 0; i < object->num_properties; i++) + { + struct object_property *property = &object->properties[i]; + if (!lstrcmpW(property->key, name)) return property; + } + return NULL; +} + +struct object_property *add_object_property(struct object *object, const WCHAR *name) +{ + struct object_property *property; + + if (!object->num_properties) + { + if (!(object->properties = malloc(sizeof(*property)))) + { + ERR("Error allocating memory.\n"); + return NULL; + } + property = &object->properties[object->num_properties++]; + } + else + { + struct object_property *tmp; + if (!(tmp = realloc(object->properties, sizeof(*property) * (object->num_properties + 1)))) + { + ERR("Error allocating memory.\n"); + return NULL; + } + object->properties = tmp; + property = &object->properties[object->num_properties++]; + } + + memset(property, 0, sizeof(*property)); + if (!(property->key = malloc((lstrlenW(name) + 1) * sizeof(WCHAR)))) + { + ERR("Error allocating memory.\n"); + return NULL; + } + + lstrcpyW(property->key, name); + return property; +} + +static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *name, BYTE *value, DWORD value_size) +{ + struct object_property *property = get_object_property(object, name); + void *tmp; + + if (!property && !(property = add_object_property(object, name))) return NTE_NO_MEMORY; + + property->value_size = value_size; + if (!(tmp = realloc(property->value, value_size))) + { + ERR("Error allocating memory.\n"); + free(property->key); + property->key = NULL; + return NTE_NO_MEMORY; + } + + property->value = tmp; + memcpy(property->value, value, value_size); + + return ERROR_SUCCESS; +} + +static struct object *create_key_object(enum algid algid, NCRYPT_PROV_HANDLE provider) +{ + struct object *object; + NTSTATUS ret; + + if (!(object = allocate_object(KEY))) + { + ERR("Error allocating memory\n"); + return NULL; + } + + switch (algid) + { + case RSA: + { + ret = BCryptOpenAlgorithmProvider(&object->key.bcrypt_alg, BCRYPT_RSA_ALGORITHM, NULL, 0); + if (ret != ERROR_SUCCESS) + { + ERR("Error opening algorithm provider\n"); + free(object); + return NULL; + } + + object->key.algid = RSA; + set_object_property(object, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)BCRYPT_RSA_ALGORITHM, + sizeof(BCRYPT_RSA_ALGORITHM)); + break; + } + default: + { + ERR("Invalid algid %#x\n", algid); + free(object); + return NULL; + } + } + + set_object_property(object, NCRYPT_PROVIDER_HANDLE_PROPERTY, (BYTE *)&provider, sizeof(provider)); + return object; +} + SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, const WCHAR *algid, const WCHAR *name, DWORD keyspec, DWORD flags) { - FIXME("(%#Ix, %p, %s, %s, %#lx, %#lx): stub\n", provider, key, wine_dbgstr_w(algid), + struct object *object; + + TRACE("(%#Ix, %p, %s, %s, %#lx, %#lx)\n", provider, key, wine_dbgstr_w(algid), wine_dbgstr_w(name), keyspec, flags); - return NTE_NOT_SUPPORTED; + + if (!provider) return NTE_INVALID_HANDLE; + if (!algid) return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); + if (name) FIXME("Persistant keys not supported\n"); + + if (!lstrcmpiW(algid, BCRYPT_RSA_ALGORITHM)) + { + NTSTATUS ret; + DWORD default_bitlen = 1024; + + if (!(object = create_key_object(RSA, provider))) + { + ERR("Error allocating memory\n"); + return NTE_NO_MEMORY; + } + + ret = BCryptGenerateKeyPair(object->key.bcrypt_alg, &object->key.bcrypt_key, default_bitlen, 0); + if (ret != ERROR_SUCCESS) + { + ERR("Error generating key pair\n"); + BCryptCloseAlgorithmProvider(object->key.bcrypt_alg, 0); + free(object); + return NTE_INTERNAL_ERROR; + } + + set_object_property(object, NCRYPT_LENGTH_PROPERTY, (BYTE *)&default_bitlen, sizeof(default_bitlen)); + } + else + { + FIXME("Algorithm not handled %s\n", wine_dbgstr_w(algid)); + return NTE_NOT_SUPPORTED; + } + + *key = (NCRYPT_KEY_HANDLE)object; + return ERROR_SUCCESS; } SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD insize, void *padding, @@ -132,17 +285,6 @@ SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE handle) return ret; } -static struct object_property *get_object_property(struct object *object, const WCHAR *name) -{ - unsigned int i; - for (i = 0; i < object->num_properties; i++) - { - struct object_property *property = &object->properties[i]; - if (!lstrcmpW(property->key, name)) return property; - } - return NULL; -} - SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE handle, const WCHAR *name, BYTE *output, DWORD outsize, DWORD *result, DWORD flags) { @@ -163,72 +305,6 @@ SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE handle, const WCHAR *name return ERROR_SUCCESS; } -static struct object *allocate_object(enum object_type type) -{ - struct object *ret; - if (!(ret = calloc(1, sizeof(*ret)))) return NULL; - ret->type = type; - return ret; -} - -struct object_property *add_object_property(struct object *object, const WCHAR *name) -{ - struct object_property *property; - - if (!object->num_properties) - { - if (!(object->properties = malloc(sizeof(*property)))) - { - ERR("Error allocating memory.\n"); - return NULL; - } - property = &object->properties[object->num_properties++]; - } - else - { - struct object_property *tmp; - if (!(tmp = realloc(object->properties, sizeof(*property) * (object->num_properties + 1)))) - { - ERR("Error allocating memory.\n"); - return NULL; - } - object->properties = tmp; - property = &object->properties[object->num_properties++]; - } - - memset(property, 0, sizeof(*property)); - if (!(property->key = malloc((lstrlenW(name) + 1) * sizeof(WCHAR)))) - { - ERR("Error allocating memory.\n"); - return NULL; - } - - lstrcpyW(property->key, name); - return property; -} - -static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *name, BYTE *value, DWORD value_size) -{ - struct object_property *property = get_object_property(object, name); - void *tmp; - - if (!property && !(property = add_object_property(object, name))) return NTE_NO_MEMORY; - - property->value_size = value_size; - if (!(tmp = realloc(property->value, value_size))) - { - ERR("Error allocating memory.\n"); - free(property->key); - property->key = NULL; - return NTE_NO_MEMORY; - } - - property->value = tmp; - memcpy(property->value, value, value_size); - - return ERROR_SUCCESS; -} - SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE decrypt_key, const WCHAR *type, NCryptBufferDesc *params, NCRYPT_KEY_HANDLE *handle, BYTE *data, DWORD datasize, DWORD flags) @@ -259,12 +335,6 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H return NTE_BAD_FLAGS; } - if (!(object = allocate_object(KEY))) - { - ERR("Error allocating memory\n"); - return NTE_NO_MEMORY; - } - switch(header->Magic) { case BCRYPT_RSAFULLPRIVATE_MAGIC: @@ -273,13 +343,13 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H { NTSTATUS ret; BCRYPT_RSAKEY_BLOB *rsablob = (BCRYPT_RSAKEY_BLOB *)data; - ret = BCryptOpenAlgorithmProvider(&object->key.bcrypt_alg, BCRYPT_RSA_ALGORITHM, NULL, 0); - if (ret != ERROR_SUCCESS) + + if (!(object = create_key_object(RSA, provider))) { - ERR("Error opening algorithm provider\n"); - free(object); - return NTE_INTERNAL_ERROR; + ERR("Error allocating memory\n"); + return NTE_NO_MEMORY; } + ret = BCryptImportKeyPair(object->key.bcrypt_alg, NULL, type, &object->key.bcrypt_key, data, datasize, 0); if (ret != ERROR_SUCCESS) { @@ -289,14 +359,11 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H return NTE_BAD_DATA; } - set_object_property(object, NCRYPT_PROVIDER_HANDLE_PROPERTY, (BYTE *)&provider, sizeof(provider)); - set_object_property(object, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)BCRYPT_RSA_ALGORITHM, sizeof(BCRYPT_RSA_ALGORITHM)); set_object_property(object, NCRYPT_LENGTH_PROPERTY, (BYTE *)&rsablob->BitLength, sizeof(rsablob->BitLength)); break; } default: FIXME("Unhandled key magic %#lx\n", header->Magic); - free(object); return NTE_INVALID_PARAMETER; } diff --git a/dlls/ncrypt/ncrypt_internal.h b/dlls/ncrypt/ncrypt_internal.h index e5884c8871a..0ab20de14ad 100644 --- a/dlls/ncrypt/ncrypt_internal.h +++ b/dlls/ncrypt/ncrypt_internal.h @@ -18,8 +18,19 @@ #include <bcrypt.h> +enum algid +{ + /* symmetric */ + AES, + /* asymmetric */ + RSA, + DSA, + ECDSA, +}; + struct key { + enum algid algid; BCRYPT_ALG_HANDLE bcrypt_alg; BCRYPT_KEY_HANDLE bcrypt_key; }; diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index cf434054428..ec69b236ac9 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -229,6 +229,7 @@ static void test_set_property(void) { ret = NCryptSetProperty(key, NCRYPT_NAME_PROPERTY, (BYTE *)L"Key name", sizeof(L"Key name"), 0); ok(ret == NTE_NOT_SUPPORTED, "got %#lx\n", ret); + } NCryptFreeObject(key); key = 0; @@ -240,6 +241,8 @@ static void test_set_property(void) ret = NCryptSetProperty(key, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, sizeof(keylength), 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + todo_wine + { ret = NCryptSetProperty(key, NCRYPT_NAME_PROPERTY, (BYTE *)L"Key name", sizeof(L"Key name"), 0); ok(ret == NTE_NOT_SUPPORTED, "got %#lx\n", ret); @@ -261,7 +264,6 @@ static void test_create_persisted_key(void) ret = NCryptOpenStorageProvider(&prov, NULL, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); - todo_wine { key = 0; ret = NCryptCreatePersistedKey(0, &key, BCRYPT_RSA_ALGORITHM, NULL, 0, 0); ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); @@ -292,14 +294,16 @@ static void test_create_persisted_key(void) NCryptFinalizeKey(key, 0); NCryptFreeObject(key); + todo_wine + { key = 0; ret = NCryptCreatePersistedKey(prov, &key, BCRYPT_AES_ALGORITHM, NULL, 0, 0); ok(ret == ERROR_SUCCESS || broken(ret == NTE_NOT_SUPPORTED) /* win 7 */, "got %#lx\n", ret); if (ret == NTE_NOT_SUPPORTED) win_skip("broken, symmetric keys not supported.\n"); else ok(key, "got null handle\n"); + } NCryptFreeObject(prov); - } } START_TEST(ncrypt) -- 2.30.2

1 0

[PATCH 1/2] d3d11: Do not print a FIXME for dynamic linking in shader retrieval functions.
by Zebediah Figura 10 Mar '22

10 Mar '22

Many applications call GetShader functions with non-NULL class instance pointers despite never using dynamic linking, in an apparent attempt to save all device state. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d11/device.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8b0846498a5..f8d3e3f9c46 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1734,8 +1734,6 @@ static void STDMETHODCALLTYPE d3d11_device_context_PSGetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); - if (class_instances || class_instance_count) - FIXME("Dynamic linking not implemented yet.\n"); if (class_instance_count) *class_instance_count = 0; @@ -1792,8 +1790,6 @@ static void STDMETHODCALLTYPE d3d11_device_context_VSGetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); - if (class_instances || class_instance_count) - FIXME("Dynamic linking not implemented yet.\n"); if (class_instance_count) *class_instance_count = 0; @@ -1926,8 +1922,6 @@ static void STDMETHODCALLTYPE d3d11_device_context_GSGetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); - if (class_instances || class_instance_count) - FIXME("Dynamic linking not implemented yet.\n"); if (class_instance_count) *class_instance_count = 0; @@ -2393,8 +2387,6 @@ static void STDMETHODCALLTYPE d3d11_device_context_HSGetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); - if (class_instances || class_instance_count) - FIXME("Dynamic linking not implemented yet.\n"); if (class_instance_count) *class_instance_count = 0; @@ -2487,8 +2479,6 @@ static void STDMETHODCALLTYPE d3d11_device_context_DSGetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); - if (class_instances || class_instance_count) - FIXME("Dynamic linking not implemented yet.\n"); if (class_instance_count) *class_instance_count = 0; @@ -2607,8 +2597,6 @@ static void STDMETHODCALLTYPE d3d11_device_context_CSGetShader(ID3D11DeviceConte TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); - if (class_instances || class_instance_count) - FIXME("Dynamic linking not implemented yet.\n"); if (class_instance_count) *class_instance_count = 0; -- 2.35.1

2 3

[PATCH] wined3d: Do not print a d3d_perf warning in adapter_vk_alloc_bo() for unmapped BOs.
by Zebediah Figura 10 Mar '22

10 Mar '22

BOs will always be unmapped here. This is a relic from an older form of the code where mapping was done in wined3d_context_vk_create_bo(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 3e126e1ae3a..5ef5d76062a 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -21,7 +21,6 @@ #include "wine/vulkan_driver.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); -WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); static const struct wined3d_state_entry_template misc_state_template_vk[] = { @@ -1278,9 +1277,6 @@ static bool adapter_vk_alloc_bo(struct wined3d_device *device, struct wined3d_re if (!bo_vk->b.map_ptr) { - WARN_(d3d_perf)("BO %p (chunk %p, slab %p) is not mapped.\n", - bo_vk, bo_vk->memory ? bo_vk->memory->chunk : NULL, bo_vk->slab); - if (!wined3d_bo_vk_map(bo_vk, context_vk)) ERR("Failed to map bo.\n"); } -- 2.35.1

2 1

[PATCH 1/6] windows.gaming.input: Implement IRawGameControllerStatics_get_RawGameControllers.
by Rémi Bernon 10 Mar '22

10 Mar '22

It is important to add RawGameController instances to the vector in the initialization callback, because some games check the vector, as well as the Gamepad class vector in the OnGameControllerAdded callback. This also removes the OnGameControllerAdded failure case, to avoid leaking controllers that were already added to the controller vector, and instead rely on the OnGameControllerRemoved call to do the cleanup. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/joystick8.c | 9 +-- dlls/windows.gaming.input/controller.c | 82 +++++++++++++++++++++----- dlls/windows.gaming.input/manager.c | 6 +- 3 files changed, 70 insertions(+), 27 deletions(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 2d801aacda2..e74e76482f9 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -3340,17 +3340,10 @@ static void test_windows_gaming_input(void) ok( hr == S_OK, "get_RawGameControllers returned %#lx\n", hr ); hr = IVectorView_RawGameController_get_Size( controllers_view, &size ); ok( hr == S_OK, "get_Size returned %#lx\n", hr ); - todo_wine ok( size == 1, "got size %u\n", size ); hr = IVectorView_RawGameController_GetAt( controllers_view, 0, &raw_controller ); - todo_wine ok( hr == S_OK, "GetAt returned %#lx\n", hr ); IVectorView_RawGameController_Release( controllers_view ); - if (hr != S_OK) - { - IRawGameControllerStatics_Release( controller_statics ); - goto done; - } /* HID gamepads aren't exposed as WGI gamepads on Windows */ @@ -3372,6 +3365,7 @@ static void test_windows_gaming_input(void) check_interface( raw_controller, &IID_IInspectable, TRUE ); check_interface( raw_controller, &IID_IAgileObject, TRUE ); check_interface( raw_controller, &IID_IRawGameController, TRUE ); + todo_wine check_interface( raw_controller, &IID_IRawGameController2, TRUE ); check_interface( raw_controller, &IID_IGameController, TRUE ); check_interface( raw_controller, &IID_IGamepad, FALSE ); @@ -3384,6 +3378,7 @@ static void test_windows_gaming_input(void) check_interface( game_controller, &IID_IInspectable, TRUE ); check_interface( game_controller, &IID_IAgileObject, TRUE ); check_interface( game_controller, &IID_IRawGameController, TRUE ); + todo_wine check_interface( game_controller, &IID_IRawGameController2, TRUE ); check_interface( game_controller, &IID_IGameController, TRUE ); check_interface( game_controller, &IID_IGamepad, FALSE ); diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c index 9fb1b1a69a2..51ede5a0e47 100644 --- a/dlls/windows.gaming.input/controller.c +++ b/dlls/windows.gaming.input/controller.c @@ -24,6 +24,36 @@ WINE_DEFAULT_DEBUG_CHANNEL(input); +static CRITICAL_SECTION controller_cs; +static CRITICAL_SECTION_DEBUG controller_cs_debug = +{ + 0, 0, &controller_cs, + { &controller_cs_debug.ProcessLocksList, &controller_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": controller_cs") } +}; +static CRITICAL_SECTION controller_cs = { &controller_cs_debug, -1, 0, 0, 0, 0 }; + +static IVector_RawGameController *controllers; + +static HRESULT init_controllers(void) +{ + static const struct vector_iids iids = + { + .vector = &IID_IVector_RawGameController, + .view = &IID_IVectorView_RawGameController, + .iterable = &IID_IIterable_RawGameController, + .iterator = &IID_IIterator_RawGameController, + }; + HRESULT hr; + + EnterCriticalSection( &controller_cs ); + if (controllers) hr = S_OK; + else hr = vector_create( &iids, (void **)&controllers ); + LeaveCriticalSection( &controller_cs ); + + return hr; +} + struct controller { IGameControllerImpl IGameControllerImpl_iface; @@ -118,13 +148,19 @@ static HRESULT WINAPI controller_Initialize( IGameControllerImpl *iface, IGameCo IGameControllerProvider *provider ) { struct controller *impl = impl_from_IGameControllerImpl( iface ); + HRESULT hr; TRACE( "iface %p, outer %p, provider %p.\n", iface, outer, provider ); impl->IGameController_outer = outer; IGameControllerProvider_AddRef( (impl->provider = provider) ); - return S_OK; + EnterCriticalSection( &controller_cs ); + if (SUCCEEDED(hr = init_controllers())) + hr = IVector_RawGameController_Append( controllers, &impl->IRawGameController_iface ); + LeaveCriticalSection( &controller_cs ); + + return hr; } static const struct IGameControllerImplVtbl controller_vtbl = @@ -381,23 +417,14 @@ static HRESULT WINAPI statics_remove_RawGameControllerRemoved( IRawGameControlle static HRESULT WINAPI statics_get_RawGameControllers( IRawGameControllerStatics *iface, IVectorView_RawGameController **value ) { - static const struct vector_iids iids = - { - .vector = &IID_IVector_RawGameController, - .view = &IID_IVectorView_RawGameController, - .iterable = &IID_IIterable_RawGameController, - .iterator = &IID_IIterator_RawGameController, - }; - IVector_RawGameController *controllers; HRESULT hr; TRACE( "iface %p, value %p.\n", iface, value ); - if (SUCCEEDED(hr = vector_create( &iids, (void **)&controllers ))) - { + EnterCriticalSection( &controller_cs ); + if (SUCCEEDED(hr = init_controllers())) hr = IVector_RawGameController_GetView( controllers, value ); - IVector_RawGameController_Release( controllers ); - } + LeaveCriticalSection( &controller_cs ); return hr; } @@ -468,8 +495,33 @@ static HRESULT WINAPI controller_factory_OnGameControllerAdded( ICustomGameContr static HRESULT WINAPI controller_factory_OnGameControllerRemoved( ICustomGameControllerFactory *iface, IGameController *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + IRawGameController *controller; + BOOLEAN found; + UINT32 index; + HRESULT hr; + + TRACE( "iface %p, value %p.\n", iface, value ); + + if (FAILED(hr = IGameController_QueryInterface( value, &IID_IRawGameController, (void **)&controller ))) + return hr; + + EnterCriticalSection( &controller_cs ); + if (SUCCEEDED(hr = init_controllers())) + { + if (FAILED(hr = IVector_RawGameController_IndexOf( controllers, controller, &index, &found )) || !found) + WARN( "Could not find controller %p, hr %#lx!\n", controller, hr ); + else + hr = IVector_RawGameController_RemoveAt( controllers, index ); + } + LeaveCriticalSection( &controller_cs ); + + if (FAILED(hr)) + WARN( "Failed to remove controller %p, hr %#lx!\n", controller, hr ); + else if (found) + TRACE( "Removed controller %p.\n", controller ); + IRawGameController_Release( controller ); + + return S_OK; } static const struct ICustomGameControllerFactoryVtbl controller_factory_vtbl = diff --git a/dlls/windows.gaming.input/manager.c b/dlls/windows.gaming.input/manager.c index 489588a68ab..6a8963a1fc4 100644 --- a/dlls/windows.gaming.input/manager.c +++ b/dlls/windows.gaming.input/manager.c @@ -502,11 +502,7 @@ void manager_on_provider_created( IGameControllerProvider *provider ) controller = LIST_ENTRY( entry, struct controller, entry ); hr = ICustomGameControllerFactory_OnGameControllerAdded( controller->factory, &controller->IGameController_iface ); - if (FAILED(hr)) - { - list_remove( &controller->entry ); - IGameController_Release( &controller->IGameController_iface ); - } + if (FAILED(hr)) WARN( "OnGameControllerAdded failed, hr %#lx\n", hr ); if (next == &controller_list) break; } -- 2.35.1

2 6

[PATCH 0/5] wined3d: Rework resource fencing (v2).
by Stefan Dösinger 10 Mar '22

10 Mar '22

Changes in version 2 of this patchset: *) Rename resource_acquire to resource_reference. *) Simplify the wrap-around logic (thanks Jan!). Some updated benchmarking information: Keeping a separate counter for fencing instead of re-using head and tail has a measurable performance impact in my draw overhead microbenchmark. In World of Tanks the full 32 bit head/tail numbers wrap around within 3-4 minutes rather than a few hours as I concluded earlier from my microbenchmarks. In a way this is welcome - the wrap-around logic is actually used rather than untested dead code. It might make the phantom waits described in patch 2 a bit more likely though. Should this become an issue I believe we can change head and tail to SIZE_T or ULONGLONG. I could not measure any performance impact of a 64 bit counter vs a 32 bit counter. I tested it in 32 bit client on a 64 bit CPU. I don't have a multicore 32 bit CPU available for testing in a pure 32 bit setup. This is the patchset described in https://www.winehq.org/pipermail/wine-devel/2022-January/204020.html . It simplifies and speeds up d3d resource tracking in a few ways: *) Completely remove any burden on the CS thread. *) Replace interlocked ops on the client thread with a plain assignment. *) Piggy-pack onto the queue's head and tail counters, which we already increment with interlocked ops. I tested the impact with a microbenchmark: https://github.com/stefand/perftest/blob/main/resource_tracking_d3d11/resou… Depending on the CPU it doubles or tripples draw speed in that microbenchmark. In real games the effect is much less pronounced, but I do see about a 2% gain in World of Tanks. I also see a gain in Rocket League, but only if I hack away other known issues with Rocket League (UpdateSubResource in particular). I have further improvements to resource tracking in my mind that can be done on top of these patches: *) Separate read and write access times. *) Remove draw and compute tracking for d3d10+ clients and only track staging resources. Matteo had some ideas to make the queue multi-writer thread safe to further reduce the use of wined3d_cs. This patchset makes this a bit more complicated because the head value cannot be infered from the return value of require_space() and thus needs to be passed around separately to submit(). This can be done either with thread local storage or via a separate parameter to require_space() and submit(). Stefan Dösinger (5): wined3d: Use extra bits in the queue head and tail counters. wined3d: Use the default queue index for resource fencing. wined3d: Remove the no-op wined3d_resource_release. wined3d: Remove the resource_acquire call in resource_cleanup. wined3d: Rename resource_acquire to resource_reference. dlls/wined3d/cs.c | 276 +++++++++------------------------ dlls/wined3d/resource.c | 2 - dlls/wined3d/wined3d_private.h | 68 ++++++-- 3 files changed, 123 insertions(+), 223 deletions(-) -- 2.34.1

4 14

[PATCH] dlls/windows.media.speech/tests: enable compilation with long types
by Eric Pouech 10 Mar '22

10 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/windows.media.speech/tests/Makefile.in | 1 dlls/windows.media.speech/tests/speech.c | 60 ++++++++++++++------------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/windows.media.speech/tests/Makefile.in b/dlls/windows.media.speech/tests/Makefile.in index e1616991573..2ee10d3db21 100644 --- a/dlls/windows.media.speech/tests/Makefile.in +++ b/dlls/windows.media.speech/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = windows.media.speech.dll IMPORTS = combase uuid diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 38fd5c90dd0..df00f407bc7 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -56,10 +56,10 @@ static void test_SpeechSynthesizer(void) ULONG ref; hr = RoInitialize(RO_INIT_MULTITHREADED); - ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); + ok(hr == S_OK, "RoInitialize failed, hr %#lx\n", hr); hr = WindowsCreateString(speech_synthesizer_name, wcslen(speech_synthesizer_name), &str); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); hdll = LoadLibraryW(L"windows.media.speech.dll"); if (hdll) @@ -68,31 +68,31 @@ static void test_SpeechSynthesizer(void) ok(!!pDllGetActivationFactory, "DllGetActivationFactory not found.\n"); hr = WindowsCreateString(unknown_class_name, wcslen(unknown_class_name), &str2); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); hr = pDllGetActivationFactory(str2, &factory); - ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Got unexpected hr %#lx.\n", hr); WindowsDeleteString(str2); hr = WindowsCreateString(speech_synthesizer_name2, wcslen(speech_synthesizer_name2), &str2); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); hr = pDllGetActivationFactory(str2, &factory2); - ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Got unexpected hr %#lx.\n", hr); WindowsDeleteString(str2); hr = pDllGetActivationFactory(str, &factory2); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); } else { - win_skip("Failed to load library, err %u.\n", GetLastError()); + win_skip("Failed to load library, err %lu.\n", GetLastError()); } hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); - ok(hr == S_OK, "RoGetActivationFactory failed, hr %#x\n", hr); + ok(hr == S_OK, "RoGetActivationFactory failed, hr %#lx\n", hr); if (hdll) { @@ -102,47 +102,47 @@ static void test_SpeechSynthesizer(void) } hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#lx\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IAgileObject, (void **)&agile_object); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#lx\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IInstalledVoicesStatic, (void **)&voices_static); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInstalledVoicesStatic failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInstalledVoicesStatic failed, hr %#lx\n", hr); hr = IInstalledVoicesStatic_QueryInterface(voices_static, &IID_IInspectable, (void **)&tmp_inspectable); - ok(hr == S_OK, "IInstalledVoicesStatic_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(hr == S_OK, "IInstalledVoicesStatic_QueryInterface IID_IInspectable failed, hr %#lx\n", hr); ok(tmp_inspectable == inspectable, "IInstalledVoicesStatic_QueryInterface IID_IInspectable returned %p, expected %p\n", tmp_inspectable, inspectable); IInspectable_Release(tmp_inspectable); hr = IInstalledVoicesStatic_QueryInterface(voices_static, &IID_IAgileObject, (void **)&tmp_agile_object); - ok(hr == S_OK, "IInstalledVoicesStatic_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(hr == S_OK, "IInstalledVoicesStatic_QueryInterface IID_IAgileObject failed, hr %#lx\n", hr); ok(tmp_agile_object == agile_object, "IInstalledVoicesStatic_QueryInterface IID_IAgileObject returned %p, expected %p\n", tmp_agile_object, agile_object); IAgileObject_Release(tmp_agile_object); hr = IInstalledVoicesStatic_get_AllVoices(voices_static, &voices); - ok(hr == S_OK, "IInstalledVoicesStatic_get_AllVoices failed, hr %#x\n", hr); + ok(hr == S_OK, "IInstalledVoicesStatic_get_AllVoices failed, hr %#lx\n", hr); hr = IVectorView_VoiceInformation_QueryInterface(voices, &IID_IInspectable, (void **)&tmp_inspectable); - ok(hr == S_OK, "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#lx\n", hr); ok(tmp_inspectable != inspectable, "IVectorView_VoiceInformation_QueryInterface voices returned %p, expected %p\n", tmp_inspectable, inspectable); IInspectable_Release(tmp_inspectable); hr = IVectorView_VoiceInformation_QueryInterface(voices, &IID_IAgileObject, (void **)&tmp_agile_object); - ok(hr == E_NOINTERFACE, "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr); + ok(hr == E_NOINTERFACE, "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#lx\n", hr); size = 0xdeadbeef; hr = IVectorView_VoiceInformation_get_Size(voices, &size); - ok(hr == S_OK, "IVectorView_VoiceInformation_get_Size voices failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_VoiceInformation_get_Size voices failed, hr %#lx\n", hr); todo_wine ok(size != 0 && size != 0xdeadbeef, "IVectorView_VoiceInformation_get_Size returned %u\n", size); voice = (IVoiceInformation *)0xdeadbeef; hr = IVectorView_VoiceInformation_GetAt(voices, size, &voice); - ok(hr == E_BOUNDS, "IVectorView_VoiceInformation_GetAt failed, hr %#x\n", hr); + ok(hr == E_BOUNDS, "IVectorView_VoiceInformation_GetAt failed, hr %#lx\n", hr); ok(voice == NULL, "IVectorView_VoiceInformation_GetAt returned %p\n", voice); hr = IVectorView_VoiceInformation_GetMany(voices, size, 1, &voice, &size); - ok(hr == S_OK, "IVectorView_VoiceInformation_GetMany failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_VoiceInformation_GetMany failed, hr %#lx\n", hr); ok(size == 0, "IVectorView_VoiceInformation_GetMany returned count %u\n", size); IVectorView_VoiceInformation_Release(voices); @@ -153,25 +153,25 @@ static void test_SpeechSynthesizer(void) IInspectable_Release(inspectable); hr = IActivationFactory_QueryInterface(factory, &IID_ISpeechSynthesizer, (void **)&synthesizer); - ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); hr = RoActivateInstance(str, &inspectable); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IInspectable_QueryInterface(inspectable, &IID_ISpeechSynthesizer, (void **)&synthesizer); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IInspectable_QueryInterface(inspectable, &IID_IClosable, (void **)&closable); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ref = IClosable_Release(closable); - ok(ref == 2, "Got unexpected ref %u.\n", ref); + ok(ref == 2, "Got unexpected ref %lu.\n", ref); ref = ISpeechSynthesizer_Release(synthesizer); - ok(ref == 1, "Got unexpected ref %u.\n", ref); + ok(ref == 1, "Got unexpected ref %lu.\n", ref); ref = IInspectable_Release(inspectable); - ok(!ref, "Got unexpected ref %u.\n", ref); + ok(!ref, "Got unexpected ref %lu.\n", ref); IActivationFactory_Release(factory); WindowsDeleteString(str); @@ -188,13 +188,13 @@ static void test_VoiceInformation(void) HRESULT hr; hr = RoInitialize(RO_INIT_MULTITHREADED); - ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); + ok(hr == S_OK, "RoInitialize failed, hr %#lx\n", hr); hr = WindowsCreateString(voice_information_name, wcslen(voice_information_name), &str); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); - ok(hr == REGDB_E_CLASSNOTREG, "RoGetActivationFactory returned unexpected hr %#x\n", hr); + ok(hr == REGDB_E_CLASSNOTREG, "RoGetActivationFactory returned unexpected hr %#lx\n", hr); WindowsDeleteString(str);

4 6

[PATCH] dlls/wtsapi32/tests: enable compilation with long types
by Eric Pouech 10 Mar '22

10 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wtsapi32/tests/Makefile.in | 1 dlls/wtsapi32/tests/wtsapi.c | 90 ++++++++++++++++++++------------------- 2 files changed, 45 insertions(+), 46 deletions(-) diff --git a/dlls/wtsapi32/tests/Makefile.in b/dlls/wtsapi32/tests/Makefile.in index 1b18073bdac..57014aea938 100644 --- a/dlls/wtsapi32/tests/Makefile.in +++ b/dlls/wtsapi32/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wtsapi32.dll IMPORTS = wtsapi32 advapi32 psapi diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 3eec81d8556..32caa05588c 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -64,7 +64,7 @@ static void check_wts_process_info(const WTS_PROCESS_INFOW *info, DWORD count) nt_length *= 2; nt_info = realloc(nt_info, nt_length); } - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); for (i = 0; i < count; i++) { @@ -75,11 +75,11 @@ static void check_wts_process_info(const WTS_PROCESS_INFOW *info, DWORD count) DWORD size; nt_process = find_nt_process_info(nt_info, info[i].ProcessId); - ok(!!nt_process, "failed to find pid %#x\n", info[i].ProcessId); + ok(!!nt_process, "failed to find pid %#lx\n", info[i].ProcessId); - winetest_push_context("pid %#x", info[i].ProcessId); + winetest_push_context("pid %#lx", info[i].ProcessId); - ok(info[i].SessionId == nt_process->SessionId, "expected session id %#x, got %#x\n", + ok(info[i].SessionId == nt_process->SessionId, "expected session id %#lx, got %#lx\n", nt_process->SessionId, info[i].SessionId); ok(!memcmp(info[i].pProcessName, nt_process->ProcessName.Buffer, nt_process->ProcessName.Length), @@ -89,9 +89,9 @@ static void check_wts_process_info(const WTS_PROCESS_INFOW *info, DWORD count) if ((process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, info[i].ProcessId))) { ret = OpenProcessToken(process, TOKEN_QUERY, &token); - ok(ret, "failed to open token, error %u\n", GetLastError()); + ok(ret, "failed to open token, error %lu\n", GetLastError()); ret = GetTokenInformation(token, TokenUser, sid_buffer, sizeof(sid_buffer), &size); - ok(ret, "failed to get token user, error %u\n", GetLastError()); + ok(ret, "failed to get token user, error %lu\n", GetLastError()); ok(EqualSid(info[i].pUserSid, sid->Sid), "SID did not match\n"); CloseHandle(token); CloseHandle(process); @@ -117,33 +117,33 @@ static void test_WTSEnumerateProcessesW(void) SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 1, 1, &info, &count); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); - ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); + ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %ld\n", GetLastError()); WTSFreeMemory(info); info = NULL; SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 0, &info, &count); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); - ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); + ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %ld\n", GetLastError()); WTSFreeMemory(info); info = NULL; SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 2, &info, &count); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); - ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); + ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %ld\n", GetLastError()); WTSFreeMemory(info); SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 1, NULL, &count); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); - ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); + ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %ld\n", GetLastError()); info = NULL; SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 1, &info, NULL); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); - ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); + ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %ld\n", GetLastError()); WTSFreeMemory(info); count = 0; @@ -151,7 +151,7 @@ static void test_WTSEnumerateProcessesW(void) SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 1, &info, &count); ok(ret, "expected success\n"); - ok(!GetLastError(), "got error %u\n", GetLastError()); + ok(!GetLastError(), "got error %lu\n", GetLastError()); check_wts_process_info(info, count); WTSFreeMemory(info); @@ -167,14 +167,14 @@ static void test_WTSEnumerateProcessesW(void) count = 0xdeadbeef; ret = pWTSEnumerateProcessesExW(WTS_CURRENT_SERVER_HANDLE, &level, WTS_ANY_SESSION, NULL, &count); ok(!ret, "expected failure\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError()); - ok(count == 0xdeadbeef, "got count %u\n", count); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError()); + ok(count == 0xdeadbeef, "got count %lu\n", count); info = (void *)0xdeadbeef; SetLastError(0xdeadbeef); ret = pWTSEnumerateProcessesExW(WTS_CURRENT_SERVER_HANDLE, &level, WTS_ANY_SESSION, (WCHAR **)&info, NULL); ok(!ret, "expected failure\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError()); ok(info == (void *)0xdeadbeef, "got info %p\n", info); info = NULL; @@ -182,7 +182,7 @@ static void test_WTSEnumerateProcessesW(void) SetLastError(0xdeadbeef); ret = pWTSEnumerateProcessesExW(WTS_CURRENT_SERVER_HANDLE, &level, WTS_ANY_SESSION, (WCHAR **)&info, &count); ok(ret, "expected success\n"); - ok(!GetLastError(), "got error %u\n", GetLastError()); + ok(!GetLastError(), "got error %lu\n", GetLastError()); check_wts_process_info(info, count); pWTSFreeMemoryExW(WTSTypeProcessInfoLevel0, info, count); } @@ -197,91 +197,91 @@ static void test_WTSQuerySessionInformation(void) SetLastError(0xdeadbeef); count = 0; ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); - ok(!ret, "got %u\n", GetLastError()); - ok(count == 0, "got %u\n", count); - ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + ok(!ret, "got %lu\n", GetLastError()); + ok(count == 0, "got %lu\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %lu\n", GetLastError()); SetLastError(0xdeadbeef); count = 1; ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); - ok(!ret, "got %u\n", GetLastError()); - ok(count == 1, "got %u\n", count); - ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + ok(!ret, "got %lu\n", GetLastError()); + ok(count == 1, "got %lu\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf1, NULL); - ok(!ret, "got %u\n", GetLastError()); - ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + ok(!ret, "got %lu\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %lu\n", GetLastError()); count = 0; buf1 = NULL; ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf1, &count); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ok(buf1 != NULL, "buf not set\n"); - ok(count == (lstrlenW(buf1) + 1) * sizeof(WCHAR), "expected %u, got %u\n", (lstrlenW(buf1) + 1) * sizeof(WCHAR), count); + ok(count == (lstrlenW(buf1) + 1) * sizeof(WCHAR), "expected %Iu, got %lu\n", (lstrlenW(buf1) + 1) * sizeof(WCHAR), count); tempsize = UNLEN + 1; GetUserNameW(usernameW, &tempsize); /* Windows Vista, 7 and 8 return uppercase username, while the rest return lowercase. */ ok(!wcsicmp(buf1, usernameW), "expected %s, got %s\n", wine_dbgstr_w(usernameW), wine_dbgstr_w(buf1)); - ok(count == tempsize * sizeof(WCHAR), "expected %u, got %u\n", tempsize * sizeof(WCHAR), count); + ok(count == tempsize * sizeof(WCHAR), "expected %Iu, got %lu\n", tempsize * sizeof(WCHAR), count); WTSFreeMemory(buf1); count = 0; buf1 = NULL; ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSDomainName, &buf1, &count); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ok(buf1 != NULL, "buf not set\n"); - ok(count == (lstrlenW(buf1) + 1) * sizeof(WCHAR), "expected %u, got %u\n", (lstrlenW(buf1) + 1) * sizeof(WCHAR), count); + ok(count == (lstrlenW(buf1) + 1) * sizeof(WCHAR), "expected %Iu, got %lu\n", (lstrlenW(buf1) + 1) * sizeof(WCHAR), count); tempsize = MAX_COMPUTERNAME_LENGTH + 1; GetComputerNameW(computernameW, &tempsize); /* Windows Vista, 7 and 8 return uppercase computername, while the rest return lowercase. */ ok(!wcsicmp(buf1, computernameW), "expected %s, got %s\n", wine_dbgstr_w(computernameW), wine_dbgstr_w(buf1)); - ok(count == (tempsize + 1) * sizeof(WCHAR), "expected %u, got %u\n", (tempsize + 1) * sizeof(WCHAR), count); + ok(count == (tempsize + 1) * sizeof(WCHAR), "expected %Iu, got %lu\n", (tempsize + 1) * sizeof(WCHAR), count); WTSFreeMemory(buf1); SetLastError(0xdeadbeef); count = 0; ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); - ok(!ret, "got %u\n", GetLastError()); - ok(count == 0, "got %u\n", count); - ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + ok(!ret, "got %lu\n", GetLastError()); + ok(count == 0, "got %lu\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %lu\n", GetLastError()); SetLastError(0xdeadbeef); count = 1; ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); - ok(!ret, "got %u\n", GetLastError()); - ok(count == 1, "got %u\n", count); - ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + ok(!ret, "got %lu\n", GetLastError()); + ok(count == 1, "got %lu\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf2, NULL); - ok(!ret, "got %u\n", GetLastError()); - ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + ok(!ret, "got %lu\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %lu\n", GetLastError()); count = 0; buf2 = NULL; ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf2, &count); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ok(buf2 != NULL, "buf not set\n"); - ok(count == lstrlenA(buf2) + 1, "expected %u, got %u\n", lstrlenA(buf2) + 1, count); + ok(count == lstrlenA(buf2) + 1, "expected %u, got %lu\n", lstrlenA(buf2) + 1, count); tempsize = UNLEN + 1; GetUserNameA(username, &tempsize); /* Windows Vista, 7 and 8 return uppercase username, while the rest return lowercase. */ ok(!stricmp(buf2, username), "expected %s, got %s\n", username, buf2); - ok(count == tempsize, "expected %u, got %u\n", tempsize, count); + ok(count == tempsize, "expected %lu, got %lu\n", tempsize, count); WTSFreeMemory(buf2); count = 0; buf2 = NULL; ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSDomainName, &buf2, &count); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ok(buf2 != NULL, "buf not set\n"); - ok(count == lstrlenA(buf2) + 1, "expected %u, got %u\n", lstrlenA(buf2) + 1, count); + ok(count == lstrlenA(buf2) + 1, "expected %u, got %lu\n", lstrlenA(buf2) + 1, count); tempsize = MAX_COMPUTERNAME_LENGTH + 1; GetComputerNameA(computername, &tempsize); /* Windows Vista, 7 and 8 return uppercase computername, while the rest return lowercase. */ ok(!stricmp(buf2, computername), "expected %s, got %s\n", computername, buf2); - ok(count == tempsize + 1, "expected %u, got %u\n", tempsize + 1, count); + ok(count == tempsize + 1, "expected %lu, got %lu\n", tempsize + 1, count); WTSFreeMemory(buf2); } @@ -292,7 +292,7 @@ static void test_WTSQueryUserToken(void) SetLastError(0xdeadbeef); ret = WTSQueryUserToken(WTS_CURRENT_SESSION, NULL); ok(!ret, "expected WTSQueryUserToken to fail\n"); - ok(GetLastError()==ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); + ok(GetLastError()==ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %ld\n", GetLastError()); } START_TEST (wtsapi)

1 0

[PATCH] dlls/wsdapi/tests: enable compilation with long types
by Eric Pouech 10 Mar '22

10 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wsdapi/tests/Makefile.in | 1 dlls/wsdapi/tests/address.c | 108 ++++++++++++++++++----------------- dlls/wsdapi/tests/discovery.c | 108 ++++++++++++++++++----------------- dlls/wsdapi/tests/msgparams.c | 86 ++++++++++++++-------------- dlls/wsdapi/tests/xml.c | 126 +++++++++++++++++++++-------------------- 5 files changed, 214 insertions(+), 215 deletions(-) diff --git a/dlls/wsdapi/tests/Makefile.in b/dlls/wsdapi/tests/Makefile.in index 2198c066369..eaefa3a962b 100644 --- a/dlls/wsdapi/tests/Makefile.in +++ b/dlls/wsdapi/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wsdapi.dll IMPORTS = wsdapi ole32 oleaut32 user32 ws2_32 advapi32 iphlpapi rpcrt4 diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index dd3e048c25c..4e021a4e65a 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -39,39 +39,39 @@ static void CreateUdpAddress_tests(void) ULONG ref; rc = WSDCreateUdpAddress(NULL); - ok((rc == E_POINTER) || (rc == E_INVALIDARG), "WSDCreateUDPAddress(NULL) failed: %08x\n", rc); + ok((rc == E_POINTER) || (rc == E_INVALIDARG), "WSDCreateUDPAddress(NULL) failed: %08lx\n", rc); rc = WSDCreateUdpAddress(&udpAddress); - ok(rc == S_OK, "WSDCreateUDPAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUDPAddress(NULL, &udpAddress) failed: %08lx\n", rc); ok(udpAddress != NULL, "WSDCreateUDPAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); /* Try to query for objects */ rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IWSDUdpAddress, (LPVOID*)&udpAddress2); - ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IWSDUdpAddress) failed: %08x\n", rc); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IWSDUdpAddress) failed: %08lx\n", rc); if (rc == S_OK) IWSDUdpAddress_Release(udpAddress2); rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IWSDTransportAddress, (LPVOID*)&transportAddress); - ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IID_WSDTransportAddress) failed: %08x\n", rc); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IID_WSDTransportAddress) failed: %08lx\n", rc); if (rc == S_OK) IWSDTransportAddress_Release(transportAddress); rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IWSDAddress, (LPVOID*)&address); - ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IWSDAddress) failed: %08x\n", rc); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IWSDAddress) failed: %08lx\n", rc); if (rc == S_OK) IWSDAddress_Release(address); rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IUnknown, (LPVOID*)&unknown); - ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IID_IUnknown) failed: %08x\n", rc); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IID_IUnknown) failed: %08lx\n", rc); if (rc == S_OK) IUnknown_Release(unknown); ref = IWSDUdpAddress_Release(udpAddress); - ok(ref == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ref); + ok(ref == 0, "IWSDUdpAddress_Release() has %ld references, should have 0\n", ref); } static void GetSetTransportAddress_udp_tests(void) @@ -89,52 +89,52 @@ static void GetSetTransportAddress_udp_tests(void) ok(ret == 0, "WSAStartup failed: %d\n", ret); rc = WSDCreateUdpAddress(&udpAddress); - ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08lx\n", rc); ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); - ok(returnedAddress == NULL, "GetTransportAddress returned unexpected address: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08lx\n", rc); + ok(returnedAddress == NULL, "GetTransportAddress returned unexpected address: %08lx\n", rc); /* Try setting a null address */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, NULL); - ok(rc == E_INVALIDARG, "SetTransportAddress(NULL) returned unexpected result: %08x\n", rc); + ok(rc == E_INVALIDARG, "SetTransportAddress(NULL) returned unexpected result: %08lx\n", rc); /* Try setting an invalid address */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, L"not/valid"); - ok(rc == HRESULT_FROM_WIN32(WSAHOST_NOT_FOUND), "SetTransportAddress(invalidAddress) returned unexpected result: %08x\n", rc); + ok(rc == HRESULT_FROM_WIN32(WSAHOST_NOT_FOUND), "SetTransportAddress(invalidAddress) returned unexpected result: %08lx\n", rc); /* Try setting an IPv4 address */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv4Address); - ok(rc == S_OK, "SetTransportAddress(ipv4Address) failed: %08x\n", rc); + ok(rc == S_OK, "SetTransportAddress(ipv4Address) failed: %08lx\n", rc); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, NULL); - ok(rc == E_POINTER, "GetTransportAddress(NULL) returned unexpected result: %08x\n", rc); + ok(rc == E_POINTER, "GetTransportAddress(NULL) returned unexpected result: %08lx\n", rc); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08lx\n", rc); ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); ok(lstrcmpW(returnedAddress, ipv4Address) == 0, "Returned address != ipv4Address (%s)\n", wine_dbgstr_w(returnedAddress)); /* Try setting an IPv4 address with a port number */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, L"10.20.30.40:124"); - ok(rc == HRESULT_FROM_WIN32(WSAHOST_NOT_FOUND), "SetTransportAddress(ipv4Address) failed: %08x\n", rc); + ok(rc == HRESULT_FROM_WIN32(WSAHOST_NOT_FOUND), "SetTransportAddress(ipv4Address) failed: %08lx\n", rc); /* Try setting an IPv6 address */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv6Address); - ok(rc == S_OK, "SetTransportAddress(ipv6Address) failed: %08x\n", rc); + ok(rc == S_OK, "SetTransportAddress(ipv6Address) failed: %08lx\n", rc); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08lx\n", rc); ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); ok(lstrcmpW(returnedAddress, ipv6Address) == 0, "Returned address != ipv6Address (%s)\n", wine_dbgstr_w(returnedAddress)); /* Try setting an IPv6 address with a port number */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv6AddressWithPort); - ok(rc == S_OK, "SetTransportAddress(ipv6AddressWithPort) failed: %08x\n", rc); + ok(rc == S_OK, "SetTransportAddress(ipv6AddressWithPort) failed: %08lx\n", rc); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08lx\n", rc); ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); todo_wine ok(lstrcmpW(returnedAddress, ipv6AddressWithPort) == 0, "Returned address != ipv6AddressWithPort (%s)\n", wine_dbgstr_w(returnedAddress)); @@ -156,37 +156,37 @@ static void GetSetPort_udp_tests(void) int ret; rc = WSDCreateUdpAddress(&udpAddress); - ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08lx\n", rc); ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); /* No test for GetPort(NULL) as this causes an access violation exception on Windows */ rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); - ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetPort returned unexpected result: %08lx\n", rc); ok(actualPort == 0, "GetPort returned unexpected port: %d\n", actualPort); /* Try setting a zero port */ rc = IWSDUdpAddress_SetPort(udpAddress, 0); - ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetPort returned unexpected result: %08lx\n", rc); rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); - ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetPort returned unexpected result: %08lx\n", rc); ok(actualPort == 0, "GetPort returned unexpected port: %d\n", actualPort); /* Set a real port */ rc = IWSDUdpAddress_SetPort(udpAddress, expectedPort1); - ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetPort returned unexpected result: %08lx\n", rc); rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); - ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetPort returned unexpected result: %08lx\n", rc); ok(actualPort == expectedPort1, "GetPort returned unexpected port: %d\n", actualPort); /* Now set a different port */ rc = IWSDUdpAddress_SetPort(udpAddress, expectedPort2); - ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetPort returned unexpected result: %08lx\n", rc); rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); - ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetPort returned unexpected result: %08lx\n", rc); ok(actualPort == expectedPort2, "GetPort returned unexpected port: %d\n", actualPort); /* Release the object */ @@ -204,30 +204,30 @@ static void GetSetMessageType_udp_tests(void) int ret; rc = WSDCreateUdpAddress(&udpAddress); - ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08lx\n", rc); ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); rc = IWSDUdpAddress_GetMessageType(udpAddress, NULL); - ok(rc == E_POINTER, "GetMessageType returned unexpected result: %08x\n", rc); + ok(rc == E_POINTER, "GetMessageType returned unexpected result: %08lx\n", rc); rc = IWSDUdpAddress_GetMessageType(udpAddress, &actualMessageType); - ok(rc == S_OK, "GetMessageType returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetMessageType returned unexpected result: %08lx\n", rc); ok(actualMessageType == 0, "GetMessageType returned unexpected message type: %d\n", actualMessageType); /* Try setting a message type */ rc = IWSDUdpAddress_SetMessageType(udpAddress, expectedMessageType1); - ok(rc == S_OK, "SetMessageType returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetMessageType returned unexpected result: %08lx\n", rc); rc = IWSDUdpAddress_GetMessageType(udpAddress, &actualMessageType); - ok(rc == S_OK, "GetMessageType returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetMessageType returned unexpected result: %08lx\n", rc); ok(actualMessageType == expectedMessageType1, "GetMessageType returned unexpected message type: %d\n", actualMessageType); /* Set another one */ rc = IWSDUdpAddress_SetMessageType(udpAddress, expectedMessageType2); - ok(rc == S_OK, "SetMessageType returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetMessageType returned unexpected result: %08lx\n", rc); rc = IWSDUdpAddress_GetMessageType(udpAddress, &actualMessageType); - ok(rc == S_OK, "GetMessageType returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetMessageType returned unexpected result: %08lx\n", rc); ok(actualMessageType == expectedMessageType2, "GetMessageType returned unexpected message type: %d\n", actualMessageType); /* Release the object */ @@ -265,22 +265,22 @@ static void GetSetSockaddr_udp_tests(void) ok(ret == 0, "WSAStartup failed: %d\n", ret); rc = WSDCreateUdpAddress(&udpAddress); - ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08lx\n", rc); ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); rc = IWSDUdpAddress_GetSockaddr(udpAddress, NULL); - ok(rc == E_POINTER, "GetSockaddr returned unexpected result: %08x\n", rc); + ok(rc == E_POINTER, "GetSockaddr returned unexpected result: %08lx\n", rc); rc = IWSDUdpAddress_GetSockaddr(udpAddress, &returnedStorage); - ok(rc == E_FAIL, "GetSockaddr returned unexpected result: %08x\n", rc); + ok(rc == E_FAIL, "GetSockaddr returned unexpected result: %08lx\n", rc); /* Try setting a transport address */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, expectedIpv6TransportAddr); - ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "SetTransportAddress failed: %08lx\n", rc); /* A socket address should be returned */ rc = IWSDUdpAddress_GetSockaddr(udpAddress, &returnedStorage); - ok(rc == S_OK, "GetSockaddr returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetSockaddr returned unexpected result: %08lx\n", rc); ok(returnedStorage.ss_family == AF_INET6, "returnedStorage.ss_family != AF_INET6 (%d)\n", returnedStorage.ss_family); sockAddr6Ptr = (struct sockaddr_in6 *) &returnedStorage; @@ -297,7 +297,7 @@ static void GetSetSockaddr_udp_tests(void) ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); rc = WSDCreateUdpAddress(&udpAddress); - ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08lx\n", rc); ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); /* Try setting an IPv4 address */ @@ -309,34 +309,34 @@ static void GetSetSockaddr_udp_tests(void) ok(ret == 1, "inet_pton(ipv4) failed: %d\n", WSAGetLastError()); rc = IWSDUdpAddress_SetSockaddr(udpAddress, &storage1); - ok(rc == S_OK, "SetSockaddr returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetSockaddr returned unexpected result: %08lx\n", rc); rc = IWSDUdpAddress_GetSockaddr(udpAddress, &returnedStorage); - ok(rc == S_OK, "GetSockaddr returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetSockaddr returned unexpected result: %08lx\n", rc); ok(returnedStorage.ss_family == storage1.ss_family, "returnedStorage.ss_family != storage1.ss_family (%d)\n", returnedStorage.ss_family); ok(memcmp(&returnedStorage, &storage1, sizeof(struct sockaddr_in)) == 0, "returnedStorage != storage1\n"); /* Check that GetTransportAddress returns the address set via the socket */ rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress failed: %08lx\n", rc); ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); ok(lstrcmpW(returnedAddress, L"1.2.3.4:1234") == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress)); /* Check that GetPort doesn't return the port set via the socket */ rc = IWSDUdpAddress_GetPort(udpAddress, &port); - ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetPort returned unexpected result: %08lx\n", rc); ok(port == 0, "GetPort returned unexpected port: %d\n", port); /* Try setting an IPv4 address without a port */ sockAddrPtr->sin_port = 0; rc = IWSDUdpAddress_SetSockaddr(udpAddress, &storage1); - ok(rc == S_OK, "SetSockaddr returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetSockaddr returned unexpected result: %08lx\n", rc); /* Check that GetTransportAddress returns the address set via the socket */ rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress failed: %08lx\n", rc); ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); ok(lstrcmpW(returnedAddress, L"1.2.3.4") == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress)); @@ -349,39 +349,39 @@ static void GetSetSockaddr_udp_tests(void) ok(ret == 1, "inet_pton(ipv6) failed: %d\n", WSAGetLastError()); rc = IWSDUdpAddress_SetSockaddr(udpAddress, &storage2); - ok(rc == S_OK, "SetSockaddr returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetSockaddr returned unexpected result: %08lx\n", rc); rc = IWSDUdpAddress_GetSockaddr(udpAddress, &returnedStorage); - ok(rc == S_OK, "GetSockaddr returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetSockaddr returned unexpected result: %08lx\n", rc); ok(returnedStorage.ss_family == storage2.ss_family, "returnedStorage.ss_family != storage2.ss_family (%d)\n", returnedStorage.ss_family); ok(memcmp(&returnedStorage, &storage2, sizeof(struct sockaddr_in6)) == 0, "returnedStorage != storage2\n"); /* Check that GetTransportAddress returns the address set via the socket */ rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress failed: %08lx\n", rc); ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); ok(lstrcmpW(returnedAddress, expectedIpv6TransportAddr) == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress)); /* Check that GetPort doesn't return the port set via the socket */ rc = IWSDUdpAddress_GetPort(udpAddress, &port); - ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetPort returned unexpected result: %08lx\n", rc); ok(port == 0, "GetPort returned unexpected port: %d\n", port); /* Try setting an IPv6 address without a port */ sockAddr6Ptr->sin6_port = 0; rc = IWSDUdpAddress_SetSockaddr(udpAddress, &storage2); - ok(rc == S_OK, "SetSockaddr returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetSockaddr returned unexpected result: %08lx\n", rc); /* Check that GetTransportAddress returns the address set via the socket */ rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress failed: %08lx\n", rc); ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); ok(lstrcmpW(returnedAddress, L"2a00:1234:5678:dead:beef::aaaa") == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress)); rc = IWSDUdpAddress_SetSockaddr(udpAddress, &storage2); - ok(rc == S_OK, "SetSockaddr returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetSockaddr returned unexpected result: %08lx\n", rc); /* Release the object */ ret = IWSDUdpAddress_Release(udpAddress); diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 2ecb3d2ccd8..01b28a3c1ad 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -482,7 +482,7 @@ static ULONG WINAPI IWSDiscoveryPublisherNotifyImpl_AddRef(IWSDiscoveryPublisher IWSDiscoveryPublisherNotifyImpl *This = impl_from_IWSDiscoveryPublisherNotify(iface); ULONG ref = InterlockedIncrement(&This->ref); - trace("IWSDiscoveryPublisherNotifyImpl_AddRef called (%p, ref = %d)\n", This, ref); + trace("IWSDiscoveryPublisherNotifyImpl_AddRef called (%p, ref = %ld)\n", This, ref); return ref; } @@ -491,7 +491,7 @@ static ULONG WINAPI IWSDiscoveryPublisherNotifyImpl_Release(IWSDiscoveryPublishe IWSDiscoveryPublisherNotifyImpl *This = impl_from_IWSDiscoveryPublisherNotify(iface); ULONG ref = InterlockedDecrement(&This->ref); - trace("IWSDiscoveryPublisherNotifyImpl_Release called (%p, ref = %d)\n", This, ref); + trace("IWSDiscoveryPublisherNotifyImpl_Release called (%p, ref = %ld)\n", This, ref); if (ref == 0) { @@ -621,7 +621,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP verify_wsdxml_any_text("probe_msg->Any", probe_msg->Any, uri_more_tests_no_slash, prefix_grog, L"Lager", L"MoreInfo"); rc = IWSDMessageParameters_GetRemoteAddress(pMessageParameters, (IWSDAddress **) &remote_addr); - ok(rc == S_OK, "IWSDMessageParameters_GetRemoteAddress returned %08x\n", rc); + ok(rc == S_OK, "IWSDMessageParameters_GetRemoteAddress returned %08lx\n", rc); if (remote_addr != NULL) { @@ -640,7 +640,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP int i; rc = IWSDUdpAddress_GetSockaddr(remote_addr, &remote_sock); - ok(rc == S_OK, "IWSDMessageParameters_GetRemoteAddress returned %08x\n", rc); + ok(rc == S_OK, "IWSDMessageParameters_GetRemoteAddress returned %08lx\n", rc); IWSDUdpAddress_Release(remote_addr); @@ -664,21 +664,21 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP header_any_name.Space = &ns; rc = WSDXMLBuildAnyForSingleElement(&header_any_name, L"PublishTest", &header_any_element); - ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08lx\n", rc); rc = WSDXMLBuildAnyForSingleElement(&header_any_name, L"BodyTest", &body_any_element); - ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08lx\n", rc); rc = WSDXMLBuildAnyForSingleElement(&header_any_name, L"EndPTest", &endpoint_any_element); - ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08lx\n", rc); rc = WSDXMLBuildAnyForSingleElement(&header_any_name, L"RefPTest", &ref_param_any_element); - ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08lx\n", rc); rc = IWSDiscoveryPublisher_MatchProbeEx(publisher_instance, pSoap, pMessageParameters, publisherIdW, 1, 1, 1, sequenceIdW, probe_msg->Types, NULL, NULL, header_any_element, ref_param_any_element, NULL, endpoint_any_element, body_any_element); - ok(rc == S_OK, "IWSDiscoveryPublisher_MatchProbeEx failed with %08x\n", rc); + ok(rc == S_OK, "IWSDiscoveryPublisher_MatchProbeEx failed with %08lx\n", rc); WSDFreeLinkedMemory(header_any_element); WSDFreeLinkedMemory(body_any_element); @@ -808,27 +808,27 @@ static void CreateDiscoveryPublisher_tests(void) ULONG ref; rc = WSDCreateDiscoveryPublisher(NULL, NULL); - ok((rc == E_POINTER) || (rc == E_INVALIDARG), "WSDCreateDiscoveryPublisher(NULL, NULL) failed: %08x\n", rc); + ok((rc == E_POINTER) || (rc == E_INVALIDARG), "WSDCreateDiscoveryPublisher(NULL, NULL) failed: %08lx\n", rc); rc = WSDCreateDiscoveryPublisher(NULL, &publisher); - ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08lx\n", rc); ok(publisher != NULL, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: publisher == NULL\n"); /* Try to query for objects */ rc = IWSDiscoveryPublisher_QueryInterface(publisher, &IID_IUnknown, (LPVOID*)&unknown); - ok(rc == S_OK,"IWSDiscoveryPublisher_QueryInterface(IID_IUnknown) failed: %08x\n", rc); + ok(rc == S_OK,"IWSDiscoveryPublisher_QueryInterface(IID_IUnknown) failed: %08lx\n", rc); if (rc == S_OK) IUnknown_Release(unknown); rc = IWSDiscoveryPublisher_QueryInterface(publisher, &IID_IWSDiscoveryPublisher, (LPVOID*)&publisher2); - ok(rc == S_OK,"IWSDiscoveryPublisher_QueryInterface(IID_IWSDiscoveryPublisher) failed: %08x\n", rc); + ok(rc == S_OK,"IWSDiscoveryPublisher_QueryInterface(IID_IWSDiscoveryPublisher) failed: %08lx\n", rc); if (rc == S_OK) IWSDiscoveryPublisher_Release(publisher2); ref = IWSDiscoveryPublisher_Release(publisher); - ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); + ok(ref == 0, "IWSDiscoveryPublisher_Release() has %ld references, should have 0\n", ref); } static void CreateDiscoveryPublisher_XMLContext_tests(void) @@ -840,17 +840,17 @@ static void CreateDiscoveryPublisher_XMLContext_tests(void) /* Test creating an XML context and supplying it to WSDCreateDiscoveryPublisher */ rc = WSDXMLCreateContext(&xmlContext); - ok(rc == S_OK, "WSDXMLCreateContext failed: %08x\n", rc); + ok(rc == S_OK, "WSDXMLCreateContext failed: %08lx\n", rc); rc = WSDCreateDiscoveryPublisher(xmlContext, &publisher); - ok(rc == S_OK, "WSDCreateDiscoveryPublisher(xmlContext, &publisher) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateDiscoveryPublisher(xmlContext, &publisher) failed: %08lx\n", rc); ok(publisher != NULL, "WSDCreateDiscoveryPublisher(xmlContext, &publisher) failed: publisher == NULL\n"); rc = IWSDiscoveryPublisher_GetXMLContext(publisher, NULL); - ok(rc == E_INVALIDARG, "GetXMLContext returned unexpected value with NULL argument: %08x\n", rc); + ok(rc == E_INVALIDARG, "GetXMLContext returned unexpected value with NULL argument: %08lx\n", rc); rc = IWSDiscoveryPublisher_GetXMLContext(publisher, &returnedContext); - ok(rc == S_OK, "GetXMLContext failed: %08x\n", rc); + ok(rc == S_OK, "GetXMLContext failed: %08lx\n", rc); ok(xmlContext == returnedContext, "GetXMLContext returned unexpected value: returnedContext == %p\n", returnedContext); @@ -868,11 +868,11 @@ static void CreateDiscoveryPublisher_XMLContext_tests(void) returnedContext = NULL; rc = WSDCreateDiscoveryPublisher(NULL, &publisher); - ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08lx\n", rc); ok(publisher != NULL, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: publisher == NULL\n"); rc = IWSDiscoveryPublisher_GetXMLContext(publisher, &returnedContext); - ok(rc == S_OK, "GetXMLContext failed: %08x\n", rc); + ok(rc == S_OK, "GetXMLContext failed: %08lx\n", rc); ref = IWSDXMLContext_Release(returnedContext); ok(ref == 1, "IWSDXMLContext_Release() has %d references, should have 1\n", ref); @@ -907,21 +907,21 @@ static void Publish_tests(void) unsigned char *probe_uuid_str; rc = WSDCreateDiscoveryPublisher(NULL, &publisher); - ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08lx\n", rc); ok(publisher != NULL, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: publisher == NULL\n"); publisher_instance = publisher; /* Test SetAddressFamily */ rc = IWSDiscoveryPublisher_SetAddressFamily(publisher, 12345); - ok(rc == E_INVALIDARG, "IWSDiscoveryPublisher_SetAddressFamily(12345) returned unexpected result: %08x\n", rc); + ok(rc == E_INVALIDARG, "IWSDiscoveryPublisher_SetAddressFamily(12345) returned unexpected result: %08lx\n", rc); rc = IWSDiscoveryPublisher_SetAddressFamily(publisher, WSDAPI_ADDRESSFAMILY_IPV4); - ok(rc == S_OK, "IWSDiscoveryPublisher_SetAddressFamily(WSDAPI_ADDRESSFAMILY_IPV4) failed: %08x\n", rc); + ok(rc == S_OK, "IWSDiscoveryPublisher_SetAddressFamily(WSDAPI_ADDRESSFAMILY_IPV4) failed: %08lx\n", rc); /* Try to update the address family after already setting it */ rc = IWSDiscoveryPublisher_SetAddressFamily(publisher, WSDAPI_ADDRESSFAMILY_IPV6); - ok(rc == STG_E_INVALIDFUNCTION, "IWSDiscoveryPublisher_SetAddressFamily(WSDAPI_ADDRESSFAMILY_IPV6) returned unexpected result: %08x\n", rc); + ok(rc == STG_E_INVALIDFUNCTION, "IWSDiscoveryPublisher_SetAddressFamily(WSDAPI_ADDRESSFAMILY_IPV6) returned unexpected result: %08lx\n", rc); /* Create notification sinks */ ok(create_discovery_publisher_notify(&sink1) == TRUE, "create_discovery_publisher_notify failed\n"); @@ -933,21 +933,21 @@ static void Publish_tests(void) /* Attempt to unregister sink before registering it */ rc = IWSDiscoveryPublisher_UnRegisterNotificationSink(publisher, sink1); - ok(rc == E_FAIL, "IWSDiscoveryPublisher_UnRegisterNotificationSink returned unexpected result: %08x\n", rc); + ok(rc == E_FAIL, "IWSDiscoveryPublisher_UnRegisterNotificationSink returned unexpected result: %08lx\n", rc); /* Register notification sinks */ rc = IWSDiscoveryPublisher_RegisterNotificationSink(publisher, sink1); - ok(rc == S_OK, "IWSDiscoveryPublisher_RegisterNotificationSink failed: %08x\n", rc); - ok(sink1Impl->ref == 2, "Ref count for sink 1 is not as expected: %d\n", sink1Impl->ref); + ok(rc == S_OK, "IWSDiscoveryPublisher_RegisterNotificationSink failed: %08lx\n", rc); + ok(sink1Impl->ref == 2, "Ref count for sink 1 is not as expected: %ld\n", sink1Impl->ref); rc = IWSDiscoveryPublisher_RegisterNotificationSink(publisher, sink2); - ok(rc == S_OK, "IWSDiscoveryPublisher_RegisterNotificationSink failed: %08x\n", rc); - ok(sink2Impl->ref == 2, "Ref count for sink 2 is not as expected: %d\n", sink2Impl->ref); + ok(rc == S_OK, "IWSDiscoveryPublisher_RegisterNotificationSink failed: %08lx\n", rc); + ok(sink2Impl->ref == 2, "Ref count for sink 2 is not as expected: %ld\n", sink2Impl->ref); /* Unregister the first sink */ rc = IWSDiscoveryPublisher_UnRegisterNotificationSink(publisher, sink1); - ok(rc == S_OK, "IWSDiscoveryPublisher_UnRegisterNotificationSink failed: %08x\n", rc); - ok(sink1Impl->ref == 1, "Ref count for sink 1 is not as expected: %d\n", sink1Impl->ref); + ok(rc == S_OK, "IWSDiscoveryPublisher_UnRegisterNotificationSink failed: %08lx\n", rc); + ok(sink1Impl->ref == 1, "Ref count for sink 1 is not as expected: %ld\n", sink1Impl->ref); /* Set up network listener */ publisherIdW = utf8_to_wide(publisherId); @@ -976,16 +976,16 @@ static void Publish_tests(void) header_any_name.Space = &ns; rc = WSDXMLBuildAnyForSingleElement(&header_any_name, L"PublishTest", &header_any_element); - ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08lx\n", rc); rc = WSDXMLBuildAnyForSingleElement(&header_any_name, L"BodyTest", &body_any_element); - ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08lx\n", rc); rc = WSDXMLBuildAnyForSingleElement(&header_any_name, L"EndPTest", &endpoint_any_element); - ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08lx\n", rc); rc = WSDXMLBuildAnyForSingleElement(&header_any_name, L"RefPTest", &ref_param_any_element); - ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08lx\n", rc); /* Create types list */ ns2.Uri = uri_more_tests; @@ -1025,7 +1025,7 @@ static void Publish_tests(void) heap_free(scopes_list.Next); heap_free(xaddrs_list.Next); - ok(rc == S_OK, "Publish failed: %08x\n", rc); + ok(rc == S_OK, "Publish failed: %08lx\n", rc); /* Wait up to 2 seconds for messages to be received */ if (WaitForMultipleObjects(msgStorage->numThreadHandles, msgStorage->threadHandles, TRUE, 2000) == WAIT_TIMEOUT) @@ -1122,11 +1122,11 @@ after_publish_test: CloseHandle(probe_event); ref = IWSDiscoveryPublisher_Release(publisher); - ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); + ok(ref == 0, "IWSDiscoveryPublisher_Release() has %ld references, should have 0\n", ref); /* Check that the sinks have been released by the publisher */ - ok(sink1Impl->ref == 1, "Ref count for sink 1 is not as expected: %d\n", sink1Impl->ref); - ok(sink2Impl->ref == 1, "Ref count for sink 2 is not as expected: %d\n", sink2Impl->ref); + ok(sink1Impl->ref == 1, "Ref count for sink 1 is not as expected: %ld\n", sink1Impl->ref); + ok(sink2Impl->ref == 1, "Ref count for sink 2 is not as expected: %ld\n", sink2Impl->ref); /* Release the sinks */ IWSDiscoveryPublisherNotify_Release(sink1); @@ -1154,16 +1154,16 @@ static void UnPublish_tests(void) WSDXML_NAMESPACE ns; rc = WSDCreateDiscoveryPublisher(NULL, &publisher); - ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08lx\n", rc); ok(publisher != NULL, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: publisher == NULL\n"); rc = IWSDiscoveryPublisher_SetAddressFamily(publisher, WSDAPI_ADDRESSFAMILY_IPV4); - ok(rc == S_OK, "IWSDiscoveryPublisher_SetAddressFamily(WSDAPI_ADDRESSFAMILY_IPV4) failed: %08x\n", rc); + ok(rc == S_OK, "IWSDiscoveryPublisher_SetAddressFamily(WSDAPI_ADDRESSFAMILY_IPV4) failed: %08lx\n", rc); /* Create notification sink */ ok(create_discovery_publisher_notify(&sink1) == TRUE, "create_discovery_publisher_notify failed\n"); rc = IWSDiscoveryPublisher_RegisterNotificationSink(publisher, sink1); - ok(rc == S_OK, "IWSDiscoveryPublisher_RegisterNotificationSink failed: %08x\n", rc); + ok(rc == S_OK, "IWSDiscoveryPublisher_RegisterNotificationSink failed: %08lx\n", rc); /* Set up network listener */ publisherIdW = utf8_to_wide(publisherId); @@ -1192,14 +1192,14 @@ static void UnPublish_tests(void) body_any_name.Space = &ns; rc = WSDXMLBuildAnyForSingleElement(&body_any_name, L"BodyTest", &body_any_element); - ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08lx\n", rc); /* Unpublish the service */ rc = IWSDiscoveryPublisher_UnPublish(publisher, publisherIdW, 1, 1, sequenceIdW, body_any_element); WSDFreeLinkedMemory(body_any_element); - ok(rc == S_OK, "Unpublish failed: %08x\n", rc); + ok(rc == S_OK, "Unpublish failed: %08lx\n", rc); /* Wait up to 2 seconds for messages to be received */ if (WaitForMultipleObjects(msg_storage->numThreadHandles, msg_storage->threadHandles, TRUE, 2000) == WAIT_TIMEOUT) @@ -1260,7 +1260,7 @@ after_unpublish_test: heap_free(sequenceIdW); ref = IWSDiscoveryPublisher_Release(publisher); - ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); + ok(ref == 0, "IWSDiscoveryPublisher_Release() has %ld references, should have 0\n", ref); /* Release the sinks */ IWSDiscoveryPublisherNotify_Release(sink1); @@ -1302,18 +1302,18 @@ static BOOL is_firewall_enabled(void) hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, (void **)&mgr ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (hr != S_OK) goto done; hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (hr != S_OK) goto done; hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); if (hr != S_OK) goto done; hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); done: if (policy) INetFwPolicy_Release( policy ); @@ -1342,23 +1342,23 @@ static HRESULT set_firewall( enum firewall_op op ) hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, (void **)&mgr ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (hr != S_OK) goto done; hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (hr != S_OK) goto done; hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); if (hr != S_OK) goto done; hr = INetFwProfile_get_AuthorizedApplications( profile, &apps ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (hr != S_OK) goto done; hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwAuthorizedApplication, (void **)&app ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (hr != S_OK) goto done; hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); @@ -1367,7 +1367,7 @@ static HRESULT set_firewall( enum firewall_op op ) name = SysAllocString( L"wsdapi_test" ); hr = INetFwAuthorizedApplication_put_Name( app, name ); SysFreeString( name ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (hr != S_OK) goto done; if (op == APP_ADD) @@ -1402,7 +1402,7 @@ START_TEST(discovery) } if ((hr = set_firewall(APP_ADD)) != S_OK) { - skip("can't authorize app in firewall %08x\n", hr); + skip("can't authorize app in firewall %08lx\n", hr); return; } } diff --git a/dlls/wsdapi/tests/msgparams.c b/dlls/wsdapi/tests/msgparams.c index 6e40094f171..116b3c94d78 100644 --- a/dlls/wsdapi/tests/msgparams.c +++ b/dlls/wsdapi/tests/msgparams.c @@ -37,33 +37,33 @@ static void CreateUdpMessageParameters_tests(void) ULONG ref; rc = WSDCreateUdpMessageParameters(NULL); - ok((rc == E_POINTER) || (rc == E_INVALIDARG), "WSDCreateUdpMessageParameters(NULL) failed: %08x\n", rc); + ok((rc == E_POINTER) || (rc == E_INVALIDARG), "WSDCreateUdpMessageParameters(NULL) failed: %08lx\n", rc); rc = WSDCreateUdpMessageParameters(&udpMessageParams); - ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08lx\n", rc); ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); /* Try to query for objects */ rc = IWSDUdpMessageParameters_QueryInterface(udpMessageParams, &IID_IWSDUdpMessageParameters, (LPVOID*)&udpMessageParams2); - ok(rc == S_OK, "IWSDUdpMessageParams_QueryInterface(IID_IWSDUdpMessageParameters) failed: %08x\n", rc); + ok(rc == S_OK, "IWSDUdpMessageParams_QueryInterface(IID_IWSDUdpMessageParameters) failed: %08lx\n", rc); if (rc == S_OK) IWSDUdpMessageParameters_Release(udpMessageParams2); rc = IWSDUdpMessageParameters_QueryInterface(udpMessageParams, &IID_IWSDMessageParameters, (LPVOID*)&messageParams); - ok(rc == S_OK, "IWSDUdpMessageParams_QueryInterface(IID_WSDMessageParameters) failed: %08x\n", rc); + ok(rc == S_OK, "IWSDUdpMessageParams_QueryInterface(IID_WSDMessageParameters) failed: %08lx\n", rc); if (rc == S_OK) IWSDMessageParameters_Release(messageParams); rc = IWSDUdpMessageParameters_QueryInterface(udpMessageParams, &IID_IUnknown, (LPVOID*)&unknown); - ok(rc == S_OK, "IWSDUdpMessageParams_QueryInterface(IID_IUnknown) failed: %08x\n", rc); + ok(rc == S_OK, "IWSDUdpMessageParams_QueryInterface(IID_IUnknown) failed: %08lx\n", rc); if (rc == S_OK) IUnknown_Release(unknown); ref = IWSDUdpMessageParameters_Release(udpMessageParams); - ok(ref == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ref); + ok(ref == 0, "IWSDUdpMessageParameters_Release() has %ld references, should have 0\n", ref); } static void LocalAddress_tests(void) @@ -79,29 +79,29 @@ static void LocalAddress_tests(void) ok(ret == 0, "WSAStartup failed: %d\n", ret); rc = WSDCreateUdpMessageParameters(&udpMessageParams); - ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08lx\n", rc); ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); rc = IWSDUdpMessageParameters_GetLocalAddress(udpMessageParams, NULL); - ok(rc == E_POINTER, "GetLocalAddress failed: %08x\n", rc); + ok(rc == E_POINTER, "GetLocalAddress failed: %08lx\n", rc); ok(returnedAddress == NULL, "GetLocalAddress returned %p\n", returnedAddress); rc = IWSDUdpMessageParameters_GetLocalAddress(udpMessageParams, &returnedAddress); - ok(rc == E_ABORT, "GetLocalAddress failed: %08x\n", rc); + ok(rc == E_ABORT, "GetLocalAddress failed: %08lx\n", rc); ok(returnedAddress == NULL, "GetLocalAddress returned %p\n", returnedAddress); rc = WSDCreateUdpAddress(&origUdpAddress); - ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &origUdpAddress) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &origUdpAddress) failed: %08lx\n", rc); ok(origUdpAddress != NULL, "WSDCreateUdpMessageParameters(NULL, &origUdpAddress) failed: origUdpAddress == NULL\n"); rc = IWSDUdpAddress_SetTransportAddress(origUdpAddress, L"1.2.3.4"); - ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "SetTransportAddress failed: %08lx\n", rc); rc = IWSDUdpMessageParameters_SetLocalAddress(udpMessageParams, (IWSDAddress *)origUdpAddress); - ok(rc == S_OK, "SetLocalAddress failed: %08x\n", rc); + ok(rc == S_OK, "SetLocalAddress failed: %08lx\n", rc); rc = IWSDUdpMessageParameters_GetLocalAddress(udpMessageParams, &returnedAddress); - ok(rc == S_OK, "GetLocalAddress failed: %08x\n", rc); + ok(rc == S_OK, "GetLocalAddress failed: %08lx\n", rc); ok(returnedAddress != NULL, "GetLocalAddress returned NULL\n"); /* Check if GetLocalAddress returns the same object */ @@ -136,29 +136,29 @@ static void RemoteAddress_tests(void) ok(ret == 0, "WSAStartup failed: %d\n", ret); rc = WSDCreateUdpMessageParameters(&udpMessageParams); - ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08lx\n", rc); ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, NULL); - ok(rc == E_POINTER, "GetRemoteAddress failed: %08x\n", rc); + ok(rc == E_POINTER, "GetRemoteAddress failed: %08lx\n", rc); ok(returnedAddress == NULL, "GetRemoteAddress returned %p\n", returnedAddress); rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, &returnedAddress); - ok(rc == E_ABORT, "GetRemoteAddress failed: %08x\n", rc); + ok(rc == E_ABORT, "GetRemoteAddress failed: %08lx\n", rc); ok(returnedAddress == NULL, "GetRemoteAddress returned %p\n", returnedAddress); rc = WSDCreateUdpAddress(&origUdpAddress); - ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &origUdpAddress) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &origUdpAddress) failed: %08lx\n", rc); ok(origUdpAddress != NULL, "WSDCreateUdpMessageParameters(NULL, &origUdpAddress) failed: origUdpAddress == NULL\n"); rc = IWSDUdpAddress_SetTransportAddress(origUdpAddress, L"1.2.3.4"); - ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "SetTransportAddress failed: %08lx\n", rc); rc = IWSDUdpMessageParameters_SetRemoteAddress(udpMessageParams, (IWSDAddress *)origUdpAddress); - ok(rc == S_OK, "SetRemoteAddress failed: %08x\n", rc); + ok(rc == S_OK, "SetRemoteAddress failed: %08lx\n", rc); rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, &returnedAddress); - ok(rc == S_OK, "GetRemoteAddress failed: %08x\n", rc); + ok(rc == S_OK, "GetRemoteAddress failed: %08lx\n", rc); ok(returnedAddress != NULL, "GetLocalAddress returned NULL\n"); /* Check if GetRemoteAddress returns the same object */ @@ -191,21 +191,21 @@ static void RetransmitParams_tests(void) ZeroMemory(&returnedParams, sizeof(WSDUdpRetransmitParams)); rc = WSDCreateUdpMessageParameters(&udpMessageParams); - ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08lx\n", rc); ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, NULL); - ok(rc == E_POINTER, "GetRetransmitParams returned unexpected result: %08x\n", rc); + ok(rc == E_POINTER, "GetRetransmitParams returned unexpected result: %08lx\n", rc); /* Check if the default values are returned */ rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, &returnedParams); - ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); + ok(rc == S_OK, "GetRetransmitParams failed: %08lx\n", rc); - ok(returnedParams.ulSendDelay == 0, "ulSendDelay = %d\n", returnedParams.ulSendDelay); - ok(returnedParams.ulRepeat == 1, "ulRepeat = %d\n", returnedParams.ulRepeat); - ok(returnedParams.ulRepeatMinDelay == 50, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); - ok(returnedParams.ulRepeatMaxDelay == 250, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); - ok(returnedParams.ulRepeatUpperDelay == 450, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + ok(returnedParams.ulSendDelay == 0, "ulSendDelay = %ld\n", returnedParams.ulSendDelay); + ok(returnedParams.ulRepeat == 1, "ulRepeat = %ld\n", returnedParams.ulRepeat); + ok(returnedParams.ulRepeatMinDelay == 50, "ulRepeatMinDelay = %ld\n", returnedParams.ulRepeatMinDelay); + ok(returnedParams.ulRepeatMaxDelay == 250, "ulRepeatMaxDelay = %ld\n", returnedParams.ulRepeatMaxDelay); + ok(returnedParams.ulRepeatUpperDelay == 450, "ulRepeatUpperDelay = %ld\n", returnedParams.ulRepeatUpperDelay); /* Now try setting some custom parameters */ origParams.ulSendDelay = 100; @@ -215,22 +215,22 @@ static void RetransmitParams_tests(void) origParams.ulRepeatUpperDelay = 500; rc = IWSDUdpMessageParameters_SetRetransmitParams(udpMessageParams, &origParams); - ok(rc == S_OK, "SetRetransmitParams failed: %08x\n", rc); + ok(rc == S_OK, "SetRetransmitParams failed: %08lx\n", rc); ZeroMemory(&returnedParams, sizeof(WSDUdpRetransmitParams)); rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, &returnedParams); - ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); + ok(rc == S_OK, "GetRetransmitParams failed: %08lx\n", rc); - ok(origParams.ulSendDelay == returnedParams.ulSendDelay, "ulSendDelay = %d\n", returnedParams.ulSendDelay); - ok(origParams.ulRepeat == returnedParams.ulRepeat, "ulRepeat = %d\n", returnedParams.ulRepeat); - ok(origParams.ulRepeatMinDelay == returnedParams.ulRepeatMinDelay, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); - ok(origParams.ulRepeatMaxDelay == returnedParams.ulRepeatMaxDelay, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); - ok(origParams.ulRepeatUpperDelay == returnedParams.ulRepeatUpperDelay, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + ok(origParams.ulSendDelay == returnedParams.ulSendDelay, "ulSendDelay = %ld\n", returnedParams.ulSendDelay); + ok(origParams.ulRepeat == returnedParams.ulRepeat, "ulRepeat = %ld\n", returnedParams.ulRepeat); + ok(origParams.ulRepeatMinDelay == returnedParams.ulRepeatMinDelay, "ulRepeatMinDelay = %ld\n", returnedParams.ulRepeatMinDelay); + ok(origParams.ulRepeatMaxDelay == returnedParams.ulRepeatMaxDelay, "ulRepeatMaxDelay = %ld\n", returnedParams.ulRepeatMaxDelay); + ok(origParams.ulRepeatUpperDelay == returnedParams.ulRepeatUpperDelay, "ulRepeatUpperDelay = %ld\n", returnedParams.ulRepeatUpperDelay); /* Try setting a null parameter */ rc = IWSDUdpMessageParameters_SetRetransmitParams(udpMessageParams, NULL); - ok(rc == E_INVALIDARG, "SetRetransmitParams returned unexpected result: %08x\n", rc); + ok(rc == E_INVALIDARG, "SetRetransmitParams returned unexpected result: %08lx\n", rc); /* Now attempt to set some invalid parameters - these appear to be accepted */ origParams.ulSendDelay = INFINITE; @@ -240,18 +240,18 @@ static void RetransmitParams_tests(void) origParams.ulRepeatUpperDelay = 100; rc = IWSDUdpMessageParameters_SetRetransmitParams(udpMessageParams, &origParams); - ok(rc == S_OK, "SetRetransmitParams failed: %08x\n", rc); + ok(rc == S_OK, "SetRetransmitParams failed: %08lx\n", rc); ZeroMemory(&returnedParams, sizeof(WSDUdpRetransmitParams)); rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, &returnedParams); - ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); + ok(rc == S_OK, "GetRetransmitParams failed: %08lx\n", rc); - ok(origParams.ulSendDelay == returnedParams.ulSendDelay, "ulSendDelay = %d\n", returnedParams.ulSendDelay); - ok(origParams.ulRepeat == returnedParams.ulRepeat, "ulRepeat = %d\n", returnedParams.ulRepeat); - ok(origParams.ulRepeatMinDelay == returnedParams.ulRepeatMinDelay, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); - ok(origParams.ulRepeatMaxDelay == returnedParams.ulRepeatMaxDelay, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); - ok(origParams.ulRepeatUpperDelay == returnedParams.ulRepeatUpperDelay, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + ok(origParams.ulSendDelay == returnedParams.ulSendDelay, "ulSendDelay = %ld\n", returnedParams.ulSendDelay); + ok(origParams.ulRepeat == returnedParams.ulRepeat, "ulRepeat = %ld\n", returnedParams.ulRepeat); + ok(origParams.ulRepeatMinDelay == returnedParams.ulRepeatMinDelay, "ulRepeatMinDelay = %ld\n", returnedParams.ulRepeatMinDelay); + ok(origParams.ulRepeatMaxDelay == returnedParams.ulRepeatMaxDelay, "ulRepeatMaxDelay = %ld\n", returnedParams.ulRepeatMaxDelay); + ok(origParams.ulRepeatUpperDelay == returnedParams.ulRepeatUpperDelay, "ulRepeatUpperDelay = %ld\n", returnedParams.ulRepeatUpperDelay); ret = IWSDUdpMessageParameters_Release(udpMessageParams); ok(ret == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ret); diff --git a/dlls/wsdapi/tests/xml.c b/dlls/wsdapi/tests/xml.c index ad0d5d11068..0b56024c667 100644 --- a/dlls/wsdapi/tests/xml.c +++ b/dlls/wsdapi/tests/xml.c @@ -46,19 +46,19 @@ static void BuildAnyForSingleElement_tests(void) /* Test invalid arguments */ hr = WSDXMLBuildAnyForSingleElement(NULL, NULL, NULL); - ok(hr == E_INVALIDARG, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "BuildAnyForSingleElement failed with %08lx\n", hr); hr = WSDXMLBuildAnyForSingleElement(&name, NULL, NULL); - ok(hr == E_POINTER, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == E_POINTER, "BuildAnyForSingleElement failed with %08lx\n", hr); /* Test calling the function with a text size that exceeds 8192 characters */ hr = WSDXMLBuildAnyForSingleElement(&name, largeText, &element); - ok(hr == E_INVALIDARG, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "BuildAnyForSingleElement failed with %08lx\n", hr); /* Test with valid parameters but no text */ hr = WSDXMLBuildAnyForSingleElement(&name, NULL, &element); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); ok(element->Name != &name, "element->Name has not been duplicated\n"); ok(element->Name->Space != name.Space, "element->Name->Space has not been duplicated\n"); @@ -74,7 +74,7 @@ static void BuildAnyForSingleElement_tests(void) /* Test with valid parameters and text */ hr = WSDXMLBuildAnyForSingleElement(&name, text, &element); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); ok(element->Name != &name, "element->Name has not been duplicated\n"); ok(element->Name->Space != name.Space, "element->Name->Space has not been duplicated\n"); @@ -108,7 +108,7 @@ static void AddChild_tests(void) /* Test invalid values */ hr = WSDXMLAddChild(NULL, NULL); - ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08lx\n", hr); /* Populate structures */ ns.Uri = L"http://test.test/"; @@ -125,13 +125,13 @@ static void AddChild_tests(void) /* Create some elements */ hr = WSDXMLBuildAnyForSingleElement(&parentName, NULL, &parent); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); hr = WSDXMLBuildAnyForSingleElement(&child1Name, child1NameText, &child1); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); hr = WSDXMLBuildAnyForSingleElement(&child2Name, NULL, &child2); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); ok(parent->Node.Parent == NULL, "parent->Node.Parent == %p\n", parent->Node.Parent); ok(parent->FirstChild == NULL, "parent->FirstChild == %p\n", parent->FirstChild); @@ -143,7 +143,7 @@ static void AddChild_tests(void) /* Add the child to the parent */ hr = WSDXMLAddChild(parent, child1); - ok(hr == S_OK, "WSDXMLAddChild failed with %08x\n", hr); + ok(hr == S_OK, "WSDXMLAddChild failed with %08lx\n", hr); ok(parent->Node.Parent == NULL, "parent->Node.Parent == %p\n", parent->Node.Parent); ok(parent->FirstChild == (WSDXML_NODE *)child1, "parent->FirstChild == %p\n", parent->FirstChild); @@ -155,15 +155,15 @@ static void AddChild_tests(void) /* Try to set child1 as the child of child2, which already has a parent */ hr = WSDXMLAddChild(child2, child1); - ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08lx\n", hr); /* Try to set child2 as the child of child1, which has a text node as a child */ hr = WSDXMLAddChild(child2, child1); - ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08lx\n", hr); /* Add child2 as a child of parent */ hr = WSDXMLAddChild(parent, child2); - ok(hr == S_OK, "WSDXMLAddChild failed with %08x\n", hr); + ok(hr == S_OK, "WSDXMLAddChild failed with %08lx\n", hr); ok(parent->Node.Parent == NULL, "parent->Node.Parent == %p\n", parent->Node.Parent); ok(parent->FirstChild == (WSDXML_NODE *)child1, "parent->FirstChild == %p\n", parent->FirstChild); @@ -189,7 +189,7 @@ static void AddSibling_tests(void) /* Test invalid values */ hr = WSDXMLAddSibling(NULL, NULL); - ok(hr == E_INVALIDARG, "WSDXMLAddSibling failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "WSDXMLAddSibling failed with %08lx\n", hr); /* Populate structures */ ns.Uri = L"http://test.test/"; @@ -206,20 +206,20 @@ static void AddSibling_tests(void) /* Create some elements */ hr = WSDXMLBuildAnyForSingleElement(&parentName, NULL, &parent); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); hr = WSDXMLBuildAnyForSingleElement(&child1Name, child1NameText, &child1); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); hr = WSDXMLBuildAnyForSingleElement(&child2Name, NULL, &child2); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); hr = WSDXMLBuildAnyForSingleElement(&child2Name, NULL, &child3); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); /* Add child1 to parent */ hr = WSDXMLAddChild(parent, child1); - ok(hr == S_OK, "WSDXMLAddChild failed with %08x\n", hr); + ok(hr == S_OK, "WSDXMLAddChild failed with %08lx\n", hr); ok(parent->Node.Parent == NULL, "parent->Node.Parent == %p\n", parent->Node.Parent); ok(parent->FirstChild == (WSDXML_NODE *)child1, "parent->FirstChild == %p\n", parent->FirstChild); @@ -234,7 +234,7 @@ static void AddSibling_tests(void) /* Try to add child2 as sibling of child1 */ hr = WSDXMLAddSibling(child1, child2); - ok(hr == S_OK, "WSDXMLAddSibling failed with %08x\n", hr); + ok(hr == S_OK, "WSDXMLAddSibling failed with %08lx\n", hr); ok(child1->Node.Parent == parent, "child1->Node.Parent == %p\n", child1->Node.Parent); ok(child1->Node.Next == (WSDXML_NODE *)child2, "child1->Node.Next == %p\n", child1->Node.Next); @@ -244,7 +244,7 @@ static void AddSibling_tests(void) /* Try to add child3 as sibling of child1 */ hr = WSDXMLAddSibling(child1, child3); - ok(hr == S_OK, "WSDXMLAddSibling failed with %08x\n", hr); + ok(hr == S_OK, "WSDXMLAddSibling failed with %08lx\n", hr); ok(child1->Node.Parent == parent, "child1->Node.Parent == %p\n", child1->Node.Parent); ok(child1->Node.Next == (WSDXML_NODE *)child2, "child1->Node.Next == %p\n", child1->Node.Next); @@ -293,71 +293,71 @@ static void GetValueFromAny_tests(void) /* Create some elements */ hr = WSDXMLBuildAnyForSingleElement(&parentName, NULL, &parent); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); hr = WSDXMLBuildAnyForSingleElement(&child1Name, child1Value, &child1); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); hr = WSDXMLBuildAnyForSingleElement(&child2Name, child2Value, &child2); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); hr = WSDXMLBuildAnyForSingleElement(&child3Name, NULL, &child3); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); /* Attach them to the parent element */ hr = WSDXMLAddChild(parent, child1); - ok(hr == S_OK, "AddChild failed with %08x\n", hr); + ok(hr == S_OK, "AddChild failed with %08lx\n", hr); hr = WSDXMLAddChild(parent, child2); - ok(hr == S_OK, "AddChild failed with %08x\n", hr); + ok(hr == S_OK, "AddChild failed with %08lx\n", hr); hr = WSDXMLAddChild(parent, child3); - ok(hr == S_OK, "AddChild failed with %08x\n", hr); + ok(hr == S_OK, "AddChild failed with %08lx\n", hr); /* Test invalid arguments */ hr = WSDXMLGetValueFromAny(NULL, NULL, NULL, NULL); - ok(hr == E_INVALIDARG, "GetValueFromAny returned unexpected result: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetValueFromAny returned unexpected result: %08lx\n", hr); hr = WSDXMLGetValueFromAny(NULL, NULL, NULL, &returnedValue); - ok(hr == E_INVALIDARG, "GetValueFromAny returned unexpected result: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetValueFromAny returned unexpected result: %08lx\n", hr); hr = WSDXMLGetValueFromAny(NULL, NULL, parent, NULL); - ok(hr == E_POINTER, "GetValueFromAny returned unexpected result: %08x\n", hr); + ok(hr == E_POINTER, "GetValueFromAny returned unexpected result: %08lx\n", hr); hr = WSDXMLGetValueFromAny(uri, NULL, parent, NULL); - ok(hr == E_POINTER, "GetValueFromAny returned unexpected result: %08x\n", hr); + ok(hr == E_POINTER, "GetValueFromAny returned unexpected result: %08lx\n", hr); hr = WSDXMLGetValueFromAny(uri, child2NameText, parent, NULL); - ok(hr == E_POINTER, "GetValueFromAny returned unexpected result: %08x\n", hr); + ok(hr == E_POINTER, "GetValueFromAny returned unexpected result: %08lx\n", hr); /* Test calling the function with a text size that exceeds 8192 characters */ hr = WSDXMLGetValueFromAny(largeText, child2NameText, parent, &returnedValue); - ok(hr == E_INVALIDARG, "GetValueFromAny returned unexpected result: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetValueFromAny returned unexpected result: %08lx\n", hr); hr = WSDXMLGetValueFromAny(uri, largeText, parent, &returnedValue); - ok(hr == E_INVALIDARG, "GetValueFromAny returned unexpected result: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetValueFromAny returned unexpected result: %08lx\n", hr); /* Test with valid parameters */ hr = WSDXMLGetValueFromAny(uri, child2NameText, child1, &returnedValue); - ok(hr == S_OK, "GetValueFromAny failed with %08x\n", hr); + ok(hr == S_OK, "GetValueFromAny failed with %08lx\n", hr); ok(returnedValue != NULL, "returnedValue == NULL\n"); ok(lstrcmpW(returnedValue, child2Value) == 0, "returnedValue ('%s') != '%s'\n", wine_dbgstr_w(returnedValue), wine_dbgstr_w(child2Value)); hr = WSDXMLGetValueFromAny(uri2, child1NameText, child1, &returnedValue); - ok(hr == S_OK, "GetValueFromAny failed with %08x\n", hr); + ok(hr == S_OK, "GetValueFromAny failed with %08lx\n", hr); ok(returnedValue != NULL, "returnedValue == NULL\n"); ok(lstrcmpW(returnedValue, child1Value) == 0, "returnedValue ('%s') != '%s'\n", wine_dbgstr_w(returnedValue), wine_dbgstr_w(child1Value)); oldReturnedValue = returnedValue; hr = WSDXMLGetValueFromAny(uri2, child2NameText, child1, &returnedValue); - ok(hr == E_FAIL, "GetValueFromAny returned unexpected value: %08x\n", hr); + ok(hr == E_FAIL, "GetValueFromAny returned unexpected value: %08lx\n", hr); ok(returnedValue == oldReturnedValue, "returnedValue == %p\n", returnedValue); oldReturnedValue = returnedValue; hr = WSDXMLGetValueFromAny(uri, child3NameText, child1, &returnedValue); - ok(hr == E_FAIL, "GetValueFromAny failed with %08x\n", hr); + ok(hr == E_FAIL, "GetValueFromAny failed with %08lx\n", hr); ok(returnedValue == oldReturnedValue, "returnedValue == %p\n", returnedValue); WSDFreeLinkedMemory(parent); @@ -377,26 +377,26 @@ static void XMLContext_AddNamespace_tests(void) HRESULT hr; hr = WSDXMLCreateContext(&context); - ok(hr == S_OK, "WSDXMLCreateContext failed with %08x\n", hr); + ok(hr == S_OK, "WSDXMLCreateContext failed with %08lx\n", hr); ok(context != NULL, "context == NULL\n"); /* Test calling AddNamespace with invalid arguments */ hr = IWSDXMLContext_AddNamespace(context, NULL, NULL, NULL); - ok(hr == E_INVALIDARG, "AddNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNamespace failed with %08lx\n", hr); hr = IWSDXMLContext_AddNamespace(context, ns1Uri, NULL, NULL); - ok(hr == E_INVALIDARG, "AddNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNamespace failed with %08lx\n", hr); hr = IWSDXMLContext_AddNamespace(context, NULL, prefix1, NULL); - ok(hr == E_INVALIDARG, "AddNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNamespace failed with %08lx\n", hr); /* Test calling AddNamespace without the ppNamespace parameter */ hr = IWSDXMLContext_AddNamespace(context, ns1Uri, prefix1, NULL); - ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNamespace failed with %08lx\n", hr); /* Now retrieve the created namespace */ hr = IWSDXMLContext_AddNamespace(context, ns1Uri, prefix1, &ns1); - ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNamespace failed with %08lx\n", hr); /* Check the returned structure */ ok(ns1 != NULL, "ns1 == NULL\n"); @@ -413,17 +413,17 @@ static void XMLContext_AddNamespace_tests(void) /* Test calling AddNamespace with parameters that are too large */ hr = IWSDXMLContext_AddNamespace(context, largeText, prefix2, &ns2); - ok(hr == E_INVALIDARG, "AddNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNamespace failed with %08lx\n", hr); hr = IWSDXMLContext_AddNamespace(context, ns2Uri, largeText, &ns2); - ok(hr == E_INVALIDARG, "AddNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNamespace failed with %08lx\n", hr); hr = IWSDXMLContext_AddNamespace(context, largeText, largeText, &ns2); - ok(hr == E_INVALIDARG, "AddNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNamespace failed with %08lx\n", hr); /* Test calling AddNamespace with a conflicting prefix */ hr = IWSDXMLContext_AddNamespace(context, ns2Uri, prefix1, &ns2); - ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNamespace failed with %08lx\n", hr); /* Check the returned structure */ ok(ns2 != NULL, "ns2 == NULL\n"); @@ -443,7 +443,7 @@ static void XMLContext_AddNamespace_tests(void) /* Try explicitly creating a prefix called 'un1' */ hr = IWSDXMLContext_AddNamespace(context, L"http://one.more", unPrefix1, &ns2); - ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNamespace failed with %08lx\n", hr); /* Check the returned structure */ ok(ns2 != NULL, "ns2 == NULL\n"); @@ -457,7 +457,7 @@ static void XMLContext_AddNamespace_tests(void) /* Test with one more conflicting prefix */ hr = IWSDXMLContext_AddNamespace(context, ns3Uri, prefix1, &ns2); - ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNamespace failed with %08lx\n", hr); /* Check the returned structure */ ok(ns2 != NULL, "ns2 == NULL\n"); @@ -471,7 +471,7 @@ static void XMLContext_AddNamespace_tests(void) /* Try renaming a prefix */ hr = IWSDXMLContext_AddNamespace(context, ns3Uri, prefix2, &ns2); - ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNamespace failed with %08lx\n", hr); /* Check the returned structure */ ok(ns2 != NULL, "ns2 == NULL\n"); @@ -500,25 +500,25 @@ static void XMLContext_AddNameToNamespace_tests(void) HRESULT hr; hr = WSDXMLCreateContext(&context); - ok(hr == S_OK, "WSDXMLCreateContext failed with %08x\n", hr); + ok(hr == S_OK, "WSDXMLCreateContext failed with %08lx\n", hr); /* Test calling AddNameToNamespace with invalid arguments */ hr = IWSDXMLContext_AddNameToNamespace(context, NULL, NULL, NULL); - ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08lx\n", hr); hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, NULL, NULL); - ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08lx\n", hr); hr = IWSDXMLContext_AddNameToNamespace(context, NULL, name1Text, NULL); - ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08lx\n", hr); /* Test calling AddNameToNamespace without the ppName parameter */ hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, name1Text, NULL); - ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNameToNamespace failed with %08lx\n", hr); /* Now retrieve the created name */ hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, name1Text, &name1); - ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNameToNamespace failed with %08lx\n", hr); /* Check the returned structure */ ok(name1 != NULL, "name1 == NULL\n"); @@ -538,18 +538,18 @@ static void XMLContext_AddNameToNamespace_tests(void) /* Test calling AddNamespace with parameters that are too large */ hr = IWSDXMLContext_AddNameToNamespace(context, largeText, name1Text, &name2); - ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08lx\n", hr); hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, largeText, &name2); - ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08lx\n", hr); /* Try creating a namespace explicitly */ hr = IWSDXMLContext_AddNamespace(context, ns2Uri, prefix2, &ns2); - ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNamespace failed with %08lx\n", hr); /* Now add a name to it */ hr = IWSDXMLContext_AddNameToNamespace(context, ns2Uri, name2Text, &name2); - ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNameToNamespace failed with %08lx\n", hr); /* Check the returned structure */ ok(name2 != NULL, "name2 == NULL\n"); @@ -574,7 +574,7 @@ static void XMLContext_AddNameToNamespace_tests(void) /* Now re-retrieve ns2 */ hr = IWSDXMLContext_AddNamespace(context, ns2Uri, prefix2, &ns2); - ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNamespace failed with %08lx\n", hr); /* Check the returned structure */ ok(ns2 != NULL, "ns2 == NULL\n");

1 0

[PATCH 1/2] dlls/ws2_32/tests: use correct integral type
by Eric Pouech 10 Mar '22

10 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a0bbde875d3..38c8b65ccdb 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2633,7 +2633,7 @@ static void test_WSASocket(void) int wsaproviders[] = {IPPROTO_TCP, IPPROTO_IP}; int autoprotocols[] = {IPPROTO_TCP, IPPROTO_UDP}; int items, err, size, socktype, i, j; - UINT pi_size; + DWORD pi_size; static const struct {

1 1

[PATCH] dlls/wpc/tests: enable compilation with long types
by Eric Pouech 10 Mar '22

10 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wpc/tests/Makefile.in | 1 - dlls/wpc/tests/wpc.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wpc/tests/Makefile.in b/dlls/wpc/tests/Makefile.in index 45098b8fbf9..72f550d576f 100644 --- a/dlls/wpc/tests/Makefile.in +++ b/dlls/wpc/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wpc.dll IMPORTS = ole32 diff --git a/dlls/wpc/tests/wpc.c b/dlls/wpc/tests/wpc.c index 2cf35ccf6ec..3dbf595a9a7 100644 --- a/dlls/wpc/tests/wpc.c +++ b/dlls/wpc/tests/wpc.c @@ -32,7 +32,7 @@ static void test_wpc(void) if(hres == REGDB_E_CLASSNOTREG) win_skip("CLSID_WindowsParentalControls not registered\n"); else - ok(hres == S_OK, "Could not create CLSID_WindowsParentalControls instance: %08x\n", hres); + ok(hres == S_OK, "Could not create CLSID_WindowsParentalControls instance: %08lx\n", hres); if(FAILED(hres)) return;

1 0

[PATCH] dlls/wmvcore/tests: enable compilation with long types
by Eric Pouech 10 Mar '22

10 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wmvcore/tests/Makefile.in | 1 dlls/wmvcore/tests/wmvcore.c | 778 ++++++++++++++++++++-------------------- 2 files changed, 389 insertions(+), 390 deletions(-) diff --git a/dlls/wmvcore/tests/Makefile.in b/dlls/wmvcore/tests/Makefile.in index 159de067e06..856e02d45d5 100644 --- a/dlls/wmvcore/tests/Makefile.in +++ b/dlls/wmvcore/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wmvcore.dll IMPORTS = ole32 wmvcore diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 1b9cffaee1d..50a7a023488 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -60,11 +60,11 @@ static WCHAR *load_resource(const WCHAR *name) wcscat(pathW, name); file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); - ok(file != INVALID_HANDLE_VALUE, "Failed to create file %s, error %u.\n", + ok(file != INVALID_HANDLE_VALUE, "Failed to create file %s, error %lu.\n", wine_dbgstr_w(pathW), GetLastError()); res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); - ok(!!res, "Failed to load resource, error %u.\n", GetLastError()); + ok(!!res, "Failed to load resource, error %lu.\n", GetLastError()); ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res)); WriteFile(file, ptr, SizeofResource( GetModuleHandleA(NULL), res), &written, NULL); ok(written == SizeofResource(GetModuleHandleA(NULL), res), "Failed to write resource.\n"); @@ -82,7 +82,7 @@ static HRESULT check_interface_(unsigned int line, void *iface, REFIID riid, BOO expected_hr = supported ? S_OK : E_NOINTERFACE; hr = IUnknown_QueryInterface(unknown, riid, (void **)&out); - ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#lx, expected %#lx.\n", hr, expected_hr); if (SUCCEEDED(hr)) IUnknown_Release(out); return hr; @@ -94,7 +94,7 @@ static void test_wmwriter_interfaces(void) IWMWriter *writer; hr = WMCreateWriter( NULL, &writer ); - ok(hr == S_OK, "WMCreateWriter failed 0x%08x\n", hr); + ok(hr == S_OK, "WMCreateWriter failed 0x%08lx\n", hr); if(FAILED(hr)) { win_skip("Failed to create IWMWriter\n"); @@ -121,7 +121,7 @@ static void test_wmreader_interfaces(void) IWMReader *reader; hr = WMCreateReader( NULL, 0, &reader ); - ok(hr == S_OK, "WMCreateReader failed 0x%08x\n", hr); + ok(hr == S_OK, "WMCreateReader failed 0x%08lx\n", hr); if(FAILED(hr)) { win_skip("Failed to create IWMReader\n"); @@ -168,7 +168,7 @@ static void test_wmsyncreader_interfaces(void) IWMSyncReader *reader; hr = WMCreateSyncReader( NULL, 0, &reader ); - ok(hr == S_OK, "WMCreateSyncReader failed 0x%08x\n", hr); + ok(hr == S_OK, "WMCreateSyncReader failed 0x%08lx\n", hr); if(FAILED(hr)) { win_skip("Failed to create IWMSyncReader\n"); @@ -216,7 +216,7 @@ static void test_profile_manager_interfaces(void) IWMProfileManager *profile; hr = WMCreateProfileManager(&profile); - ok(hr == S_OK, "WMCreateProfileManager failed 0x%08x\n", hr); + ok(hr == S_OK, "WMCreateProfileManager failed 0x%08lx\n", hr); if(FAILED(hr)) { win_skip("Failed to create IWMProfileManager\n"); @@ -232,10 +232,10 @@ static void test_WMCreateWriterPriv(void) HRESULT hr; hr = WMCreateWriterPriv(&writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IWMWriter_QueryInterface(writer, &IID_IWMWriter, (void**)&writer2); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); IWMWriter_Release(writer); IWMWriter_Release(writer2); @@ -246,15 +246,15 @@ static void test_urlextension(void) HRESULT hr; hr = WMCheckURLExtension(NULL); - ok(hr == E_INVALIDARG, "WMCheckURLExtension failed 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "WMCheckURLExtension failed 0x%08lx\n", hr); hr = WMCheckURLExtension(L"test.mkv"); - ok(hr == NS_E_INVALID_NAME, "WMCheckURLExtension failed 0x%08x\n", hr); + ok(hr == NS_E_INVALID_NAME, "WMCheckURLExtension failed 0x%08lx\n", hr); hr = WMCheckURLExtension(L"test.mp3"); - todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08lx\n", hr); hr = WMCheckURLExtension(L"abcd://test/test.wmv"); - todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08lx\n", hr); hr = WMCheckURLExtension(L"http://test/t.asf?alt=t.mkv"); - todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08lx\n", hr); } static void test_iscontentprotected(void) @@ -263,13 +263,13 @@ static void test_iscontentprotected(void) BOOL drm; hr = WMIsContentProtected(NULL, NULL); - ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08lx\n", hr); hr = WMIsContentProtected(NULL, &drm); - ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08lx\n", hr); hr = WMIsContentProtected(L"test.mp3", NULL); - ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08lx\n", hr); hr = WMIsContentProtected(L"test.mp3", &drm); - ok(hr == S_FALSE, "WMIsContentProtected failed 0x%08x\n", hr); + ok(hr == S_FALSE, "WMIsContentProtected failed 0x%08lx\n", hr); ok(drm == FALSE, "got %0dx\n", drm); } @@ -292,7 +292,7 @@ static inline struct buffer *impl_from_INSSBuffer(INSSBuffer *iface) static HRESULT WINAPI buffer_QueryInterface(INSSBuffer *iface, REFIID iid, void **out) { if (winetest_debug > 1) - trace("%04x: INSSBuffer::QueryInterface(%s)\n", GetCurrentThreadId(), debugstr_guid(iid)); + trace("%04lx: INSSBuffer::QueryInterface(%s)\n", GetCurrentThreadId(), debugstr_guid(iid)); if (!IsEqualGUID(iid, &IID_INSSBuffer3) && !IsEqualGUID(iid, &IID_IMediaBuffer)) ok(0, "Unexpected IID %s.\n", debugstr_guid(iid)); @@ -324,7 +324,7 @@ static HRESULT WINAPI buffer_GetLength(INSSBuffer *iface, DWORD *size) struct buffer *buffer = impl_from_INSSBuffer(iface); if (winetest_debug > 1) - trace("%04x: INSSBuffer::GetLength()\n", GetCurrentThreadId()); + trace("%04lx: INSSBuffer::GetLength()\n", GetCurrentThreadId()); *size = buffer->size; return S_OK; @@ -335,9 +335,9 @@ static HRESULT WINAPI buffer_SetLength(INSSBuffer *iface, DWORD size) struct buffer *buffer = impl_from_INSSBuffer(iface); if (winetest_debug > 1) - trace("%04x: INSSBuffer::SetLength(%u)\n", GetCurrentThreadId(), size); + trace("%04lx: INSSBuffer::SetLength(%lu)\n", GetCurrentThreadId(), size); - ok(size <= buffer->capacity, "Got size %u, buffer capacity %u.\n", size, buffer->capacity); + ok(size <= buffer->capacity, "Got size %lu, buffer capacity %lu.\n", size, buffer->capacity); buffer->size = size; return S_OK; @@ -348,7 +348,7 @@ static HRESULT WINAPI buffer_GetMaxLength(INSSBuffer *iface, DWORD *size) struct buffer *buffer = impl_from_INSSBuffer(iface); if (winetest_debug > 1) - trace("%04x: INSSBuffer::GetMaxLength()\n", GetCurrentThreadId()); + trace("%04lx: INSSBuffer::GetMaxLength()\n", GetCurrentThreadId()); *size = buffer->capacity; return S_OK; @@ -359,7 +359,7 @@ static HRESULT WINAPI buffer_GetBuffer(INSSBuffer *iface, BYTE **data) struct buffer *buffer = impl_from_INSSBuffer(iface); if (winetest_debug > 1) - trace("%04x: INSSBuffer::GetBuffer()\n", GetCurrentThreadId()); + trace("%04lx: INSSBuffer::GetBuffer()\n", GetCurrentThreadId()); *data = buffer->data; return S_OK; @@ -370,7 +370,7 @@ static HRESULT WINAPI buffer_GetBufferAndLength(INSSBuffer *iface, BYTE **data, struct buffer *buffer = impl_from_INSSBuffer(iface); if (winetest_debug > 1) - trace("%04x: INSSBuffer::GetBufferAndLength()\n", GetCurrentThreadId()); + trace("%04lx: INSSBuffer::GetBufferAndLength()\n", GetCurrentThreadId()); *size = buffer->size; *data = buffer->data; @@ -404,7 +404,7 @@ static struct teststream *impl_from_IStream(IStream *iface) static HRESULT WINAPI stream_QueryInterface(IStream *iface, REFIID iid, void **out) { if (winetest_debug > 1) - trace("%04x: IStream::QueryInterface(%s)\n", GetCurrentThreadId(), debugstr_guid(iid)); + trace("%04lx: IStream::QueryInterface(%s)\n", GetCurrentThreadId(), debugstr_guid(iid)); if (!IsEqualGUID(iid, &IID_IWMGetSecureChannel) && !IsEqualGUID(iid, &IID_IWMIStreamProps)) ok(0, "Unexpected IID %s.\n", debugstr_guid(iid)); @@ -431,7 +431,7 @@ static HRESULT WINAPI stream_Read(IStream *iface, void *data, ULONG size, ULONG struct teststream *stream = impl_from_IStream(iface); if (winetest_debug > 2) - trace("%04x: IStream::Read(size %u)\n", GetCurrentThreadId(), size); + trace("%04lx: IStream::Read(size %lu)\n", GetCurrentThreadId(), size); ok(size > 0, "Got zero size.\n"); ok(!!ret_size, "Got NULL ret_size pointer.\n"); @@ -452,13 +452,13 @@ static HRESULT WINAPI stream_Seek(IStream *iface, LARGE_INTEGER offset, DWORD me LARGE_INTEGER size; if (winetest_debug > 2) - trace("%04x: IStream::Seek(offset %I64u, method %#x)\n", GetCurrentThreadId(), offset.QuadPart, method); + trace("%04lx: IStream::Seek(offset %I64u, method %#lx)\n", GetCurrentThreadId(), offset.QuadPart, method); GetFileSizeEx(stream->file, &size); ok(offset.QuadPart < size.QuadPart, "Expected offset less than size %I64u, got %I64u.\n", size.QuadPart, offset.QuadPart); - ok(method == STREAM_SEEK_SET, "Got method %#x.\n", method); + ok(method == STREAM_SEEK_SET, "Got method %#lx.\n", method); ok(!ret_offset, "Got unexpected ret_offset pointer %p\n", ret_offset); if (!SetFilePointerEx(stream->file, offset, &offset, method)) @@ -509,9 +509,9 @@ static HRESULT WINAPI stream_Stat(IStream *iface, STATSTG *stat, DWORD flags) LARGE_INTEGER size; if (winetest_debug > 1) - trace("%04x: IStream::Stat(flags %#x)\n", GetCurrentThreadId(), flags); + trace("%04lx: IStream::Stat(flags %#lx)\n", GetCurrentThreadId(), flags); - ok(flags == STATFLAG_NONAME, "Got flags %#x.\n", flags); + ok(flags == STATFLAG_NONAME, "Got flags %#lx.\n", flags); stat->type = 0xdeadbeef; GetFileSizeEx(stream->file, &size); @@ -568,15 +568,15 @@ static void test_reader_attributes(IWMProfile *profile) IWMProfile_QueryInterface(profile, &IID_IWMHeaderInfo, (void **)&header_info); hr = IWMProfile_GetStreamCount(profile, &count); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(count == 2, "Got count %u.\n", count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count == 2, "Got count %lu.\n", count); for (i = 0; i < count; ++i) { hr = IWMProfile_GetStream(profile, i, &config); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMStreamConfig_GetStreamNumber(config, &stream_number); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret_stream_number = stream_number; size = sizeof(DWORD); @@ -584,10 +584,10 @@ static void test_reader_attributes(IWMProfile *profile) dword = 0xdeadbeef; hr = IWMHeaderInfo_GetAttributeByName(header_info, &ret_stream_number, L"WM/VideoFrameRate", &type, (BYTE *)&dword, &size); - ok(hr == ASF_E_NOTFOUND, "Got hr %#x.\n", hr); + ok(hr == ASF_E_NOTFOUND, "Got hr %#lx.\n", hr); ok(type == 0xdeadbeef, "Got type %#x.\n", type); ok(size == sizeof(DWORD), "Got size %u.\n", size); - ok(dword == 0xdeadbeef, "Got frame rate %u.\n", dword); + ok(dword == 0xdeadbeef, "Got frame rate %lu.\n", dword); ok(ret_stream_number == stream_number, "Expected stream number %u, got %u.\n", stream_number, ret_stream_number); @@ -596,7 +596,7 @@ static void test_reader_attributes(IWMProfile *profile) duration = 0xdeadbeef; hr = IWMHeaderInfo_GetAttributeByName(header_info, &ret_stream_number, L"Duration", &type, (BYTE *)&duration, &size); - ok(hr == ASF_E_NOTFOUND, "Got hr %#x.\n", hr); + ok(hr == ASF_E_NOTFOUND, "Got hr %#lx.\n", hr); ok(type == 0xdeadbeef, "Got type %#x.\n", type); ok(size == sizeof(QWORD), "Got size %u.\n", size); ok(ret_stream_number == stream_number, "Expected stream number %u, got %u.\n", @@ -607,7 +607,7 @@ static void test_reader_attributes(IWMProfile *profile) dword = 0xdeadbeef; hr = IWMHeaderInfo_GetAttributeByName(header_info, &ret_stream_number, L"Seekable", &type, (BYTE *)&dword, &size); - ok(hr == ASF_E_NOTFOUND, "Got hr %#x.\n", hr); + ok(hr == ASF_E_NOTFOUND, "Got hr %#lx.\n", hr); ok(type == 0xdeadbeef, "Got type %#x.\n", type); ok(size == sizeof(DWORD), "Got size %u.\n", size); ok(ret_stream_number == stream_number, "Expected stream number %u, got %u.\n", @@ -623,10 +623,10 @@ static void test_reader_attributes(IWMProfile *profile) dword = 0xdeadbeef; hr = IWMHeaderInfo_GetAttributeByName(header_info, NULL, L"WM/VideoFrameRate", &type, (BYTE *)&dword, &size); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); ok(type == 0xdeadbeef, "Got type %#x.\n", type); ok(size == sizeof(DWORD), "Got size %u.\n", size); - ok(dword == 0xdeadbeef, "Got frame rate %u.\n", dword); + ok(dword == 0xdeadbeef, "Got frame rate %lu.\n", dword); /* And with a zero stream number. */ @@ -636,10 +636,10 @@ static void test_reader_attributes(IWMProfile *profile) dword = 0xdeadbeef; hr = IWMHeaderInfo_GetAttributeByName(header_info, &stream_number, L"WM/VideoFrameRate", &type, (BYTE *)&dword, &size); - ok(hr == ASF_E_NOTFOUND, "Got hr %#x.\n", hr); + ok(hr == ASF_E_NOTFOUND, "Got hr %#lx.\n", hr); ok(type == 0xdeadbeef, "Got type %#x.\n", type); ok(size == sizeof(DWORD), "Got size %u.\n", size); - ok(dword == 0xdeadbeef, "Got frame rate %u.\n", dword); + ok(dword == 0xdeadbeef, "Got frame rate %lu.\n", dword); ok(stream_number == 0, "Got stream number %u.\n", stream_number); /* Duration with a NULL stream number. */ @@ -649,7 +649,7 @@ static void test_reader_attributes(IWMProfile *profile) duration = 0xdeadbeef; hr = IWMHeaderInfo_GetAttributeByName(header_info, NULL, L"Duration", &type, (BYTE *)&duration, &size); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); ok(type == 0xdeadbeef, "Got type %#x.\n", type); ok(size == sizeof(QWORD), "Got size %u.\n", size); ok(duration == 0xdeadbeef, "Got duration %I64u.\n", duration); @@ -661,7 +661,7 @@ static void test_reader_attributes(IWMProfile *profile) duration = 0xdeadbeef; hr = IWMHeaderInfo_GetAttributeByName(header_info, &stream_number, L"Duration", &type, (BYTE *)&duration, &size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(type == WMT_TYPE_QWORD, "Got type %#x.\n", type); ok(size == sizeof(QWORD), "Got size %u.\n", size); ok(duration == 20460000, "Got duration %I64u.\n", duration); @@ -674,7 +674,7 @@ static void test_reader_attributes(IWMProfile *profile) duration = 0xdeadbeef; hr = IWMHeaderInfo_GetAttributeByName(header_info, &stream_number, L"Duration", &type, (BYTE *)&duration, &size); - ok(hr == ASF_E_BUFFERTOOSMALL, "Got hr %#x.\n", hr); + ok(hr == ASF_E_BUFFERTOOSMALL, "Got hr %#lx.\n", hr); ok(type == 0xdeadbeef, "Got type %#x.\n", type); ok(size == sizeof(QWORD), "Got size %u.\n", size); ok(duration == 0xdeadbeef, "Got duration %I64u.\n", duration); @@ -686,7 +686,7 @@ static void test_reader_attributes(IWMProfile *profile) type = 0xdeadbeef; hr = IWMHeaderInfo_GetAttributeByName(header_info, &stream_number, L"Duration", &type, NULL, &size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(type == WMT_TYPE_QWORD, "Got type %#x.\n", type); ok(size == sizeof(QWORD), "Got size %u.\n", size); ok(stream_number == 0, "Got stream number %u.\n", stream_number); @@ -696,7 +696,7 @@ static void test_reader_attributes(IWMProfile *profile) dword = 0xdeadbeef; hr = IWMHeaderInfo_GetAttributeByName(header_info, &stream_number, L"Seekable", &type, (BYTE *)&dword, &size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(type == WMT_TYPE_BOOL, "Got type %#x.\n", type); ok(size == sizeof(DWORD), "Got size %u.\n", size); ok(dword == TRUE, "Got duration %I64u.\n", duration); @@ -716,58 +716,58 @@ static void test_sync_reader_selection(IWMSyncReader *reader) selections[0] = 0xdeadbeef; hr = IWMSyncReader_GetStreamSelected(reader, 0, &selections[0]); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); ok(selections[0] == 0xdeadbeef, "Got selection %#x.\n", selections[0]); selections[0] = 0xdeadbeef; hr = IWMSyncReader_GetStreamSelected(reader, 1, &selections[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(selections[0] == WMT_ON, "Got selection %#x.\n", selections[0]); selections[0] = 0xdeadbeef; hr = IWMSyncReader_GetStreamSelected(reader, 2, &selections[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(selections[0] == WMT_ON, "Got selection %#x.\n", selections[0]); selections[0] = 0xdeadbeef; hr = IWMSyncReader_GetStreamSelected(reader, 3, &selections[0]); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); ok(selections[0] == 0xdeadbeef, "Got selection %#x.\n", selections[0]); hr = IWMSyncReader_SetStreamsSelected(reader, 0, NULL, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); stream_numbers[0] = 1; stream_numbers[1] = 0; selections[0] = selections[1] = WMT_OFF; hr = IWMSyncReader_SetStreamsSelected(reader, 2, stream_numbers, selections); - ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#lx.\n", hr); selections[0] = 0xdeadbeef; hr = IWMSyncReader_GetStreamSelected(reader, 1, &selections[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(selections[0] == WMT_ON, "Got selection %#x.\n", selections[0]); stream_numbers[0] = stream_numbers[1] = 1; selections[0] = selections[1] = WMT_OFF; hr = IWMSyncReader_SetStreamsSelected(reader, 2, stream_numbers, selections); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); selections[0] = 0xdeadbeef; hr = IWMSyncReader_GetStreamSelected(reader, 1, &selections[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(selections[0] == WMT_OFF, "Got selection %#x.\n", selections[0]); selections[0] = 0xdeadbeef; hr = IWMSyncReader_GetStreamSelected(reader, 2, &selections[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(selections[0] == WMT_ON, "Got selection %#x.\n", selections[0]); hr = IWMSyncReader_GetNextSample(reader, 1, &sample, &pts, &duration, &flags, NULL, NULL); - ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetNextSample(reader, 2, &sample, &pts, &duration, &flags, NULL, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); INSSBuffer_Release(sample); for (;;) @@ -775,19 +775,19 @@ static void test_sync_reader_selection(IWMSyncReader *reader) hr = IWMSyncReader_GetNextSample(reader, 2, &sample, &pts, &duration, &flags, NULL, NULL); if (hr == NS_E_NO_MORE_SAMPLES) break; - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); INSSBuffer_Release(sample); } hr = IWMSyncReader_GetNextSample(reader, 1, &sample, &pts, &duration, &flags, NULL, NULL); - ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetRange(reader, 0, 0); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, NULL, &stream_numbers[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(stream_numbers[0] == 2, "Got stream number %u.\n", stream_numbers[0]); INSSBuffer_Release(sample); @@ -797,7 +797,7 @@ static void test_sync_reader_selection(IWMSyncReader *reader) &flags, NULL, &stream_numbers[0]); if (hr == NS_E_NO_MORE_SAMPLES) break; - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(stream_numbers[0] == 2, "Got stream number %u.\n", stream_numbers[0]); INSSBuffer_Release(sample); } @@ -805,20 +805,20 @@ static void test_sync_reader_selection(IWMSyncReader *reader) stream_numbers[0] = stream_numbers[1] = 2; selections[0] = selections[1] = WMT_OFF; hr = IWMSyncReader_SetStreamsSelected(reader, 2, stream_numbers, selections); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetRange(reader, 0, 0); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, NULL, &stream_numbers[0]); - ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#lx.\n", hr); stream_numbers[0] = 1; stream_numbers[1] = 2; selections[0] = selections[1] = WMT_ON; hr = IWMSyncReader_SetStreamsSelected(reader, 2, stream_numbers, selections); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); } static void test_sync_reader_compressed(IWMSyncReader *reader) @@ -830,19 +830,19 @@ static void test_sync_reader_compressed(IWMSyncReader *reader) HRESULT hr; hr = IWMSyncReader_SetReadStreamSamples(reader, 0, TRUE); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetReadStreamSamples(reader, 1, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetReadStreamSamples(reader, 2, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetReadStreamSamples(reader, 3, TRUE); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetRange(reader, 0, 0); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, NULL, &stream_number); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); INSSBuffer_Release(sample); for (;;) @@ -850,14 +850,14 @@ static void test_sync_reader_compressed(IWMSyncReader *reader) hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, NULL, &stream_number); if (hr == NS_E_NO_MORE_SAMPLES) break; - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); INSSBuffer_Release(sample); } hr = IWMSyncReader_SetReadStreamSamples(reader, 1, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetReadStreamSamples(reader, 2, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); } static void test_sync_reader_streaming(void) @@ -879,53 +879,53 @@ static void test_sync_reader_streaming(void) BOOL ret; file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); - ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", debugstr_w(file), GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %lu.\n", debugstr_w(file), GetLastError()); teststream_init(&stream, file); hr = WMCreateSyncReader(NULL, 0, &reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); IWMSyncReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); hr = IWMSyncReader_OpenStream(reader, &stream.IStream_iface); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(stream.refcount > 1, "Got refcount %ld.\n", stream.refcount); hr = IWMProfile_GetStreamCount(profile, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); count = 0xdeadbeef; hr = IWMProfile_GetStreamCount(profile, &count); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(count == 2, "Got count %u.\n", count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count == 2, "Got count %lu.\n", count); count = 0xdeadbeef; hr = IWMSyncReader_GetOutputCount(reader, &count); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(count == 2, "Got count %u.\n", count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count == 2, "Got count %lu.\n", count); for (i = 0; i < 2; ++i) { hr = IWMProfile_GetStream(profile, i, &config); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMProfile_GetStream(profile, i, &config2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(config2 != config, "Expected different objects.\n"); ref = IWMStreamConfig_Release(config2); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); stream_numbers[i] = 0xdead; hr = IWMStreamConfig_GetStreamNumber(config, &stream_numbers[i]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(stream_numbers[i] == i + 1, "Got stream number %u.\n", stream_numbers[i]); ref = IWMStreamConfig_Release(config); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); } hr = IWMProfile_GetStream(profile, 2, &config); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); while (!eos[0] || !eos[1]) { @@ -935,50 +935,50 @@ static void test_sync_reader_streaming(void) hr = IWMSyncReader_GetNextSample(reader, stream_numbers[j], &sample, &pts, &duration, &flags, &output_number, &stream_number); if (first) - ok(hr == S_OK, "Expected at least one valid sample; got hr %#x.\n", hr); + ok(hr == S_OK, "Expected at least one valid sample; got hr %#lx.\n", hr); else if (eos[j]) - ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#lx.\n", hr); else - ok(hr == S_OK || hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + ok(hr == S_OK || hr == NS_E_NO_MORE_SAMPLES, "Got hr %#lx.\n", hr); if (hr == S_OK) { hr = INSSBuffer_GetBufferAndLength(sample, &data, &size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = INSSBuffer_GetBuffer(sample, &data2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(data2 == data, "Data pointers didn't match.\n"); hr = INSSBuffer_GetMaxLength(sample, &capacity); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(size <= capacity, "Size %u exceeds capacity %u.\n", size, capacity); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(size <= capacity, "Size %lu exceeds capacity %lu.\n", size, capacity); hr = INSSBuffer_SetLength(sample, capacity + 1); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = INSSBuffer_SetLength(sample, capacity - 1); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = INSSBuffer_GetBufferAndLength(sample, &data2, &size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(data2 == data, "Data pointers didn't match.\n"); - ok(size == capacity - 1, "Expected size %u, got %u.\n", capacity - 1, size); + ok(size == capacity - 1, "Expected size %lu, got %lu.\n", capacity - 1, size); ref = INSSBuffer_Release(sample); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); hr = IWMSyncReader_GetOutputNumberForStream(reader, stream_number, &expect_output_number); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(output_number == expect_output_number, "Expected output number %u, got %u.\n", + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(output_number == expect_output_number, "Expected output number %lu, got %lu.\n", expect_output_number, output_number); } else { ok(pts == 0xdeadbeef, "Got PTS %I64u.\n", pts); ok(duration == 0xdeadbeef, "Got duration %I64u.\n", duration); - ok(flags == 0xdeadbeef, "Got flags %#x.\n", flags); - ok(output_number == 0xdeadbeef, "Got output number %u.\n", output_number); + ok(flags == 0xdeadbeef, "Got flags %#lx.\n", flags); + ok(output_number == 0xdeadbeef, "Got output number %lu.\n", output_number); eos[j] = true; } @@ -990,28 +990,28 @@ static void test_sync_reader_streaming(void) hr = IWMSyncReader_GetNextSample(reader, stream_numbers[0], &sample, &pts, &duration, &flags, NULL, NULL); - ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetNextSample(reader, stream_numbers[1], &sample, &pts, &duration, &flags, NULL, NULL); - ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetRange(reader, 0, 0); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetNextSample(reader, stream_numbers[0], &sample, &pts, &duration, &flags, NULL, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); INSSBuffer_Release(sample); hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, NULL, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, &output_number, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); INSSBuffer_Release(sample); hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, NULL, &stream_number); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); INSSBuffer_Release(sample); for (;;) @@ -1019,30 +1019,30 @@ static void test_sync_reader_streaming(void) stream_number = pts = duration = flags = output_number = 0xdeadbeef; hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, &output_number, &stream_number); - ok(hr == S_OK || hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + ok(hr == S_OK || hr == NS_E_NO_MORE_SAMPLES, "Got hr %#lx.\n", hr); if (hr == S_OK) { hr = INSSBuffer_GetBufferAndLength(sample, &data, &size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = INSSBuffer_GetBuffer(sample, &data2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(data2 == data, "Data pointers didn't match.\n"); hr = INSSBuffer_GetMaxLength(sample, &capacity); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(size <= capacity, "Size %u exceeds capacity %u.\n", size, capacity); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(size <= capacity, "Size %lu exceeds capacity %lu.\n", size, capacity); ref = INSSBuffer_Release(sample); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); } else { ok(pts == 0xdeadbeef, "Got PTS %I64u.\n", pts); ok(duration == 0xdeadbeef, "Got duration %I64u.\n", duration); - ok(flags == 0xdeadbeef, "Got flags %#x.\n", flags); - ok(output_number == 0xdeadbeef, "Got output number %u.\n", output_number); + ok(flags == 0xdeadbeef, "Got flags %#lx.\n", flags); + ok(output_number == 0xdeadbeef, "Got output number %lu.\n", output_number); ok(stream_number == 0xbeef, "Got stream number %u.\n", stream_number); break; } @@ -1050,18 +1050,18 @@ static void test_sync_reader_streaming(void) hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, NULL, &stream_number); - ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetNextSample(reader, stream_numbers[0], &sample, &pts, &duration, &flags, NULL, NULL); - ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetNextSample(reader, stream_numbers[1], &sample, &pts, &duration, &flags, NULL, NULL); - ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetRange(reader, 0, 0); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); test_sync_reader_selection(reader); test_sync_reader_compressed(reader); @@ -1069,26 +1069,26 @@ static void test_sync_reader_streaming(void) test_reader_attributes(profile); hr = IWMSyncReader_Close(reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_Close(reader); - ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#lx.\n", hr); - ok(stream.refcount == 1, "Got outstanding refcount %d.\n", stream.refcount); + ok(stream.refcount == 1, "Got outstanding refcount %ld.\n", stream.refcount); SetFilePointer(stream.file, 0, NULL, FILE_BEGIN); hr = IWMSyncReader_OpenStream(reader, &stream.IStream_iface); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(stream.refcount > 1, "Got refcount %ld.\n", stream.refcount); IWMProfile_Release(profile); ref = IWMSyncReader_Release(reader); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); - ok(stream.refcount == 1, "Got outstanding refcount %d.\n", stream.refcount); + ok(stream.refcount == 1, "Got outstanding refcount %ld.\n", stream.refcount); CloseHandle(stream.file); ret = DeleteFileW(filename); - ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); + ok(ret, "Failed to delete %s, error %lu.\n", debugstr_w(filename), GetLastError()); } static void check_video_type(const WM_MEDIA_TYPE *mt) @@ -1103,12 +1103,12 @@ static void check_video_type(const WM_MEDIA_TYPE *mt) ok(EqualRect(&video_info->rcSource, &rect), "Got source rect %s.\n", wine_dbgstr_rect(&rect)); ok(EqualRect(&video_info->rcTarget, &rect), "Got target rect %s.\n", wine_dbgstr_rect(&rect)); - ok(!video_info->dwBitRate, "Got bit rate %u.\n", video_info->dwBitRate); - ok(!video_info->dwBitErrorRate, "Got bit error rate %u.\n", video_info->dwBitErrorRate); + ok(!video_info->dwBitRate, "Got bit rate %lu.\n", video_info->dwBitRate); + ok(!video_info->dwBitErrorRate, "Got bit error rate %lu.\n", video_info->dwBitErrorRate); ok(video_info->bmiHeader.biSize == sizeof(video_info->bmiHeader), - "Got size %u.\n", video_info->bmiHeader.biSize); - ok(video_info->bmiHeader.biWidth == 64, "Got width %d.\n", video_info->bmiHeader.biWidth); - ok(video_info->bmiHeader.biHeight == 48, "Got height %d.\n", video_info->bmiHeader.biHeight); + "Got size %lu.\n", video_info->bmiHeader.biSize); + ok(video_info->bmiHeader.biWidth == 64, "Got width %ld.\n", video_info->bmiHeader.biWidth); + ok(video_info->bmiHeader.biHeight == 48, "Got height %ld.\n", video_info->bmiHeader.biHeight); ok(video_info->bmiHeader.biPlanes == 1, "Got planes %d.\n", video_info->bmiHeader.biPlanes); } @@ -1134,24 +1134,24 @@ static void test_stream_media_props(IWMStreamConfig *config, const GUID *majorty HRESULT hr; hr = IWMStreamConfig_QueryInterface(config, &IID_IWMMediaProps, (void **)&props); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); size = 0xdeadbeef; hr = IWMMediaProps_GetMediaType(props, NULL, &size); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(size != 0xdeadbeef && size >= sizeof(WM_MEDIA_TYPE), "Got size %u.\n", size); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(size != 0xdeadbeef && size >= sizeof(WM_MEDIA_TYPE), "Got size %lu.\n", size); ret_size = size - 1; hr = IWMMediaProps_GetMediaType(props, mt, &ret_size); - ok(hr == ASF_E_BUFFERTOOSMALL, "Got hr %#x.\n", hr); - ok(ret_size == size, "Expected size %u, got %u.\n", size, ret_size); + ok(hr == ASF_E_BUFFERTOOSMALL, "Got hr %#lx.\n", hr); + ok(ret_size == size, "Expected size %lu, got %lu.\n", size, ret_size); ret_size = sizeof(mt_buffer); memset(mt_buffer, 0xcc, sizeof(mt_buffer)); hr = IWMMediaProps_GetMediaType(props, mt, &ret_size); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(ret_size == size, "Expected size %u, got %u.\n", size, ret_size); - ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "Expected size %u, got %u.\n", + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(ret_size == size, "Expected size %lu, got %lu.\n", size, ret_size); + ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "Expected size %Iu, got %lu.\n", sizeof(WM_MEDIA_TYPE) + mt->cbFormat, size); ok(IsEqualGUID(&mt->majortype, majortype), "Expected major type %s, got %s.\n", debugstr_guid(majortype), debugstr_guid(&mt->majortype)); @@ -1180,32 +1180,32 @@ static void test_sync_reader_types(void) BOOL ret; file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); - ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", debugstr_w(file), GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %lu.\n", debugstr_w(file), GetLastError()); teststream_init(&stream, file); hr = WMCreateSyncReader(NULL, 0, &reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); IWMSyncReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); hr = IWMSyncReader_OpenStream(reader, &stream.IStream_iface); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(stream.refcount > 1, "Got refcount %ld.\n", stream.refcount); for (i = 0; i < 2; ++i) { - winetest_push_context("Stream %u", i); + winetest_push_context("Stream %lu", i); hr = IWMProfile_GetStream(profile, i, &config); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); stream_number = 0xdead; hr = IWMStreamConfig_GetStreamNumber(config, &stream_number); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(stream_number == i + 1, "Got stream number %u.\n", stream_number); hr = IWMStreamConfig_GetStreamType(config, &majortype); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); if (!i) ok(IsEqualGUID(&majortype, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&majortype)); else @@ -1214,33 +1214,33 @@ static void test_sync_reader_types(void) test_stream_media_props(config, &majortype); ref = IWMStreamConfig_Release(config); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); output_number = 0xdeadbeef; hr = IWMSyncReader_GetOutputNumberForStream(reader, stream_number, &output_number); - ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(output_number == 1 - i, "Got output number %u.\n", output_number); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine ok(output_number == 1 - i, "Got output number %lu.\n", output_number); stream_number2 = 0xdead; hr = IWMSyncReader_GetStreamNumberForOutput(reader, output_number, &stream_number2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(stream_number2 == stream_number, "Expected stream number %u, got %u.\n", stream_number, stream_number2); hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret_size = sizeof(mt_buffer); hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); memset(&majortype2, 0xcc, sizeof(majortype2)); hr = IWMOutputMediaProps_GetType(output_props, &majortype2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(IsEqualGUID(&majortype2, &majortype), "Expected major type %s, got %s.\n", debugstr_guid(&majortype), debugstr_guid(&majortype2)); ref = IWMOutputMediaProps_Release(output_props); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); if (IsEqualGUID(&majortype, &MEDIATYPE_Audio)) { @@ -1256,38 +1256,38 @@ static void test_sync_reader_types(void) count = 0; hr = IWMSyncReader_GetOutputFormatCount(reader, output_number, &count); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(count > 0, "Got count %u.\n", count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count > 0, "Got count %lu.\n", count); for (j = 0; j < count; ++j) { - winetest_push_context("Format %u", j); + winetest_push_context("Format %lu", j); hr = IWMSyncReader_GetOutputFormat(reader, output_number, j, &output_props); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetOutputFormat(reader, output_number, j, &output_props2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(output_props2 != output_props, "Expected different objects.\n"); ref = IWMOutputMediaProps_Release(output_props2); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); size = 0xdeadbeef; hr = IWMOutputMediaProps_GetMediaType(output_props, NULL, &size); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(size != 0xdeadbeef && size >= sizeof(WM_MEDIA_TYPE), "Got size %u.\n", size); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(size != 0xdeadbeef && size >= sizeof(WM_MEDIA_TYPE), "Got size %lu.\n", size); ret_size = size - 1; hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); - ok(hr == ASF_E_BUFFERTOOSMALL, "Got hr %#x.\n", hr); - ok(ret_size == size, "Expected size %u, got %u.\n", size, ret_size); + ok(hr == ASF_E_BUFFERTOOSMALL, "Got hr %#lx.\n", hr); + ok(ret_size == size, "Expected size %lu, got %lu.\n", size, ret_size); ret_size = sizeof(mt_buffer); memset(mt_buffer, 0xcc, sizeof(mt_buffer)); hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(ret_size == size, "Expected size %u, got %u.\n", size, ret_size); - ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "Expected size %u, got %u.\n", + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(ret_size == size, "Expected size %lu, got %lu.\n", size, ret_size); + ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "Expected size %Iu, got %lu.\n", sizeof(WM_MEDIA_TYPE) + mt->cbFormat, size); ok(IsEqualGUID(&mt->majortype, &majortype), "Got major type %s.\n", debugstr_guid(&mt->majortype)); @@ -1299,52 +1299,52 @@ static void test_sync_reader_types(void) memset(&majortype2, 0xcc, sizeof(majortype2)); hr = IWMOutputMediaProps_GetType(output_props, &majortype2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(IsEqualGUID(&majortype2, &majortype), "Expected major type %s, got %s.\n", debugstr_guid(&majortype), debugstr_guid(&majortype2)); hr = IWMSyncReader_SetOutputProps(reader, output_number, output_props); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetOutputProps(reader, 1 - output_number, output_props); if (!i) - todo_wine ok(hr == ASF_E_BADMEDIATYPE, "Got hr %#x.\n", hr); + todo_wine ok(hr == ASF_E_BADMEDIATYPE, "Got hr %#lx.\n", hr); else ok(hr == NS_E_INCOMPATIBLE_FORMAT - || hr == NS_E_INVALID_OUTPUT_FORMAT /* win10 */, "Got hr %#x.\n", hr); + || hr == NS_E_INVALID_OUTPUT_FORMAT /* win10 */, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetOutputProps(reader, 2, output_props); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(output_props2 != output_props, "Expected different objects.\n"); ret_size = sizeof(mt2_buffer); hr = IWMOutputMediaProps_GetMediaType(output_props2, mt2, &ret_size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); ref = IWMOutputMediaProps_Release(output_props2); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); ref = IWMOutputMediaProps_Release(output_props); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); winetest_pop_context(); } hr = IWMSyncReader_GetOutputFormat(reader, output_number, count, &output_props); - ok(hr == NS_E_INVALID_OUTPUT_FORMAT, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_OUTPUT_FORMAT, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(output_props2 != output_props, "Expected different objects.\n"); ref = IWMOutputMediaProps_Release(output_props2); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); ref = IWMOutputMediaProps_Release(output_props); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); winetest_pop_context(); } @@ -1354,27 +1354,27 @@ static void test_sync_reader_types(void) count = 0xdeadbeef; hr = IWMSyncReader_GetOutputFormatCount(reader, 2, &count); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); - ok(count == 0xdeadbeef, "Got count %#x.\n", count); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + ok(count == 0xdeadbeef, "Got count %#lx.\n", count); output_props = (void *)0xdeadbeef; hr = IWMSyncReader_GetOutputProps(reader, 2, &output_props); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); ok(output_props == (void *)0xdeadbeef, "Got output props %p.\n", output_props); output_props = (void *)0xdeadbeef; hr = IWMSyncReader_GetOutputFormat(reader, 2, 0, &output_props); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); ok(output_props == (void *)0xdeadbeef, "Got output props %p.\n", output_props); IWMProfile_Release(profile); ref = IWMSyncReader_Release(reader); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); - ok(stream.refcount == 1, "Got outstanding refcount %d.\n", stream.refcount); + ok(stream.refcount == 1, "Got outstanding refcount %ld.\n", stream.refcount); CloseHandle(stream.file); ret = DeleteFileW(filename); - ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); + ok(ret, "Failed to delete %s, error %lu.\n", debugstr_w(filename), GetLastError()); } static void test_sync_reader_file(void) @@ -1388,32 +1388,32 @@ static void test_sync_reader_file(void) BOOL ret; hr = WMCreateSyncReader(NULL, 0, &reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); IWMSyncReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); hr = IWMSyncReader_Open(reader, filename); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); count = 0xdeadbeef; hr = IWMSyncReader_GetOutputCount(reader, &count); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(count == 2, "Got count %u.\n", count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count == 2, "Got count %lu.\n", count); hr = IWMSyncReader_Close(reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_Close(reader); - ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#lx.\n", hr); hr = IWMSyncReader_Open(reader, filename); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); IWMProfile_Release(profile); ref = IWMSyncReader_Release(reader); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); ret = DeleteFileW(filename); - ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); + ok(ret, "Failed to delete %s, error %lu.\n", debugstr_w(filename), GetLastError()); } struct callback @@ -1444,7 +1444,7 @@ static HRESULT WINAPI callback_QueryInterface(IWMReaderCallback *iface, REFIID i struct callback *callback = impl_from_IWMReaderCallback(iface); if (winetest_debug > 1) - trace("%04x: IWMReaderCallback::QueryInterface(%s)\n", GetCurrentThreadId(), debugstr_guid(iid)); + trace("%04lx: IWMReaderCallback::QueryInterface(%s)\n", GetCurrentThreadId(), debugstr_guid(iid)); if (IsEqualGUID(iid, &IID_IWMReaderAllocatorEx)) *out = &callback->IWMReaderAllocatorEx_iface; @@ -1482,21 +1482,21 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta struct callback *callback = impl_from_IWMReaderCallback(iface); if (winetest_debug > 1) - trace("%u: %04x: IWMReaderCallback::OnStatus(status %u, hr %#x, type %#x, value %p)\n", + trace("%lu: %04lx: IWMReaderCallback::OnStatus(status %u, hr %#lx, type %#x, value %p)\n", GetTickCount(), GetCurrentThreadId(), status, hr, type, value); switch (status) { case WMT_OPENED: ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); - ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); ok(context == (void *)0xdeadbeef, "Got unexpected context %p.\n", context); SetEvent(callback->got_opened); break; case WMT_STARTED: ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); - ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); callback->got_end_of_streaming = callback->got_eof = callback->got_sample = 0; ++callback->got_started; @@ -1504,21 +1504,21 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta case WMT_STOPPED: ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); - ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); SetEvent(callback->got_stopped); break; case WMT_CLOSED: ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); - ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); ++callback->got_closed; break; case WMT_END_OF_STREAMING: ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); - ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); ok(!callback->got_eof, "Got %u WMT_EOF callbacks.\n", callback->got_eof); ++callback->got_end_of_streaming; @@ -1526,7 +1526,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta case WMT_EOF: ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); - ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); if (callback->all_streams_off) ok(callback->got_sample == 0, "Got %u samples.\n", callback->got_sample); @@ -1541,7 +1541,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta /* Not sent when not using IWMReaderAdvanced::DeliverTime(). */ case WMT_END_OF_SEGMENT: ok(type == WMT_TYPE_QWORD, "Got type %#x.\n", type); - ok(*(QWORD *)value == 3000, "Got value %#x.\n", *(DWORD *)value); + ok(*(QWORD *)value == 3000, "Got value %#lx.\n", *(DWORD *)value); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); if (callback->all_streams_off) ok(callback->got_sample == 0, "Got %u samples.\n", callback->got_sample); @@ -1554,7 +1554,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta ok(0, "Unexpected status %#x.\n", status); } - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); return S_OK; } @@ -1569,33 +1569,33 @@ static void check_async_sample(struct callback *callback, INSSBuffer *sample) struct buffer *buffer = impl_from_INSSBuffer(sample); ok(sample->lpVtbl == &buffer_vtbl, "Buffer vtbl didn't match.\n"); - ok(buffer->size > 0 && buffer->size <= buffer->capacity, "Got size %d.\n", buffer->size); + ok(buffer->size > 0 && buffer->size <= buffer->capacity, "Got size %ld.\n", buffer->size); } else { ok(sample->lpVtbl != &buffer_vtbl, "Buffer vtbl shouldn't match.\n"); hr = INSSBuffer_GetBufferAndLength(sample, &data, &size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = INSSBuffer_GetBuffer(sample, &data2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(data2 == data, "Data pointers didn't match.\n"); hr = INSSBuffer_GetMaxLength(sample, &capacity); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(size <= capacity, "Size %u exceeds capacity %u.\n", size, capacity); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(size <= capacity, "Size %lu exceeds capacity %lu.\n", size, capacity); hr = INSSBuffer_SetLength(sample, capacity + 1); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = INSSBuffer_SetLength(sample, capacity - 1); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = INSSBuffer_GetBufferAndLength(sample, &data2, &size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(data2 == data, "Data pointers didn't match.\n"); - ok(size == capacity - 1, "Expected size %u, got %u.\n", capacity - 1, size); + ok(size == capacity - 1, "Expected size %lu, got %lu.\n", capacity - 1, size); } } @@ -1605,7 +1605,7 @@ static HRESULT WINAPI callback_OnSample(IWMReaderCallback *iface, DWORD output, struct callback *callback = impl_from_IWMReaderCallback(iface); if (winetest_debug > 1) - trace("%u: %04x: IWMReaderCallback::OnSample(output %u, time %I64u, duration %I64u, flags %#x)\n", + trace("%lu: %04lx: IWMReaderCallback::OnSample(output %lu, time %I64u, duration %I64u, flags %#lx)\n", GetTickCount(), GetCurrentThreadId(), output, time, duration, flags); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); @@ -1658,7 +1658,7 @@ static HRESULT WINAPI callback_advanced_OnStreamSample(IWMReaderCallbackAdvanced struct callback *callback = impl_from_IWMReaderCallbackAdvanced(iface); if (winetest_debug > 1) - trace("%u: %04x: IWMReaderCallbackAdvanced::OnStreamSample(stream %u, pts %I64u, duration %I64u, flags %#x)\n", + trace("%lu: %04lx: IWMReaderCallbackAdvanced::OnStreamSample(stream %u, pts %I64u, duration %I64u, flags %#lx)\n", GetTickCount(), GetCurrentThreadId(), stream_number, pts, duration, flags); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); @@ -1678,7 +1678,7 @@ static HRESULT WINAPI callback_advanced_OnTime(IWMReaderCallbackAdvanced *iface, struct callback *callback = impl_from_IWMReaderCallbackAdvanced(iface); if (winetest_debug > 1) - trace("%u: %04x: IWMReaderCallbackAdvanced::OnTime(time %I64u)\n", + trace("%lu: %04lx: IWMReaderCallbackAdvanced::OnTime(time %I64u)\n", GetTickCount(), GetCurrentThreadId(), time); ok(time == callback->expect_ontime, "Got time %I64u.\n", time); @@ -1709,13 +1709,13 @@ static HRESULT WINAPI callback_advanced_AllocateForStream(IWMReaderCallbackAdvan struct buffer *object; if (winetest_debug > 1) - trace("%u: %04x: IWMReaderCallbackAdvanced::AllocateForStream(output %u, size %u)\n", + trace("%lu: %04lx: IWMReaderCallbackAdvanced::AllocateForStream(output %u, size %lu)\n", GetTickCount(), GetCurrentThreadId(), stream_number, size); ok(callback->read_compressed, "AllocateForStream() should only be called when reading compressed samples.\n"); ok(callback->allocated_samples, "AllocateForStream() should only be called when using a custom allocator.\n"); - ok(size <= max_size, "Got size %u, max stream sample size %u.\n", size, max_size); + ok(size <= max_size, "Got size %lu, max stream sample size %lu.\n", size, max_size); if (!(object = malloc(offsetof(struct buffer, data[size])))) return E_OUTOFMEMORY; @@ -1742,7 +1742,7 @@ static HRESULT WINAPI callback_advanced_AllocateForOutput(IWMReaderCallbackAdvan struct buffer *object; if (winetest_debug > 1) - trace("%u: %04x: IWMReaderCallbackAdvanced::AllocateForOutput(output %u, size %u)\n", + trace("%lu: %04lx: IWMReaderCallbackAdvanced::AllocateForOutput(output %lu, size %lu)\n", GetTickCount(), GetCurrentThreadId(), output, size); if (!callback->read_compressed) @@ -1866,23 +1866,23 @@ static void run_async_reader(IWMReader *reader, IWMReaderAdvanced2 *advanced, st callback->got_eof = 0; hr = IWMReader_Start(reader, 0, 0, 1.0f, (void *)0xfacade); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetUserProvidedClock(advanced, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_DeliverTime(advanced, 3000 * 10000); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = WaitForSingleObject(callback->eof_event, 1000); ok(!ret, "Wait timed out.\n"); ok(callback->got_eof == 1, "Got %u WMT_EOF callbacks.\n", callback->got_eof); hr = IWMReader_Stop(reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = WaitForSingleObject(callback->got_stopped, 1000); ok(!ret, "Wait timed out.\n"); - ok(!outstanding_buffers, "Got %d outstanding buffers.\n", outstanding_buffers); + ok(!outstanding_buffers, "Got %ld outstanding buffers.\n", outstanding_buffers); } static void test_async_reader_allocate(IWMReader *reader, @@ -1894,51 +1894,51 @@ static void test_async_reader_allocate(IWMReader *reader, callback->allocated_samples = true; hr = IWMReaderAdvanced2_GetAllocateForOutput(advanced, 0, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(!allocate, "Got allocate %d.\n", allocate); hr = IWMReaderAdvanced2_GetAllocateForOutput(advanced, 1, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(!allocate, "Got allocate %d.\n", allocate); hr = IWMReaderAdvanced2_GetAllocateForOutput(advanced, 2, &allocate); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_GetAllocateForStream(advanced, 0, &allocate); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_GetAllocateForStream(advanced, 1, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(!allocate, "Got allocate %d.\n", allocate); hr = IWMReaderAdvanced2_GetAllocateForStream(advanced, 2, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(!allocate, "Got allocate %d.\n", allocate); hr = IWMReaderAdvanced2_GetAllocateForStream(advanced, 3, &allocate); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForOutput(advanced, 0, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForOutput(advanced, 1, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForOutput(advanced, 2, TRUE); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_GetAllocateForOutput(advanced, 0, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(allocate == TRUE, "Got allocate %d.\n", allocate); hr = IWMReaderAdvanced2_GetAllocateForOutput(advanced, 1, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(allocate == TRUE, "Got allocate %d.\n", allocate); hr = IWMReaderAdvanced2_GetAllocateForStream(advanced, 1, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(!allocate, "Got allocate %d.\n", allocate); hr = IWMReaderAdvanced2_GetAllocateForStream(advanced, 2, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(!allocate, "Got allocate %d.\n", allocate); @@ -1947,43 +1947,43 @@ static void test_async_reader_allocate(IWMReader *reader, callback->allocated_samples = false; hr = IWMReaderAdvanced2_SetAllocateForOutput(advanced, 0, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForOutput(advanced, 1, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForStream(advanced, 0, TRUE); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForStream(advanced, 1, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForStream(advanced, 2, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForStream(advanced, 3, TRUE); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_GetAllocateForOutput(advanced, 0, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(!allocate, "Got allocate %d.\n", allocate); hr = IWMReaderAdvanced2_GetAllocateForOutput(advanced, 1, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(!allocate, "Got allocate %d.\n", allocate); hr = IWMReaderAdvanced2_GetAllocateForStream(advanced, 1, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(allocate == TRUE, "Got allocate %d.\n", allocate); hr = IWMReaderAdvanced2_GetAllocateForStream(advanced, 2, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(allocate == TRUE, "Got allocate %d.\n", allocate); run_async_reader(reader, advanced, callback); hr = IWMReaderAdvanced2_SetAllocateForStream(advanced, 1, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForStream(advanced, 2, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); } static void test_async_reader_selection(IWMReader *reader, @@ -1995,51 +1995,51 @@ static void test_async_reader_selection(IWMReader *reader, selections[0] = 0xdeadbeef; hr = IWMReaderAdvanced2_GetStreamSelected(advanced, 0, &selections[0]); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); ok(selections[0] == 0xdeadbeef, "Got selection %#x.\n", selections[0]); selections[0] = 0xdeadbeef; hr = IWMReaderAdvanced2_GetStreamSelected(advanced, 1, &selections[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(selections[0] == WMT_ON, "Got selection %#x.\n", selections[0]); selections[0] = 0xdeadbeef; hr = IWMReaderAdvanced2_GetStreamSelected(advanced, 2, &selections[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(selections[0] == WMT_ON, "Got selection %#x.\n", selections[0]); selections[0] = 0xdeadbeef; hr = IWMReaderAdvanced2_GetStreamSelected(advanced, 3, &selections[0]); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); ok(selections[0] == 0xdeadbeef, "Got selection %#x.\n", selections[0]); hr = IWMReaderAdvanced2_SetStreamsSelected(advanced, 0, NULL, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); stream_numbers[0] = 1; stream_numbers[1] = 0; selections[0] = selections[1] = WMT_OFF; hr = IWMReaderAdvanced2_SetStreamsSelected(advanced, 2, stream_numbers, selections); - ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#lx.\n", hr); selections[0] = 0xdeadbeef; hr = IWMReaderAdvanced2_GetStreamSelected(advanced, 1, &selections[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(selections[0] == WMT_ON, "Got selection %#x.\n", selections[0]); stream_numbers[0] = stream_numbers[1] = 1; selections[0] = selections[1] = WMT_OFF; hr = IWMReaderAdvanced2_SetStreamsSelected(advanced, 2, stream_numbers, selections); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); selections[0] = 0xdeadbeef; hr = IWMReaderAdvanced2_GetStreamSelected(advanced, 1, &selections[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(selections[0] == WMT_OFF, "Got selection %#x.\n", selections[0]); selections[0] = 0xdeadbeef; hr = IWMReaderAdvanced2_GetStreamSelected(advanced, 2, &selections[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(selections[0] == WMT_ON, "Got selection %#x.\n", selections[0]); run_async_reader(reader, advanced, callback); @@ -2047,7 +2047,7 @@ static void test_async_reader_selection(IWMReader *reader, stream_numbers[0] = stream_numbers[1] = 2; selections[0] = selections[1] = WMT_OFF; hr = IWMReaderAdvanced2_SetStreamsSelected(advanced, 2, stream_numbers, selections); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); callback->all_streams_off = true; run_async_reader(reader, advanced, callback); @@ -2057,7 +2057,7 @@ static void test_async_reader_selection(IWMReader *reader, stream_numbers[1] = 2; selections[0] = selections[1] = WMT_ON; hr = IWMReaderAdvanced2_SetStreamsSelected(advanced, 2, stream_numbers, selections); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); } static void test_async_reader_compressed(IWMReader *reader, @@ -2066,33 +2066,33 @@ static void test_async_reader_compressed(IWMReader *reader, HRESULT hr; hr = IWMReaderAdvanced2_GetMaxStreamSampleSize(advanced, 0, &callback->max_stream_sample_size[0]); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_GetMaxStreamSampleSize(advanced, 3, &callback->max_stream_sample_size[0]); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_GetMaxStreamSampleSize(advanced, 1, &callback->max_stream_sample_size[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(callback->max_stream_sample_size[0] > 0, "Expected nonzero size.\n"); hr = IWMReaderAdvanced2_GetMaxStreamSampleSize(advanced, 2, &callback->max_stream_sample_size[1]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(callback->max_stream_sample_size[1] > 0, "Expected nonzero size.\n"); hr = IWMReaderAdvanced2_SetReceiveStreamSamples(advanced, 0, TRUE); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetReceiveStreamSamples(advanced, 3, TRUE); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetReceiveStreamSamples(advanced, 1, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetReceiveStreamSamples(advanced, 2, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); callback->read_compressed = true; run_async_reader(reader, advanced, callback); callback->read_compressed = false; hr = IWMReaderAdvanced2_SetReceiveStreamSamples(advanced, 1, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetReceiveStreamSamples(advanced, 2, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); } static void test_async_reader_allocate_compressed(IWMReader *reader, @@ -2103,42 +2103,42 @@ static void test_async_reader_allocate_compressed(IWMReader *reader, callback->read_compressed = true; hr = IWMReaderAdvanced2_SetReceiveStreamSamples(advanced, 1, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetReceiveStreamSamples(advanced, 2, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); callback->allocated_samples = true; hr = IWMReaderAdvanced2_SetAllocateForStream(advanced, 1, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForStream(advanced, 2, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); run_async_reader(reader, advanced, callback); hr = IWMReaderAdvanced2_SetAllocateForStream(advanced, 1, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForStream(advanced, 2, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForOutput(advanced, 0, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForOutput(advanced, 1, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); callback->allocated_samples = false; run_async_reader(reader, advanced, callback); hr = IWMReaderAdvanced2_SetAllocateForOutput(advanced, 0, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForOutput(advanced, 1, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetReceiveStreamSamples(advanced, 1, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetReceiveStreamSamples(advanced, 2, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); callback->read_compressed = false; } @@ -2159,68 +2159,68 @@ static void test_async_reader_streaming(void) BOOL ret; file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); - ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", debugstr_w(file), GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %lu.\n", debugstr_w(file), GetLastError()); teststream_init(&stream, file); callback_init(&callback); hr = WMCreateReader(NULL, 0, &reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); IWMReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); IWMReader_QueryInterface(reader, &IID_IWMReaderAdvanced2, (void **)&advanced); hr = IWMReader_Stop(reader); - ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); + ok(hr == E_UNEXPECTED, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_OpenStream(advanced, &stream.IStream_iface, &callback.IWMReaderCallback_iface, (void **)0xdeadbeef); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); - ok(callback.refcount > 1, "Got refcount %d.\n", callback.refcount); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(stream.refcount > 1, "Got refcount %ld.\n", stream.refcount); + ok(callback.refcount > 1, "Got refcount %ld.\n", callback.refcount); ret = WaitForSingleObject(callback.got_opened, 1000); ok(!ret, "Wait timed out.\n"); count = 0xdeadbeef; hr = IWMReader_GetOutputCount(reader, &count); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(count == 2, "Got count %u.\n", count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count == 2, "Got count %lu.\n", count); for (i = 0; i < 2; ++i) { hr = IWMProfile_GetStream(profile, i, &config); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); stream_numbers[i] = 0xdead; hr = IWMStreamConfig_GetStreamNumber(config, &stream_numbers[i]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(stream_numbers[i] == i + 1, "Got stream number %u.\n", stream_numbers[i]); ref = IWMStreamConfig_Release(config); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); } hr = IWMReader_Start(reader, 0, 0, 1.0f, (void *)0xfacade); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); /* By default the reader will time itself, and attempt to deliver samples * according to their presentation time. Call DeliverTime with the file * duration in order to request all samples as fast as possible. */ hr = IWMReaderAdvanced2_DeliverTime(advanced, 3000 * 10000); - ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); + ok(hr == E_UNEXPECTED, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetUserProvidedClock(advanced, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); callback.expect_ontime = 0; hr = IWMReaderAdvanced2_DeliverTime(advanced, 0); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = WaitForSingleObject(callback.ontime_event, 1000); ok(!ret, "Wait timed out.\n"); callback.expect_ontime = 1000 * 10000; hr = IWMReaderAdvanced2_DeliverTime(advanced, 1000 * 10000); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = WaitForSingleObject(callback.ontime_event, 1000); ok(!ret, "Wait timed out.\n"); callback.expect_ontime = 3000 * 10000; hr = IWMReaderAdvanced2_DeliverTime(advanced, 3000 * 10000); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = WaitForSingleObject(callback.ontime_event, 1000); ok(!ret, "Wait timed out.\n"); @@ -2229,22 +2229,22 @@ static void test_async_reader_streaming(void) ok(callback.got_eof == 1, "Got %u WMT_EOF callbacks.\n", callback.got_eof); hr = IWMReader_Start(reader, 0, 0, 1.0f, (void *)0xfacade); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_DeliverTime(advanced, 3000 * 10000); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = WaitForSingleObject(callback.eof_event, 1000); ok(!ret, "Wait timed out.\n"); ok(callback.got_eof == 1, "Got %u WMT_EOF callbacks.\n", callback.got_eof); hr = IWMReader_Stop(reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = WaitForSingleObject(callback.got_stopped, 1000); ok(!ret, "Wait timed out.\n"); hr = IWMReader_Stop(reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = WaitForSingleObject(callback.got_stopped, 1000); ok(!ret, "Wait timed out.\n"); @@ -2255,26 +2255,26 @@ static void test_async_reader_streaming(void) test_async_reader_allocate_compressed(reader, advanced, &callback); hr = IWMReader_Close(reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(callback.got_closed == 1, "Got %u WMT_CLOSED callbacks.\n", callback.got_closed); - ok(callback.refcount == 1, "Got outstanding refcount %d.\n", callback.refcount); + ok(callback.refcount == 1, "Got outstanding refcount %ld.\n", callback.refcount); callback_cleanup(&callback); hr = IWMReader_Stop(reader); - ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); + ok(hr == E_UNEXPECTED, "Got hr %#lx.\n", hr); - ok(stream.refcount == 1, "Got outstanding refcount %d.\n", stream.refcount); + ok(stream.refcount == 1, "Got outstanding refcount %ld.\n", stream.refcount); CloseHandle(stream.file); ret = DeleteFileW(filename); - ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); + ok(ret, "Failed to delete %s, error %lu.\n", debugstr_w(filename), GetLastError()); hr = IWMReader_Close(reader); - ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#lx.\n", hr); IWMReaderAdvanced2_Release(advanced); IWMProfile_Release(profile); ref = IWMReader_Release(reader); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); } static void test_async_reader_types(void) @@ -2299,32 +2299,32 @@ static void test_async_reader_types(void) BOOL ret; file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); - ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", debugstr_w(file), GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %lu.\n", debugstr_w(file), GetLastError()); teststream_init(&stream, file); callback_init(&callback); hr = WMCreateReader(NULL, 0, &reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); IWMReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); IWMReader_QueryInterface(reader, &IID_IWMReaderAdvanced2, (void **)&advanced); hr = IWMReaderAdvanced2_OpenStream(advanced, &stream.IStream_iface, &callback.IWMReaderCallback_iface, (void **)0xdeadbeef); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); - ok(callback.refcount > 1, "Got refcount %d.\n", callback.refcount); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(stream.refcount > 1, "Got refcount %ld.\n", stream.refcount); + ok(callback.refcount > 1, "Got refcount %ld.\n", callback.refcount); ret = WaitForSingleObject(callback.got_opened, 1000); ok(!ret, "Wait timed out.\n"); for (i = 0; i < 2; ++i) { - winetest_push_context("Stream %u", i); + winetest_push_context("Stream %lu", i); hr = IWMProfile_GetStream(profile, i, &config); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMStreamConfig_GetStreamType(config, &majortype); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); if (!i) ok(IsEqualGUID(&majortype, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&majortype)); else @@ -2333,32 +2333,32 @@ static void test_async_reader_types(void) test_stream_media_props(config, &majortype); ref = IWMStreamConfig_Release(config); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); winetest_pop_context(); } for (i = 0; i < 2; ++i) { - winetest_push_context("Output %u", i); + winetest_push_context("Output %lu", i); output_number = i; hr = IWMReader_GetOutputProps(reader, output_number, &output_props); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret_size = sizeof(mt_buffer); hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); majortype = mt->majortype; memset(&majortype2, 0xcc, sizeof(majortype2)); hr = IWMOutputMediaProps_GetType(output_props, &majortype2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(IsEqualGUID(&majortype2, &majortype), "Expected major type %s, got %s.\n", debugstr_guid(&majortype), debugstr_guid(&majortype2)); ref = IWMOutputMediaProps_Release(output_props); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); if (IsEqualGUID(&majortype, &MEDIATYPE_Audio)) { @@ -2372,14 +2372,14 @@ static void test_async_reader_types(void) * with. In particular it has to be PCM. */ hr = IWMReader_GetOutputFormat(reader, output_number, 0, &output_props); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret_size = sizeof(mt2_buffer); hr = IWMOutputMediaProps_GetMediaType(output_props, mt2, &ret_size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ref = IWMOutputMediaProps_Release(output_props); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); /* The sample size might differ. */ mt2->lSampleSize = mt->lSampleSize; @@ -2396,38 +2396,38 @@ static void test_async_reader_types(void) count = 0; hr = IWMReader_GetOutputFormatCount(reader, output_number, &count); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(count > 0, "Got count %u.\n", count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count > 0, "Got count %lu.\n", count); for (j = 0; j < count; ++j) { - winetest_push_context("Format %u", j); + winetest_push_context("Format %lu", j); hr = IWMReader_GetOutputFormat(reader, output_number, j, &output_props); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReader_GetOutputFormat(reader, output_number, j, &output_props2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(output_props2 != output_props, "Expected different objects.\n"); ref = IWMOutputMediaProps_Release(output_props2); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); size = 0xdeadbeef; hr = IWMOutputMediaProps_GetMediaType(output_props, NULL, &size); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(size != 0xdeadbeef && size >= sizeof(WM_MEDIA_TYPE), "Got size %u.\n", size); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(size != 0xdeadbeef && size >= sizeof(WM_MEDIA_TYPE), "Got size %lu.\n", size); ret_size = size - 1; hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); - ok(hr == ASF_E_BUFFERTOOSMALL, "Got hr %#x.\n", hr); - ok(ret_size == size, "Expected size %u, got %u.\n", size, ret_size); + ok(hr == ASF_E_BUFFERTOOSMALL, "Got hr %#lx.\n", hr); + ok(ret_size == size, "Expected size %lu, got %lu.\n", size, ret_size); ret_size = sizeof(mt_buffer); memset(mt_buffer, 0xcc, sizeof(mt_buffer)); hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(ret_size == size, "Expected size %u, got %u.\n", size, ret_size); - ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "Expected size %u, got %u.\n", + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(ret_size == size, "Expected size %lu, got %lu.\n", size, ret_size); + ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "Expected size %Iu, got %lu.\n", sizeof(WM_MEDIA_TYPE) + mt->cbFormat, size); ok(IsEqualGUID(&mt->majortype, &majortype), "Got major type %s.\n", debugstr_guid(&mt->majortype)); @@ -2439,52 +2439,52 @@ static void test_async_reader_types(void) memset(&majortype2, 0xcc, sizeof(majortype2)); hr = IWMOutputMediaProps_GetType(output_props, &majortype2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(IsEqualGUID(&majortype2, &majortype), "Expected major type %s, got %s.\n", debugstr_guid(&majortype), debugstr_guid(&majortype2)); hr = IWMReader_SetOutputProps(reader, output_number, output_props); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReader_SetOutputProps(reader, 1 - output_number, output_props); if (!i) ok(hr == NS_E_INCOMPATIBLE_FORMAT /* win < 8, win10 1507-1809 */ - || hr == ASF_E_BADMEDIATYPE /* win8, win10 1909+ */, "Got hr %#x.\n", hr); + || hr == ASF_E_BADMEDIATYPE /* win8, win10 1909+ */, "Got hr %#lx.\n", hr); else - todo_wine ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + todo_wine ok(hr == NS_E_INVALID_REQUEST, "Got hr %#lx.\n", hr); hr = IWMReader_SetOutputProps(reader, 2, output_props); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMReader_GetOutputProps(reader, output_number, &output_props2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(output_props2 != output_props, "Expected different objects.\n"); ret_size = sizeof(mt2_buffer); hr = IWMOutputMediaProps_GetMediaType(output_props2, mt2, &ret_size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); ref = IWMOutputMediaProps_Release(output_props2); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); ref = IWMOutputMediaProps_Release(output_props); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); winetest_pop_context(); } hr = IWMReader_GetOutputFormat(reader, output_number, count, &output_props); - ok(hr == NS_E_INVALID_OUTPUT_FORMAT, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_OUTPUT_FORMAT, "Got hr %#lx.\n", hr); hr = IWMReader_GetOutputProps(reader, output_number, &output_props); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReader_GetOutputProps(reader, output_number, &output_props2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(output_props2 != output_props, "Expected different objects.\n"); ref = IWMOutputMediaProps_Release(output_props2); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); ref = IWMOutputMediaProps_Release(output_props); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); winetest_pop_context(); } @@ -2494,28 +2494,28 @@ static void test_async_reader_types(void) count = 0xdeadbeef; hr = IWMReader_GetOutputFormatCount(reader, 2, &count); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); - ok(count == 0xdeadbeef, "Got count %#x.\n", count); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + ok(count == 0xdeadbeef, "Got count %#lx.\n", count); output_props = (void *)0xdeadbeef; hr = IWMReader_GetOutputProps(reader, 2, &output_props); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); ok(output_props == (void *)0xdeadbeef, "Got output props %p.\n", output_props); output_props = (void *)0xdeadbeef; hr = IWMReader_GetOutputFormat(reader, 2, 0, &output_props); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); ok(output_props == (void *)0xdeadbeef, "Got output props %p.\n", output_props); IWMReaderAdvanced2_Release(advanced); IWMProfile_Release(profile); ref = IWMReader_Release(reader); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); - ok(stream.refcount == 1, "Got outstanding refcount %d.\n", stream.refcount); + ok(stream.refcount == 1, "Got outstanding refcount %ld.\n", stream.refcount); CloseHandle(stream.file); ret = DeleteFileW(filename); - ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); + ok(ret, "Failed to delete %s, error %lu.\n", debugstr_w(filename), GetLastError()); } static void test_async_reader_file(void) @@ -2531,39 +2531,39 @@ static void test_async_reader_file(void) callback_init(&callback); hr = WMCreateReader(NULL, 0, &reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReader_Open(reader, filename, &callback.IWMReaderCallback_iface, (void **)0xdeadbeef); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(callback.refcount > 1, "Got refcount %d.\n", callback.refcount); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(callback.refcount > 1, "Got refcount %ld.\n", callback.refcount); ret = WaitForSingleObject(callback.got_opened, 1000); ok(!ret, "Wait timed out.\n"); count = 0xdeadbeef; hr = IWMReader_GetOutputCount(reader, &count); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(count == 2, "Got count %u.\n", count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count == 2, "Got count %lu.\n", count); hr = IWMReader_Start(reader, 0, 0, 1.0f, (void *)0xfacade); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReader_Close(reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(callback.got_closed == 1, "Got %u WMT_CLOSED callbacks.\n", callback.got_closed); - ok(callback.refcount == 1, "Got outstanding refcount %d.\n", callback.refcount); + ok(callback.refcount == 1, "Got outstanding refcount %ld.\n", callback.refcount); callback_cleanup(&callback); hr = IWMReader_Close(reader); - ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#lx.\n", hr); ref = IWMReader_Release(reader); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); ok(callback.got_closed == 1, "Got %u WMT_CLOSED callbacks.\n", callback.got_closed); - ok(callback.refcount == 1, "Got outstanding refcount %d.\n", callback.refcount); + ok(callback.refcount == 1, "Got outstanding refcount %ld.\n", callback.refcount); callback_cleanup(&callback); ret = DeleteFileW(filename); - ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); + ok(ret, "Failed to delete %s, error %lu.\n", debugstr_w(filename), GetLastError()); } START_TEST(wmvcore)

1 0

[PATCH] dlls/wlanapi/tests: enable compilation with long types
by Eric Pouech 10 Mar '22

10 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wlanapi/tests/Makefile.in | 1 - dlls/wlanapi/tests/wlanapi.c | 60 ++++++++++++++++++++-------------------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/wlanapi/tests/Makefile.in b/dlls/wlanapi/tests/Makefile.in index 6fede3572c8..a08db320f1f 100644 --- a/dlls/wlanapi/tests/Makefile.in +++ b/dlls/wlanapi/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wlanapi.dll IMPORTS = wlanapi diff --git a/dlls/wlanapi/tests/wlanapi.c b/dlls/wlanapi/tests/wlanapi.c index 55ac21eee04..5c26e6d8ba0 100644 --- a/dlls/wlanapi/tests/wlanapi.c +++ b/dlls/wlanapi/tests/wlanapi.c @@ -35,73 +35,73 @@ static void test_WlanOpenHandle(void) is_xp = ret == ERROR_SUCCESS; if (!is_xp) /* the results in XP differ completely from all other versions */ { - ok(ret == ERROR_NOT_SUPPORTED, "Expected 50, got %d\n", ret); + ok(ret == ERROR_NOT_SUPPORTED, "Expected 50, got %ld\n", ret); ok(neg_version == 0xdeadbeef, "neg_version changed\n"); ok(handle == bad_handle, "handle changed\n"); ret = WlanOpenHandle(10, NULL, &neg_version, &handle); - ok(ret == ERROR_NOT_SUPPORTED, "Expected 50, got %d\n", ret); + ok(ret == ERROR_NOT_SUPPORTED, "Expected 50, got %ld\n", ret); ok(neg_version == 0xdeadbeef, "neg_version changed\n"); ok(handle == bad_handle, "handle changed\n"); /* reserved parameter must not be used */ ret = WlanOpenHandle(1, &reserved, &neg_version, &handle); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); ok(neg_version == 0xdeadbeef, "neg_version changed\n"); ok(handle == bad_handle, "handle changed\n"); /* invalid parameters */ ret = WlanOpenHandle(1, NULL, NULL, &handle); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); ok(handle == bad_handle, "bad handle\n"); ret = WlanOpenHandle(1, NULL, &neg_version, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); ok(neg_version == 0xdeadbeef, "neg_version changed\n"); } else { - ok(neg_version == 1, "Expected 1, got %d\n", neg_version); + ok(neg_version == 1, "Expected 1, got %ld\n", neg_version); ok(handle != bad_handle && handle, "handle changed\n"); ret = WlanCloseHandle(handle, NULL); - ok(ret == 0, "Expected 0, got %d\n", ret); + ok(ret == 0, "Expected 0, got %ld\n", ret); } /* good tests */ ret = WlanOpenHandle(1, NULL, &neg_version, &handle); - ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); - ok(neg_version == 1, "Expected 1, got %d\n", neg_version); + ok(ret == ERROR_SUCCESS, "Expected 0, got %ld\n", ret); + ok(neg_version == 1, "Expected 1, got %ld\n", neg_version); ok(handle != bad_handle && handle, "handle changed\n"); ret = WlanCloseHandle(handle, NULL); - ok(ret == 0, "Expected 0, got %d\n", ret); + ok(ret == 0, "Expected 0, got %ld\n", ret); ret = WlanOpenHandle(2, NULL, &neg_version, &handle); - ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ok(ret == ERROR_SUCCESS, "Expected 0, got %ld\n", ret); if (!is_xp) /* XP does not support client version 2 */ - ok(neg_version == 2, "Expected 2, got %d\n", neg_version); + ok(neg_version == 2, "Expected 2, got %ld\n", neg_version); else - ok(neg_version == 1, "Expected 1, got %d\n", neg_version); + ok(neg_version == 1, "Expected 1, got %ld\n", neg_version); ok(handle != bad_handle && handle, "bad handle\n"); ret = WlanCloseHandle(handle, NULL); - ok(ret == 0, "Expected 0, got %d\n", ret); + ok(ret == 0, "Expected 0, got %ld\n", ret); /* open twice */ ret = WlanOpenHandle(1, NULL, &neg_version, &handle); - ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ok(ret == ERROR_SUCCESS, "Expected 0, got %ld\n", ret); ret = WlanOpenHandle(1, NULL, &neg_version, &handle2); - ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ok(ret == ERROR_SUCCESS, "Expected 0, got %ld\n", ret); ret = WlanCloseHandle(handle, &reserved); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); ret = WlanCloseHandle(handle, NULL); - ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ok(ret == ERROR_SUCCESS, "Expected 0, got %ld\n", ret); ret = WlanCloseHandle(handle2, NULL); - ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ok(ret == ERROR_SUCCESS, "Expected 0, got %ld\n", ret); ret = WlanCloseHandle(bad_handle, NULL); - ok(ret == ERROR_INVALID_HANDLE, "Expected 6, got %d\n", ret); + ok(ret == ERROR_INVALID_HANDLE, "Expected 6, got %ld\n", ret); ret = WlanCloseHandle(NULL, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); } static void test_WlanAllocateFreeMemory(void) @@ -111,7 +111,7 @@ static void test_WlanAllocateFreeMemory(void) SetLastError(0xdeadbeef); ptr = WlanAllocateMemory(0); ok(ptr == NULL, "Expected NULL, got %p\n", ptr); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", GetLastError()); ptr = WlanAllocateMemory(1024); ok(ptr != NULL, "Expected non-NULL\n"); @@ -130,23 +130,23 @@ static void test_WlanEnumInterfaces(void) WLAN_INTERFACE_INFO *info; ret = WlanOpenHandle(1, NULL, &neg_version, &handle); - ok(ret == 0, "Expected 0, got %d\n", ret); + ok(ret == 0, "Expected 0, got %ld\n", ret); /* invalid parameters */ ret = WlanEnumInterfaces(NULL, NULL, &list); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); ok(list == bad_list, "list changed\n"); ret = WlanEnumInterfaces(handle, &reserved, &list); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); ok(list == bad_list, "list changed\n"); ret = WlanEnumInterfaces(handle, NULL, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); ok(list == bad_list, "list changed\n"); /* good tests */ list = NULL; ret = WlanEnumInterfaces(handle, NULL, &list); - ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ok(ret == ERROR_SUCCESS, "Expected 0, got %ld\n", ret); ok(list != NULL, "bad interface list\n"); if (!list || !list->dwNumberOfItems) { @@ -156,11 +156,11 @@ static void test_WlanEnumInterfaces(void) return; } - trace("Wireless interfaces: %d\n", list->dwNumberOfItems); + trace("Wireless interfaces: %ld\n", list->dwNumberOfItems); for (i = 0; i < list->dwNumberOfItems;i ++) { info = &list->InterfaceInfo[i]; - trace(" Index[%d] GUID: %s\n", i, wine_dbgstr_guid(&info->InterfaceGuid)); + trace(" Index[%ld] GUID: %s\n", i, wine_dbgstr_guid(&info->InterfaceGuid)); switch (info->isState) { case wlan_interface_state_disconnected: @@ -179,7 +179,7 @@ static void test_WlanEnumInterfaces(void) WlanFreeMemory(list); ret = WlanCloseHandle(handle, NULL); - ok(ret == 0, "Expected 0, got %d\n", ret); + ok(ret == 0, "Expected 0, got %ld\n", ret); } START_TEST(wlanapi)

1 0

[PATCH vkd3d v4 2/8] vkd3d-shader/hlsl: Avoid leaks on memory allocation failures when parsing initializers.
by Francisco Casas 10 Mar '22

10 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v4: - This patch is new in v4. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 92dcb3f2..8c66a33c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3211,7 +3211,10 @@ complex_initializer: { $$.args_count = 1; if (!($$.args = hlsl_alloc(ctx, sizeof(*$$.args)))) + { + destroy_instr_list($1); YYABORT; + } $$.args[0] = node_from_list($1); $$.instrs = $1; } @@ -3240,7 +3243,11 @@ initializer_expr_list: { $$ = $1; if (!($$.args = hlsl_realloc(ctx, $$.args, ($$.args_count + 1) * sizeof(*$$.args)))) + { + free_parse_initializer(&$$); + destroy_instr_list($3); YYABORT; + } $$.args[$$.args_count++] = node_from_list($3); list_move_tail($$.instrs, $3); vkd3d_free($3); -- 2.25.1

2 4

[PATCH v3 1/5] bcrypt: Implement KeyLength property.
by Santino Mazza 10 Mar '22

10 Mar '22

Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/bcrypt/bcrypt_main.c | 6 ++++++ dlls/bcrypt/tests/bcrypt.c | 20 +++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 7353cae26eb..75ee96f56c7 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -701,6 +701,12 @@ static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *val return STATUS_NOT_IMPLEMENTED; } } + else if (!wcscmp( prop, BCRYPT_KEY_LENGTH )) + { + if(size < sizeof(DWORD)) return STATUS_INVALID_PARAMETER; + key->u.a.bitlen = *(DWORD*)value; + return STATUS_SUCCESS; + } FIXME( "unsupported key property %s\n", debugstr_w(prop) ); return STATUS_NOT_IMPLEMENTED; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 95addc1ab16..9230726969b 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -672,6 +672,7 @@ static void test_BCryptGenerateSymmetricKey(void) BCRYPT_KEY_LENGTHS_STRUCT key_lengths; ULONG size, len, i; NTSTATUS ret; + DWORD keylen; ret = BCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); @@ -706,6 +707,13 @@ static void test_BCryptGenerateSymmetricKey(void) sizeof(BCRYPT_CHAIN_MODE_CBC), 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + todo_wine + { + keylen = 512; + ret = BCryptSetProperty(aes, BCRYPT_KEY_LENGTH, (UCHAR *)&keylen, sizeof(keylen), 0); + ok(ret == STATUS_NOT_SUPPORTED, "got %#lx\n", ret); + } + size = 0; memset(mode, 0, sizeof(mode)); ret = BCryptGetProperty(key, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); @@ -2005,6 +2013,7 @@ static void test_RSA(void) ULONG len, size, size2, schemes; NTSTATUS ret; BYTE *buf; + DWORD keylen; ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_RSA_ALGORITHM, NULL, 0); if (ret) @@ -2052,12 +2061,21 @@ static void test_RSA(void) ok(!ret, "BCryptDestroyKey failed: %#lx\n", ret); /* sign/verify with export/import round-trip */ - ret = BCryptGenerateKeyPair(alg, &key, 512, 0); + ret = BCryptGenerateKeyPair(alg, &key, 1024, 0); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + + keylen = 512; + ret = BCryptSetProperty(key, BCRYPT_KEY_LENGTH, (UCHAR *)&keylen, 2, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); + ret = BCryptSetProperty(key, BCRYPT_KEY_LENGTH, (UCHAR *)&keylen, sizeof(keylen), 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ret = BCryptFinalizeKeyPair(key, 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ret = BCryptSetProperty(key, BCRYPT_KEY_LENGTH, (UCHAR *)&keylen, sizeof(keylen), 0); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; memset(sig, 0, sizeof(sig)); ret = BCryptSignHash(key, &pad, hash, sizeof(hash), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1); -- 2.32.0

2 7

[PATCH v3 1/2] ncrypt: Implement NCryptCreatePersistedKey.
by Santino Mazza 10 Mar '22

10 Mar '22

Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/ncrypt/main.c | 109 +++++++++++++++++++++++++++------- dlls/ncrypt/ncrypt_internal.h | 21 +++++++ dlls/ncrypt/tests/ncrypt.c | 8 ++- 3 files changed, 114 insertions(+), 24 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 8ace3e55731..1cc09cdfc97 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -30,14 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); -SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, - const WCHAR *algid, const WCHAR *name, DWORD keyspec, DWORD flags) -{ - FIXME("(%#Ix, %p, %s, %s, %#lx, %#lx): stub\n", provider, key, wine_dbgstr_w(algid), - wine_dbgstr_w(name), keyspec, flags); - return NTE_NOT_SUPPORTED; -} - SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD insize, void *padding, BYTE *output, DWORD outsize, DWORD *result, DWORD flags) { @@ -229,6 +221,45 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n return ERROR_SUCCESS; } +static struct object *create_key_object(enum algid algid, NCRYPT_PROV_HANDLE provider) +{ + struct object *key_object; + NTSTATUS ret; + + if (!(key_object = allocate_object(KEY))) + { + ERR("Error allocating memory\n"); + return NULL; + } + + switch(algid) + { + case RSA: + { + ret = BCryptOpenAlgorithmProvider(&key_object->key.bcrypt_alg, BCRYPT_RSA_ALGORITHM, NULL, 0); + if (ret != ERROR_SUCCESS) + { + ERR("Error opening algorithm provider\n"); + free(key_object); + return NULL; + } + + key_object->key.algid = RSA; + set_object_property(key_object, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)BCRYPT_RSA_ALGORITHM, sizeof(BCRYPT_RSA_ALGORITHM)); + break; + } + default: + { + ERR("Invalid algid %#x\n", algid); + free(key_object); + return NULL; + } + } + + set_object_property(key_object, NCRYPT_PROVIDER_HANDLE_PROPERTY, (BYTE *)&provider, sizeof(provider)); + return key_object; +} + SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE decrypt_key, const WCHAR *type, NCryptBufferDesc *params, NCRYPT_KEY_HANDLE *handle, BYTE *data, DWORD datasize, DWORD flags) @@ -259,12 +290,6 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H return NTE_BAD_FLAGS; } - if (!(object = allocate_object(KEY))) - { - ERR("Error allocating memory\n"); - return NTE_NO_MEMORY; - } - switch(header->Magic) { case BCRYPT_RSAFULLPRIVATE_MAGIC: @@ -273,13 +298,13 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H { NTSTATUS ret; BCRYPT_RSAKEY_BLOB *rsablob = (BCRYPT_RSAKEY_BLOB *)data; - ret = BCryptOpenAlgorithmProvider(&object->key.bcrypt_alg, BCRYPT_RSA_ALGORITHM, NULL, 0); - if (ret != ERROR_SUCCESS) + + if (!(object = create_key_object(RSA, provider))) { - ERR("Error opening algorithm provider\n"); - free(object); - return NTE_INTERNAL_ERROR; + ERR("Error allocating memory\n"); + return NTE_NO_MEMORY; } + ret = BCryptImportKeyPair(object->key.bcrypt_alg, NULL, type, &object->key.bcrypt_key, data, datasize, 0); if (ret != ERROR_SUCCESS) { @@ -289,14 +314,11 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H return NTE_BAD_DATA; } - set_object_property(object, NCRYPT_PROVIDER_HANDLE_PROPERTY, (BYTE *)&provider, sizeof(provider)); - set_object_property(object, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)BCRYPT_RSA_ALGORITHM, sizeof(BCRYPT_RSA_ALGORITHM)); set_object_property(object, NCRYPT_LENGTH_PROPERTY, (BYTE *)&rsablob->BitLength, sizeof(rsablob->BitLength)); break; } default: FIXME("Unhandled key magic %#lx\n", header->Magic); - free(object); return NTE_INVALID_PARAMETER; } @@ -304,6 +326,49 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H return ERROR_SUCCESS; } +SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, + const WCHAR *algid, const WCHAR *name, DWORD keyspec, DWORD flags) +{ + struct object *key_object; + TRACE("(%#Ix, %p, %s, %s, %#lx, %#lx)\n", provider, key, wine_dbgstr_w(algid), + wine_dbgstr_w(name), keyspec, flags); + + if (!provider) return NTE_INVALID_HANDLE; + if (!algid) return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); + if (name) FIXME("Persistant keys not supported\n"); + + if (!lstrcmpiW(algid, BCRYPT_RSA_ALGORITHM)) + { + NTSTATUS ret; + DWORD default_bitlength = 1024; + + if (!(key_object = create_key_object(RSA, provider))) + { + ERR("Error allocating memory\n"); + return NTE_NO_MEMORY; + } + + ret = BCryptGenerateKeyPair(key_object->key.bcrypt_alg, &key_object->key.bcrypt_key, 1024, 0); + if (ret != ERROR_SUCCESS) + { + ERR("Error generating key pair\n"); + BCryptCloseAlgorithmProvider(key_object->key.bcrypt_alg, 0); + free(key_object); + return NTE_INTERNAL_ERROR; + } + + set_object_property(key_object, NCRYPT_LENGTH_PROPERTY, (BYTE *)&default_bitlength, sizeof(default_bitlength)); + } + else + { + FIXME("Algorithm not handled %s\n", wine_dbgstr_w(algid)); + return NTE_NOT_SUPPORTED; + } + + *key = (NCRYPT_KEY_HANDLE)key_object; + return ERROR_SUCCESS; +} + SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, DWORD flags) { FIXME("(%#Ix, %s, %#lx): stub\n", provider, wine_dbgstr_w(algid), flags); diff --git a/dlls/ncrypt/ncrypt_internal.h b/dlls/ncrypt/ncrypt_internal.h index e5884c8871a..fb4dcd290b6 100644 --- a/dlls/ncrypt/ncrypt_internal.h +++ b/dlls/ncrypt/ncrypt_internal.h @@ -18,8 +18,29 @@ #include <bcrypt.h> +enum algid +{ + AES, + DES, + DESX, + DH, + DSA, + ECDH, + ECDH_P256, + ECDH_P384, + ECDH_P521, + ECDSA, + ECDSA_P256, + ECDSA_P384, + ECDSA_P521, + RC2, + RSA, + PBKDF2, +}; + struct key { + enum algid algid; BCRYPT_ALG_HANDLE bcrypt_alg; BCRYPT_KEY_HANDLE bcrypt_key; }; diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index cf434054428..ec69b236ac9 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -229,6 +229,7 @@ static void test_set_property(void) { ret = NCryptSetProperty(key, NCRYPT_NAME_PROPERTY, (BYTE *)L"Key name", sizeof(L"Key name"), 0); ok(ret == NTE_NOT_SUPPORTED, "got %#lx\n", ret); + } NCryptFreeObject(key); key = 0; @@ -240,6 +241,8 @@ static void test_set_property(void) ret = NCryptSetProperty(key, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, sizeof(keylength), 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + todo_wine + { ret = NCryptSetProperty(key, NCRYPT_NAME_PROPERTY, (BYTE *)L"Key name", sizeof(L"Key name"), 0); ok(ret == NTE_NOT_SUPPORTED, "got %#lx\n", ret); @@ -261,7 +264,6 @@ static void test_create_persisted_key(void) ret = NCryptOpenStorageProvider(&prov, NULL, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); - todo_wine { key = 0; ret = NCryptCreatePersistedKey(0, &key, BCRYPT_RSA_ALGORITHM, NULL, 0, 0); ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); @@ -292,14 +294,16 @@ static void test_create_persisted_key(void) NCryptFinalizeKey(key, 0); NCryptFreeObject(key); + todo_wine + { key = 0; ret = NCryptCreatePersistedKey(prov, &key, BCRYPT_AES_ALGORITHM, NULL, 0, 0); ok(ret == ERROR_SUCCESS || broken(ret == NTE_NOT_SUPPORTED) /* win 7 */, "got %#lx\n", ret); if (ret == NTE_NOT_SUPPORTED) win_skip("broken, symmetric keys not supported.\n"); else ok(key, "got null handle\n"); + } NCryptFreeObject(prov); - } } START_TEST(ncrypt) -- 2.32.0

1 1

[PATCH] winegstreamer: Deliver samples in PTS order instead of alternating.
by Zebediah Figura 10 Mar '22

10 Mar '22

For the async reader, and when requesting stream 0. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 4 +- dlls/winegstreamer/wm_asyncreader.c | 97 +++++++++++++---------------- dlls/winegstreamer/wm_reader.c | 97 ++++++++++++++++++++++++----- dlls/winegstreamer/wm_syncreader.c | 57 +++-------------- 4 files changed, 137 insertions(+), 118 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 2cbba09f9a7..a3f8c0ab5eb 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -180,8 +180,8 @@ HRESULT wm_reader_get_output_props(struct wm_reader *reader, DWORD output, IWMOutputMediaProps **props); struct wm_stream *wm_reader_get_stream_by_stream_number(struct wm_reader *reader, WORD stream_number); -HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, - INSSBuffer **sample, QWORD *pts, QWORD *duration, DWORD *flags); +HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream_number, + INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags, WORD *ret_stream_number); HRESULT wm_reader_get_stream_selection(struct wm_reader *reader, WORD stream_number, WMT_STREAM_SELECTION *selection); void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops); diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 9dfe2380284..947b3307a3a 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -72,11 +72,11 @@ static void open_stream(struct async_reader *reader, IWMReaderCallback *callback static DWORD WINAPI stream_thread(void *arg) { struct async_reader *reader = arg; - WORD i, stream_count = reader->reader.stream_count; IWMReaderCallback *callback = reader->callback; REFERENCE_TIME start_time; static const DWORD zero; QWORD pts, duration; + WORD stream_number; INSSBuffer *sample; DWORD flags; HRESULT hr; @@ -87,71 +87,56 @@ static DWORD WINAPI stream_thread(void *arg) while (reader->running) { - bool all_eos = true; + hr = wm_reader_get_stream_sample(&reader->reader, 0, &sample, &pts, &duration, &flags, &stream_number); - for (i = 0; i < stream_count; ++i) + if (hr == S_OK) { - struct wm_stream *stream = &reader->reader.streams[i]; + struct wm_stream *stream = wm_reader_get_stream_by_stream_number(&reader->reader, stream_number); - if (stream->selection == WMT_OFF) - continue; - - hr = wm_reader_get_stream_sample(stream, &sample, &pts, &duration, &flags); - if (hr == S_OK) + if (reader->user_clock) { - if (reader->user_clock) - { - QWORD user_time = reader->user_time; + QWORD user_time = reader->user_time; + + if (pts > user_time && reader->reader.callback_advanced) + IWMReaderCallbackAdvanced_OnTime(reader->reader.callback_advanced, user_time, reader->context); + while (pts > reader->user_time && reader->running) + SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, INFINITE); + if (!reader->running) + { + INSSBuffer_Release(sample); + goto out; + } + } + else + { + for (;;) + { + REFERENCE_TIME current_time = get_current_time(reader); + + if (pts <= current_time - start_time) + break; + + SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, + (pts - (current_time - start_time)) / 10000); - if (pts > user_time && reader->reader.callback_advanced) - IWMReaderCallbackAdvanced_OnTime(reader->reader.callback_advanced, user_time, reader->context); - while (pts > reader->user_time && reader->running) - SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, INFINITE); if (!reader->running) { INSSBuffer_Release(sample); goto out; } } - else - { - for (;;) - { - REFERENCE_TIME current_time = get_current_time(reader); - - if (pts <= current_time - start_time) - break; - - SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, - (pts - (current_time - start_time)) / 10000); - - if (!reader->running) - { - INSSBuffer_Release(sample); - goto out; - } - } - } - - if (stream->read_compressed) - hr = IWMReaderCallbackAdvanced_OnStreamSample(reader->reader.callback_advanced, - i + 1, pts, duration, flags, sample, reader->context); - else - hr = IWMReaderCallback_OnSample(callback, i, pts, duration, - flags, sample, reader->context); - TRACE("Callback returned %#lx.\n", hr); - INSSBuffer_Release(sample); - all_eos = false; - } - else if (hr != NS_E_NO_MORE_SAMPLES) - { - ERR("Failed to get sample, hr %#lx.\n", hr); - LeaveCriticalSection(&reader->stream_cs); - return 0; } + + if (stream->read_compressed) + hr = IWMReaderCallbackAdvanced_OnStreamSample(reader->reader.callback_advanced, + stream_number, pts, duration, flags, sample, reader->context); + else + hr = IWMReaderCallback_OnSample(callback, stream_number - 1, pts, duration, + flags, sample, reader->context); + TRACE("Callback returned %#lx.\n", hr); + INSSBuffer_Release(sample); } - - if (all_eos) + else if (hr == NS_E_NO_MORE_SAMPLES) { IWMReaderCallback_OnStatus(callback, WMT_END_OF_STREAMING, S_OK, WMT_TYPE_DWORD, (BYTE *)&zero, reader->context); @@ -171,6 +156,12 @@ static DWORD WINAPI stream_thread(void *arg) LeaveCriticalSection(&reader->stream_cs); return 0; } + else + { + ERR("Failed to get sample, hr %#lx.\n", hr); + LeaveCriticalSection(&reader->stream_cs); + return 0; + } } out: diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index bfed0d1e0ca..c911cb59d1f 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1820,30 +1820,98 @@ static const char *get_major_type_string(enum wg_major_type type) return NULL; } -HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, - INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags) +/* Find the earliest buffer by PTS. + * + * Native seems to behave similarly to this with the async reader, although our + * unit tests show that it's not entirely consistent—some frames are received + * slightly out of order. It's possible that one stream is being manually offset + * to account for decoding latency. + * + * The behaviour with the synchronous reader, when stream 0 is requested, seems + * consistent with this hypothesis, but with a much larger offset—the video + * stream seems to be "behind" by about 150 ms. + * + * The main reason for doing this is that the video and audio stream probably + * don't have quite the same "frame rate", and we don't want to force one stream + * to decode faster just to keep up with the other. Delivering samples in PTS + * order should avoid that problem. */ +static WORD get_earliest_buffer(struct wm_reader *reader, struct wg_parser_buffer *ret_buffer) { - IWMReaderCallbackAdvanced *callback_advanced = stream->reader->callback_advanced; - struct wg_parser_stream *wg_stream = stream->wg_stream; + struct wg_parser_buffer buffer; + QWORD earliest_pts = UI64_MAX; + WORD stream_number = 0; + WORD i; + + for (i = 0; i < reader->stream_count; ++i) + { + struct wm_stream *stream = &reader->streams[i]; + + if (stream->selection == WMT_OFF) + continue; + + if (!wg_parser_stream_get_buffer(stream->wg_stream, &buffer)) + continue; + + if (buffer.has_pts && buffer.pts < earliest_pts) + { + stream_number = i + 1; + earliest_pts = buffer.pts; + *ret_buffer = buffer; + } + } + + return stream_number; +} + +HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream_number, + INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags, WORD *ret_stream_number) +{ + IWMReaderCallbackAdvanced *callback_advanced = reader->callback_advanced; + struct wg_parser_stream *wg_stream; struct wg_parser_buffer wg_buffer; + struct wm_stream *stream; DWORD size, capacity; INSSBuffer *sample; HRESULT hr; BYTE *data; - if (stream->selection == WMT_OFF) - return NS_E_INVALID_REQUEST; - - if (stream->eos) - return NS_E_NO_MORE_SAMPLES; - for (;;) { - if (!wg_parser_stream_get_buffer(wg_stream, &wg_buffer)) + if (!stream_number) { - stream->eos = true; - TRACE("End of stream.\n"); - return NS_E_NO_MORE_SAMPLES; + if (!(stream_number = get_earliest_buffer(reader, &wg_buffer))) + { + /* All streams are disabled or EOS. */ + return NS_E_NO_MORE_SAMPLES; + } + + stream = wm_reader_get_stream_by_stream_number(reader, stream_number); + wg_stream = stream->wg_stream; + } + else + { + if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_number))) + { + WARN("Invalid stream number %u; returning E_INVALIDARG.\n", stream_number); + return E_INVALIDARG; + } + wg_stream = stream->wg_stream; + + if (stream->selection == WMT_OFF) + { + WARN("Stream %u is deselected; returning NS_E_INVALID_REQUEST.\n", stream_number); + return NS_E_INVALID_REQUEST; + } + + if (stream->eos) + return NS_E_NO_MORE_SAMPLES; + + if (!wg_parser_stream_get_buffer(wg_stream, &wg_buffer)) + { + stream->eos = true; + TRACE("End of stream.\n"); + return NS_E_NO_MORE_SAMPLES; + } } TRACE("Got buffer for '%s' stream %p.\n", get_major_type_string(stream->format.major_type), stream); @@ -1920,6 +1988,7 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, *flags |= WM_SF_CLEANPOINT; *ret_sample = sample; + *ret_stream_number = stream_number; return S_OK; } } diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index 55940e2b370..c7cccd52c4f 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -25,8 +25,6 @@ struct sync_reader struct wm_reader reader; IWMSyncReader2 IWMSyncReader2_iface; - - WORD last_read_stream; }; static struct sync_reader *impl_from_IWMSyncReader2(IWMSyncReader2 *iface) @@ -84,60 +82,21 @@ static HRESULT WINAPI WMSyncReader_GetNextSample(IWMSyncReader2 *iface, { struct sync_reader *reader = impl_from_IWMSyncReader2(iface); HRESULT hr = NS_E_NO_MORE_SAMPLES; - struct wm_stream *stream; - WORD i; TRACE("reader %p, stream_number %u, sample %p, pts %p, duration %p," " flags %p, output_number %p, ret_stream_number %p.\n", reader, stream_number, sample, pts, duration, flags, output_number, ret_stream_number); + if (!stream_number && !output_number && !ret_stream_number) + return E_INVALIDARG; + EnterCriticalSection(&reader->reader.cs); - if (!stream_number) - { - if (!output_number && !ret_stream_number) - { - LeaveCriticalSection(&reader->reader.cs); - return E_INVALIDARG; - } - - for (i = 0; i < reader->reader.stream_count; ++i) - { - WORD index = (i + reader->last_read_stream + 1) % reader->reader.stream_count; - struct wm_stream *stream = &reader->reader.streams[index]; - - if (stream->selection == WMT_OFF) - continue; - - hr = wm_reader_get_stream_sample(stream, sample, pts, duration, flags); - if (hr == S_OK) - { - if (output_number) - *output_number = index; - if (ret_stream_number) - *ret_stream_number = index + 1; - } - if (hr != NS_E_NO_MORE_SAMPLES) - { - reader->last_read_stream = index; - break; - } - } - } - else - { - if (!(stream = wm_reader_get_stream_by_stream_number(&reader->reader, stream_number))) - { - LeaveCriticalSection(&reader->reader.cs); - return E_INVALIDARG; - } - - hr = wm_reader_get_stream_sample(stream, sample, pts, duration, flags); - if (hr == S_OK && output_number) - *output_number = stream->index; - if (ret_stream_number) - *ret_stream_number = stream->index + 1; - } + hr = wm_reader_get_stream_sample(&reader->reader, stream_number, sample, pts, duration, flags, &stream_number); + if (output_number && hr == S_OK) + *output_number = stream_number - 1; + if (ret_stream_number && (hr == S_OK || stream_number)) + *ret_stream_number = stream_number; LeaveCriticalSection(&reader->reader.cs); return hr; -- 2.35.1

1 0

[PATCH v4 1/3] winevulkan: Avoid zero-sized allocations.
by Georg Lehmann 09 Mar '22

09 Mar '22

Fixes some -Wmaybe-uninitialized warnings in the next patch. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index c609bbfd151..1d796289615 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2150,7 +2150,7 @@ class ConversionFunction(object): body += "#endif /* USE_STRUCT_CONVERSION */\n" body += " unsigned int i;\n\n" - body += " if (!in) return NULL;\n\n" + body += " if (!in || !count) return NULL;\n\n" body += " out = malloc(count * sizeof(*out));\n" -- 2.35.1

1 2

[PATCH v3 1/2] winevulkan: Manually fixup struct alignment for VkPipelineCreationFeedback.
by Georg Lehmann 09 Mar '22

09 Mar '22

We can't reasonably auto generate this because it's output in an otherwise input pNext chain. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 8 +++ dlls/winevulkan/vulkan.c | 107 ++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index c609bbfd151..2f3d647ef9b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -205,6 +205,8 @@ FUNCTION_OVERRIDES = { # Device functions "vkAllocateCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkCreateCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkCreateComputePipelines" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, + "vkCreateGraphicsPipelines" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, "vkDestroyCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkDestroyDevice" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkFreeCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, @@ -250,6 +252,9 @@ FUNCTION_OVERRIDES = { "vkGetDeviceGroupSurfacePresentModesKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, "vkGetPhysicalDevicePresentRectanglesKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, + # VK_KHR_ray_tracing_pipeline + "vkCreateRayTracingPipelinesKHR" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, + # VK_EXT_calibrated_timestamps "vkGetPhysicalDeviceCalibrateableTimeDomainsEXT" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkGetCalibratedTimestampsEXT" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, @@ -261,6 +266,9 @@ FUNCTION_OVERRIDES = { # VK_EXT_debug_report "vkCreateDebugReportCallbackEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkDestroyDebugReportCallbackEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + + # VK_NV_ray_tracing + "vkCreateRayTracingPipelinesNV" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, } STRUCT_CHAIN_CONVERSIONS = { diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 19cc999433b..190f70f3616 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1758,6 +1758,113 @@ NTSTATUS wine_vkDestroyDebugReportCallbackEXT(void *args) return STATUS_SUCCESS; } +static void fixup_pipeline_feedback(VkPipelineCreationFeedback *feedback, uint32_t count) +{ +#if defined(USE_STRUCT_CONVERSION) + struct host_pipeline_feedback + { + VkPipelineCreationFeedbackFlags flags; + uint64_t duration; + } *host_feedback; + int64_t i; + + host_feedback = (void *) feedback; + + for (i = count - 1; i >= 0; i--) + { + memmove(&feedback[i].duration, &host_feedback[i].duration, sizeof(uint64_t)); + feedback[i].flags = host_feedback[i].flags; + } +#endif +} + +static void fixup_pipeline_feedback_info(const void *pipeline_info) +{ + VkPipelineCreationFeedbackCreateInfo *feedback; + + feedback = wine_vk_find_struct(pipeline_info, PIPELINE_CREATION_FEEDBACK_CREATE_INFO); + + if (!feedback) + return; + + fixup_pipeline_feedback(feedback->pPipelineCreationFeedback, 1); + fixup_pipeline_feedback(feedback->pPipelineStageCreationFeedbacks, + feedback->pipelineStageCreationFeedbackCount); +} + +NTSTATUS wine_vkCreateComputePipelines(void *args) +{ + struct vkCreateComputePipelines_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateComputePipelines(params->device, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + +NTSTATUS wine_vkCreateGraphicsPipelines(void *args) +{ + struct vkCreateGraphicsPipelines_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateGraphicsPipelines(params->device, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + +NTSTATUS wine_vkCreateRayTracingPipelinesKHR(void *args) +{ + struct vkCreateRayTracingPipelinesKHR_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, 0x%s, %u, %p, %p, %p\n", params->device, + wine_dbgstr_longlong(params->deferredOperation), wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateRayTracingPipelinesKHR(params->device, params->deferredOperation, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + +NTSTATUS wine_vkCreateRayTracingPipelinesNV(void *args) +{ + struct vkCreateRayTracingPipelinesNV_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateRayTracingPipelinesNV(params->device, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + BOOL WINAPI wine_vk_is_available_instance_function(VkInstance instance, const char *name) { return !!vk_funcs->p_vkGetInstanceProcAddr(instance->instance, name); -- 2.35.1

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel