wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

ntdll-RtlIpStringToAddress_Tests: Fix compile warning on x86_64.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-03-25 03:59:18 +01:00
parent 6b60ac392a
commit 1b03b0201e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
patches/ntdll-RtlIpStringToAddress_Tests/0004-ntdll-tests-Add-tests-for-RtlIpv6AddressToString-and.patch
View File

@ -1,4 +1,4 @@
From 569439573a4b64588331359269f90a32f0d93b9c Mon Sep 17 00:00:00 2001
From 5f505a4a315272fd39a30d73fbfb59526b07be22 Mon Sep 17 00:00:00 2001
From: Mark Jansen <learn0more@gmail.com>
Date: Mon, 6 Apr 2015 00:48:33 +0200
Subject: ntdll/tests: Add tests for RtlIpv6AddressToString and
@ -9,10 +9,10 @@ Subject: ntdll/tests: Add tests for RtlIpv6AddressToString and
1 file changed, 246 insertions(+)
diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c
index 6d41589..37f74b5 100644
index b0facba..e443ec2 100644
--- a/dlls/ntdll/tests/rtl.c
+++ b/dlls/ntdll/tests/rtl.c
@@ -91,6 +91,8 @@ static CHAR * (WINAPI *pRtlIpv4AddressToStringA)(const IN_ADDR *, LPSTR);
@@ -94,6 +94,8 @@ static CHAR * (WINAPI *pRtlIpv4AddressToStringA)(const IN_ADDR *, LPSTR);
static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, LPSTR, PULONG);
static NTSTATUS (WINAPI *pRtlIpv4StringToAddressA)(PCSTR, BOOLEAN, PCSTR *, IN_ADDR *);
static NTSTATUS (WINAPI *pRtlIpv4StringToAddressExA)(PCSTR, BOOLEAN, IN_ADDR *, PUSHORT);
@ -21,7 +21,7 @@ index 6d41589..37f74b5 100644
static NTSTATUS (WINAPI *pRtlIpv6StringToAddressA)(PCSTR, PCSTR *, struct in6_addr *);
static NTSTATUS (WINAPI *pRtlIpv6StringToAddressW)(PCWSTR, PCWSTR *, struct in6_addr *);
static NTSTATUS (WINAPI *pRtlIpv6StringToAddressExA)(PCSTR, struct in6_addr *, PULONG, PUSHORT);
@@ -148,6 +150,8 @@ static void InitFunctionPtrs(void)
@@ -155,6 +157,8 @@ static void InitFunctionPtrs(void)
pRtlIpv4AddressToStringExA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringExA");
pRtlIpv4StringToAddressA = (void *)GetProcAddress(hntdll, "RtlIpv4StringToAddressA");
pRtlIpv4StringToAddressExA = (void *)GetProcAddress(hntdll, "RtlIpv4StringToAddressExA");
@ -30,7 +30,7 @@ index 6d41589..37f74b5 100644
pRtlIpv6StringToAddressA = (void *)GetProcAddress(hntdll, "RtlIpv6StringToAddressA");
pRtlIpv6StringToAddressW = (void *)GetProcAddress(hntdll, "RtlIpv6StringToAddressW");
pRtlIpv6StringToAddressExA = (void *)GetProcAddress(hntdll, "RtlIpv6StringToAddressExA");
@@ -1924,6 +1928,246 @@ static void init_ip6(IN6_ADDR* addr, const int src[8])
@@ -1729,6 +1733,246 @@ static void init_ip6(IN6_ADDR* addr, const int src[8])
}
}
@ -270,14 +270,14 @@ index 6d41589..37f74b5 100644
+
+ ok(res == STATUS_SUCCESS, "[validate] res = 0x%08x, expected STATUS_SUCCESS\n", res);
+ ok(len == (strlen(tests[i].address) + 1) && !strcmp(buffer, tests[i].address),
+ "got len %d with '%s' (expected %d with '%s')\n", len, buffer, strlen(tests[i].address), tests[i].address);
+ "got len %d with '%s' (expected %d with '%s')\n", len, buffer, (int)strlen(tests[i].address), tests[i].address);
+ }
+}
+
static void compare_RtlIpv6StringToAddressW(PCSTR name_a, int terminator_offset_a,
const struct in6_addr *addr_a, NTSTATUS res_a)
{
@@ -3173,6 +3417,8 @@ START_TEST(rtl)
@@ -3009,6 +3253,8 @@ START_TEST(rtl)
test_RtlIpv4AddressToStringEx();
test_RtlIpv4StringToAddress();
test_RtlIpv4StringToAddressEx();
@ -287,5 +287,5 @@ index 6d41589..37f74b5 100644
test_RtlIpv6StringToAddressEx();
test_LdrAddRefDll();
--
2.3.5
2.7.1