11 Jul
2012
11 Jul
'12
7:38 a.m.
Author: tfaber
Date: Wed Jul 11 07:38:36 2012
New Revision: 56867
URL: http://svn.reactos.org/svn/reactos?rev=56867&view=rev
Log:
[NTDLL_WINETEST]
- Add test for RtlIpv4StringToAddress. Already applied upstream.
Modified:
trunk/rostests/winetests/ntdll/rtl.c
Modified: trunk/rostests/winetests/ntdll/rtl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtl.c?rev…
==============================================================================
--- trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] Wed Jul 11 07:38:36 2012
@@ -88,6 +88,7 @@
static IMAGE_BASE_RELOCATION *(WINAPI
*pLdrProcessRelocationBlock)(void*,UINT,USHORT*,INT_PTR);
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 HMODULE hkernel32 = 0;
static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL);
@@ -131,6 +132,7 @@
pLdrProcessRelocationBlock = (void *)GetProcAddress(hntdll,
"LdrProcessRelocationBlock");
pRtlIpv4AddressToStringA = (void *)GetProcAddress(hntdll,
"RtlIpv4AddressToStringA");
pRtlIpv4AddressToStringExA = (void *)GetProcAddress(hntdll,
"RtlIpv4AddressToStringExA");
+ pRtlIpv4StringToAddressA = (void *)GetProcAddress(hntdll,
"RtlIpv4StringToAddressA");
}
hkernel32 = LoadLibraryA("kernel32.dll");
ok(hkernel32 != 0, "LoadLibrary failed\n");
@@ -1312,6 +1314,177 @@
res, size, buffer);
}
+static void test_RtlIpv4StringToAddress(void)
+{
+ NTSTATUS res;
+ IN_ADDR ip, expected_ip;
+ PCSTR terminator;
+ CHAR dummy;
+ struct
+ {
+ PCSTR address;
+ NTSTATUS res;
+ int terminator_offset;
+ int ip[4];
+ BOOL strict_is_different;
+ NTSTATUS res_strict;
+ int terminator_offset_strict;
+ int ip_strict[4];
+ } tests[] =
+ {
+ { "", STATUS_INVALID_PARAMETER, 0, { -1 } },
+ { " ", STATUS_INVALID_PARAMETER, 0, { -1 } },
+ { "1.1.1.1", STATUS_SUCCESS, 7, { 1, 1, 1, 1
} },
+ { "0.0.0.0", STATUS_SUCCESS, 7, { 0, 0, 0, 0
} },
+ { "255.255.255.255", STATUS_SUCCESS, 15, { 255, 255, 255, 255
} },
+ { "255.255.255.255:123",
+ STATUS_SUCCESS, 15, { 255, 255, 255, 255 } },
+ { "255.255.255.256", STATUS_INVALID_PARAMETER, 15, { -1 } },
+ { "255.255.255.4294967295",
+ STATUS_INVALID_PARAMETER, 22, { -1 } },
+ { "255.255.255.4294967296",
+ STATUS_INVALID_PARAMETER, 21, { -1 } },
+ { "255.255.255.4294967297",
+ STATUS_INVALID_PARAMETER, 21, { -1 } },
+ { "a", STATUS_INVALID_PARAMETER, 0, { -1 } },
+ { "1.1.1.0xaA", STATUS_SUCCESS, 10, { 1, 1, 1, 170
},
+ TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } },
+ { "1.1.1.0XaA", STATUS_SUCCESS, 10, { 1, 1, 1, 170
},
+ TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } },
+ { "1.1.1.0x", STATUS_INVALID_PARAMETER, 8, { -1 } },
+ { "1.1.1.0xff", STATUS_SUCCESS, 10, { 1, 1, 1, 255
},
+ TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } },
+ { "1.1.1.0x100", STATUS_INVALID_PARAMETER, 11, { -1 },
+ TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } },
+ { "1.1.1.0xffffffff",STATUS_INVALID_PARAMETER, 16, { -1 },
+ TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } },
+ { "1.1.1.0x100000000",
+ STATUS_INVALID_PARAMETER, 16, { -1, 0, 0, 0 },
+ TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } },
+ { "1.1.1.010", STATUS_SUCCESS, 9, { 1, 1, 1, 8
},
+ TRUE, STATUS_INVALID_PARAMETER, 7, { -1 } },
+ { "1.1.1.00", STATUS_SUCCESS, 8, { 1, 1, 1, 0
},
+ TRUE, STATUS_INVALID_PARAMETER, 7, { -1 } },
+ { "1.1.1.007", STATUS_SUCCESS, 9, { 1, 1, 1, 7
},
+ TRUE, STATUS_INVALID_PARAMETER, 7, { -1 } },
+ { "1.1.1.08", STATUS_INVALID_PARAMETER, 7, { -1 } },
+ { "1.1.1.008", STATUS_SUCCESS, 8, { 1, 1, 1, 0
},
+ TRUE, STATUS_INVALID_PARAMETER, 7, { -1 } },
+ { "1.1.1.0a", STATUS_SUCCESS, 7, { 1, 1, 1, 0
} },
+ { "1.1.1.0o10", STATUS_SUCCESS, 7, { 1, 1, 1, 0
} },
+ { "1.1.1.0b10", STATUS_SUCCESS, 7, { 1, 1, 1, 0
} },
+ { "1.1.1.-2", STATUS_INVALID_PARAMETER, 6, { -1 } },
+ { "1", STATUS_SUCCESS, 1, { 0, 0, 0, 1
},
+ TRUE, STATUS_INVALID_PARAMETER, 1, { -1 } },
+ { "-1", STATUS_INVALID_PARAMETER, 0, { -1 } },
+ { "203569230", STATUS_SUCCESS, 9, { 12, 34, 56, 78
},
+ TRUE, STATUS_INVALID_PARAMETER, 9, { -1 } },
+ { "1.223756", STATUS_SUCCESS, 8, { 1, 3, 106, 12
},
+ TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } },
+ { "3.4.756", STATUS_SUCCESS, 7, { 3, 4, 2, 244
},
+ TRUE, STATUS_INVALID_PARAMETER, 7, { -1 } },
+ { "3.4.756.1", STATUS_INVALID_PARAMETER, 9, { -1 } },
+ { "3.4.65536", STATUS_INVALID_PARAMETER, 9, { -1 } },
+ { "3.4.5.6.7", STATUS_INVALID_PARAMETER, 7, { -1 } },
+ { "3.4.5.+6", STATUS_INVALID_PARAMETER, 6, { -1 } },
+ { " 3.4.5.6", STATUS_INVALID_PARAMETER, 0, { -1 } },
+ { "\t3.4.5.6", STATUS_INVALID_PARAMETER, 0, { -1 } },
+ { "3.4.5.6 ", STATUS_SUCCESS, 7, { 3, 4, 5, 6
} },
+ { "3. 4.5.6", STATUS_INVALID_PARAMETER, 2, { -1 } },
+ { ".", STATUS_INVALID_PARAMETER, 1, { -1 } },
+ { "..", STATUS_INVALID_PARAMETER, 1, { -1 } },
+ { "1.", STATUS_INVALID_PARAMETER, 2, { -1 } },
+ { "1..", STATUS_INVALID_PARAMETER, 3, { -1 } },
+ { ".1", STATUS_INVALID_PARAMETER, 1, { -1 } },
+ { ".1.", STATUS_INVALID_PARAMETER, 1, { -1 } },
+ { ".1.2.3", STATUS_INVALID_PARAMETER, 1, { -1 } },
+ { "0.1.2.3", STATUS_SUCCESS, 7, { 0, 1, 2, 3
} },
+ { "0.1.2.3.", STATUS_INVALID_PARAMETER, 7, { -1 } },
+ { "[0.1.2.3]", STATUS_INVALID_PARAMETER, 0, { -1 } },
+ { "::1", STATUS_INVALID_PARAMETER, 0, { -1 } },
+ { ":1", STATUS_INVALID_PARAMETER, 0, { -1 } },
+ };
+ const int testcount = sizeof(tests) / sizeof(tests[0]);
+ int i;
+
+ if (!pRtlIpv4StringToAddressA)
+ {
+ skip("RtlIpv4StringToAddress not available\n");
+ return;
+ }
+
+ if (0)
+ {
+ /* leaving either parameter NULL crashes on Windows */
+ res = pRtlIpv4StringToAddressA(NULL, FALSE, &terminator, &ip);
+ res = pRtlIpv4StringToAddressA("1.1.1.1", FALSE, NULL, &ip);
+ res = pRtlIpv4StringToAddressA("1.1.1.1", FALSE, &terminator,
NULL);
+ /* same for the wide char version */
+ /*
+ res = pRtlIpv4StringToAddressW(NULL, FALSE, &terminatorW, &ip);
+ res = pRtlIpv4StringToAddressW(L"1.1.1.1", FALSE, NULL, &ip);
+ res = pRtlIpv4StringToAddressW(L"1.1.1.1", FALSE, &terminatorW,
NULL);
+ */
+ }
+
+ for (i = 0; i < testcount; i++)
+ {
+ /* non-strict */
+ terminator = &dummy;
+ ip.S_un.S_addr = 0xabababab;
+ res = pRtlIpv4StringToAddressA(tests[i].address, FALSE, &terminator,
&ip);
+ ok(res == tests[i].res,
+ "[%s] res = 0x%08x, expected 0x%08x\n",
+ tests[i].address, res, tests[i].res);
+ ok(terminator == tests[i].address + tests[i].terminator_offset,
+ "[%s] terminator = %p, expected %p\n",
+ tests[i].address, terminator, tests[i].address + tests[i].terminator_offset);
+ if (tests[i].ip[0] == -1)
+ expected_ip.S_un.S_addr = 0xabababab;
+ else
+ {
+ expected_ip.S_un.S_un_b.s_b1 = tests[i].ip[0];
+ expected_ip.S_un.S_un_b.s_b2 = tests[i].ip[1];
+ expected_ip.S_un.S_un_b.s_b3 = tests[i].ip[2];
+ expected_ip.S_un.S_un_b.s_b4 = tests[i].ip[3];
+ }
+ ok(ip.S_un.S_addr == expected_ip.S_un.S_addr,
+ "[%s] ip = %08x, expected %08x\n",
+ tests[i].address, ip.S_un.S_addr, expected_ip.S_un.S_addr);
+
+ if (!tests[i].strict_is_different)
+ {
+ tests[i].res_strict = tests[i].res;
+ tests[i].terminator_offset_strict = tests[i].terminator_offset;
+ tests[i].ip_strict[0] = tests[i].ip[0];
+ tests[i].ip_strict[1] = tests[i].ip[1];
+ tests[i].ip_strict[2] = tests[i].ip[2];
+ tests[i].ip_strict[3] = tests[i].ip[3];
+ }
+ /* strict */
+ terminator = &dummy;
+ ip.S_un.S_addr = 0xabababab;
+ res = pRtlIpv4StringToAddressA(tests[i].address, TRUE, &terminator,
&ip);
+ ok(res == tests[i].res_strict,
+ "[%s] res = 0x%08x, expected 0x%08x\n",
+ tests[i].address, res, tests[i].res_strict);
+ ok(terminator == tests[i].address + tests[i].terminator_offset_strict,
+ "[%s] terminator = %p, expected %p\n",
+ tests[i].address, terminator, tests[i].address +
tests[i].terminator_offset_strict);
+ if (tests[i].ip_strict[0] == -1)
+ expected_ip.S_un.S_addr = 0xabababab;
+ else
+ {
+ expected_ip.S_un.S_un_b.s_b1 = tests[i].ip_strict[0];
+ expected_ip.S_un.S_un_b.s_b2 = tests[i].ip_strict[1];
+ expected_ip.S_un.S_un_b.s_b3 = tests[i].ip_strict[2];
+ expected_ip.S_un.S_un_b.s_b4 = tests[i].ip_strict[3];
+ }
+ ok(ip.S_un.S_addr == expected_ip.S_un.S_addr,
+ "[%s] ip = %08x, expected %08x\n",
+ tests[i].address, ip.S_un.S_addr, expected_ip.S_un.S_addr);
+ }
+}
START_TEST(rtl)
{
@@ -1336,4 +1509,5 @@
test_LdrProcessRelocationBlock();
test_RtlIpv4AddressToString();
test_RtlIpv4AddressToStringEx();
-}
+ test_RtlIpv4StringToAddress();
+}