[PATCH] dlls/wsdapi/tests: enable compilation with long types
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");
participants (1)
-
Eric Pouech