Ros-diffs

ros-diffs@reactos.org

16 participants
80955 discussions

[reactos] 04/04: Fix various inet_ntop definitions

by Baruch Rutman

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=79f2289a9d39eafa07259… commit 79f2289a9d39eafa07259ace33f5a1397264f0c8 Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Tue Jul 2 00:13:09 2024 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Nov 2 21:57:28 2024 +0100 Fix various inet_ntop definitions --- dll/3rdparty/libtirpc/src/rpc_generic.c | 2 +- dll/win32/winhttp/inet_ntop.c | 2 +- dll/win32/wininet/inet_ntop.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/3rdparty/libtirpc/src/rpc_generic.c b/dll/3rdparty/libtirpc/src/rpc_generic.c index fc646f5bc50..ec13e56f69a 100644 --- a/dll/3rdparty/libtirpc/src/rpc_generic.c +++ b/dll/3rdparty/libtirpc/src/rpc_generic.c @@ -641,7 +641,7 @@ void freenetbuf(struct netbuf *nbuf) #ifdef __REACTOS__ PCSTR WSAAPI -inet_ntop(INT af, PVOID src, PSTR dst, size_t cnt) +inet_ntop(INT af, const VOID *src, PSTR dst, size_t cnt) { struct in_addr in; char *text_addr; diff --git a/dll/win32/winhttp/inet_ntop.c b/dll/win32/winhttp/inet_ntop.c index 99d5ccdcf19..8e40e261e33 100644 --- a/dll/win32/winhttp/inet_ntop.c +++ b/dll/win32/winhttp/inet_ntop.c @@ -54,7 +54,7 @@ static const char *inet_ntop6(const u_char *src, char *dst, size_t size); PCSTR WSAAPI -inet_ntop(INT Family, PVOID pAddr, PSTR pStringBuf, size_t StringBufSize) +inet_ntop(INT Family, const VOID *pAddr, PSTR pStringBuf, size_t StringBufSize) { switch (Family) { diff --git a/dll/win32/wininet/inet_ntop.c b/dll/win32/wininet/inet_ntop.c index 27a388f9146..378b67d9ab1 100644 --- a/dll/win32/wininet/inet_ntop.c +++ b/dll/win32/wininet/inet_ntop.c @@ -53,7 +53,7 @@ PCSTR WSAAPI inet_ntop( _In_ INT af, - _In_ PVOID src, + _In_ const VOID *src, _Out_writes_(StringBufSize) PSTR dst, _In_ size_t size) {

1 month, 3 weeks

[reactos] 03/04: [WS2_32_WINETEST] Sync tests for inet_pton, inet_ntop

by Baruch Rutman

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4453711b5a1cca5c31e96… commit 4453711b5a1cca5c31e960462f185dacc0bb2c37 Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Sat Apr 20 22:31:26 2024 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Nov 2 21:57:28 2024 +0100 [WS2_32_WINETEST] Sync tests for inet_pton, inet_ntop --- modules/rostests/winetests/ws2_32/sock.c | 493 +++++++++++++++++++++---------- 1 file changed, 343 insertions(+), 150 deletions(-) diff --git a/modules/rostests/winetests/ws2_32/sock.c b/modules/rostests/winetests/ws2_32/sock.c index 74ea920dd00..ea994454c01 100644 --- a/modules/rostests/winetests/ws2_32/sock.c +++ b/modules/rostests/winetests/ws2_32/sock.c @@ -82,9 +82,9 @@ static int (WINAPI *pGetAddrInfoExW)(const WCHAR *name, const WCHAR *servname, struct timeval *timeout, OVERLAPPED *overlapped, LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine, HANDLE *handle); static int (WINAPI *pGetAddrInfoExOverlappedResult)(OVERLAPPED *overlapped); -static PCSTR (WINAPI *pInetNtop)(INT,LPVOID,LPSTR,ULONG); +static PCSTR (WINAPI *p_inet_ntop)(INT,LPVOID,LPSTR,ULONG); static PCWSTR(WINAPI *pInetNtopW)(INT,LPVOID,LPWSTR,ULONG); -static int (WINAPI *pInetPtonA)(INT,LPCSTR,LPVOID); +static int (WINAPI *p_inet_pton)(INT,LPCSTR,LPVOID); static int (WINAPI *pInetPtonW)(INT,LPWSTR,LPVOID); static int (WINAPI *pWSALookupServiceBeginW)(LPWSAQUERYSETW,DWORD,LPHANDLE); static int (WINAPI *pWSALookupServiceEnd)(HANDLE); @@ -1298,9 +1298,9 @@ static void Init (void) pGetAddrInfoW = (void *)GetProcAddress(hws2_32, "GetAddrInfoW"); pGetAddrInfoExW = (void *)GetProcAddress(hws2_32, "GetAddrInfoExW"); pGetAddrInfoExOverlappedResult = (void *)GetProcAddress(hws2_32, "GetAddrInfoExOverlappedResult"); - pInetNtop = (void *)GetProcAddress(hws2_32, "inet_ntop"); + p_inet_ntop = (void *)GetProcAddress(hws2_32, "inet_ntop"); pInetNtopW = (void *)GetProcAddress(hws2_32, "InetNtopW"); - pInetPtonA = (void *)GetProcAddress(hws2_32, "inet_pton"); + p_inet_pton = (void *)GetProcAddress(hws2_32, "inet_pton"); pInetPtonW = (void *)GetProcAddress(hws2_32, "InetPtonW"); pWSALookupServiceBeginW = (void *)GetProcAddress(hws2_32, "WSALookupServiceBeginW"); pWSALookupServiceEnd = (void *)GetProcAddress(hws2_32, "WSALookupServiceEnd"); @@ -4903,26 +4903,26 @@ static void test_addr_to_print(void) ok(pdst != NULL, "inet_ntoa failed %s\n", dst); ok(!strcmp(pdst, addr1_Str),"Address %s != %s\n", pdst, addr1_Str); - /* InetNtop became available in Vista and Win2008 */ - if (!pInetNtop) + /* inet_ntop became available in Vista and Win2008 */ + if (!p_inet_ntop) { win_skip("InetNtop not present, not executing tests\n"); return; } /* Second part of test */ - pdst = pInetNtop(AF_INET,(void*)&in.s_addr, dst, sizeof(dst)); + pdst = p_inet_ntop(AF_INET, &in.s_addr, dst, sizeof(dst)); ok(pdst != NULL, "InetNtop failed %s\n", dst); ok(!strcmp(pdst, addr1_Str),"Address %s != %s\n", pdst, addr1_Str); /* Test invalid parm conditions */ - pdst = pInetNtop(1, (void*)&in.s_addr, dst, sizeof(dst)); + pdst = p_inet_ntop(1, (void *)&in.s_addr, dst, sizeof(dst)); ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); ok(WSAGetLastError() == WSAEAFNOSUPPORT, "Should be WSAEAFNOSUPPORT\n"); /* Test Null destination */ pdst = NULL; - pdst = pInetNtop(AF_INET, (void*)&in.s_addr, NULL, sizeof(dst)); + pdst = p_inet_ntop(AF_INET, &in.s_addr, NULL, sizeof(dst)); ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); ok(WSAGetLastError() == STATUS_INVALID_PARAMETER || WSAGetLastError() == WSAEINVAL /* Win7 */, "Should be STATUS_INVALID_PARAMETER or WSAEINVAL not 0x%x\n", WSAGetLastError()); @@ -4930,7 +4930,7 @@ static void test_addr_to_print(void) /* Test zero length passed */ WSASetLastError(0); pdst = NULL; - pdst = pInetNtop(AF_INET, (void*)&in.s_addr, dst, 0); + pdst = p_inet_ntop(AF_INET, &in.s_addr, dst, 0); ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); ok(WSAGetLastError() == STATUS_INVALID_PARAMETER || WSAGetLastError() == WSAEINVAL /* Win7 */, "Should be STATUS_INVALID_PARAMETER or WSAEINVAL not 0x%x\n", WSAGetLastError()); @@ -4938,7 +4938,7 @@ static void test_addr_to_print(void) /* Test length one shorter than the address length */ WSASetLastError(0); pdst = NULL; - pdst = pInetNtop(AF_INET, (void*)&in.s_addr, dst, 6); + pdst = p_inet_ntop(AF_INET, &in.s_addr, dst, 6); ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); ok(WSAGetLastError() == STATUS_INVALID_PARAMETER || WSAGetLastError() == WSAEINVAL /* Win7 */, "Should be STATUS_INVALID_PARAMETER or WSAEINVAL not 0x%x\n", WSAGetLastError()); @@ -4946,7 +4946,7 @@ static void test_addr_to_print(void) /* Test longer length is ok */ WSASetLastError(0); pdst = NULL; - pdst = pInetNtop(AF_INET, (void*)&in.s_addr, dst, sizeof(dst)+1); + pdst = p_inet_ntop(AF_INET, &in.s_addr, dst, sizeof(dst)+1); ok(pdst != NULL, "The pointer should be returned (%p)\n", pdst); ok(!strcmp(pdst, addr1_Str),"Address %s != %s\n", pdst, addr1_Str); @@ -4954,19 +4954,19 @@ static void test_addr_to_print(void) /* Test an zero prefixed IPV6 address */ memcpy(in6.u.Byte, addr2_Num, sizeof(addr2_Num)); - pdst = pInetNtop(AF_INET6,(void*)&in6.s6_addr, dst6, sizeof(dst6)); + pdst = p_inet_ntop(AF_INET6, &in6.s6_addr, dst6, sizeof(dst6)); ok(pdst != NULL, "InetNtop failed %s\n", dst6); ok(!strcmp(pdst, addr2_Str),"Address %s != %s\n", pdst, addr2_Str); /* Test an zero suffixed IPV6 address */ memcpy(in6.s6_addr, addr3_Num, sizeof(addr3_Num)); - pdst = pInetNtop(AF_INET6,(void*)&in6.s6_addr, dst6, sizeof(dst6)); + pdst = p_inet_ntop(AF_INET6, &in6.s6_addr, dst6, sizeof(dst6)); ok(pdst != NULL, "InetNtop failed %s\n", dst6); ok(!strcmp(pdst, addr3_Str),"Address %s != %s\n", pdst, addr3_Str); /* Test the IPv6 address contains the IPv4 address in IPv4 notation */ memcpy(in6.s6_addr, addr4_Num, sizeof(addr4_Num)); - pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, dst6, sizeof(dst6)); + pdst = p_inet_ntop(AF_INET6, &in6.s6_addr, dst6, sizeof(dst6)); ok(pdst != NULL, "InetNtop failed %s\n", dst6); ok(!strcmp(pdst, addr4_Str),"Address %s != %s\n", pdst, addr4_Str); @@ -4975,7 +4975,7 @@ static void test_addr_to_print(void) /* Test Null destination */ pdst = NULL; - pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, NULL, sizeof(dst6)); + pdst = p_inet_ntop(AF_INET6, &in6.s6_addr, NULL, sizeof(dst6)); ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); ok(WSAGetLastError() == STATUS_INVALID_PARAMETER || WSAGetLastError() == WSAEINVAL /* Win7 */, "Should be STATUS_INVALID_PARAMETER or WSAEINVAL not 0x%x\n", WSAGetLastError()); @@ -4983,7 +4983,7 @@ static void test_addr_to_print(void) /* Test zero length passed */ WSASetLastError(0); pdst = NULL; - pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, dst6, 0); + pdst = p_inet_ntop(AF_INET6, &in6.s6_addr, dst6, 0); ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); ok(WSAGetLastError() == STATUS_INVALID_PARAMETER || WSAGetLastError() == WSAEINVAL /* Win7 */, "Should be STATUS_INVALID_PARAMETER or WSAEINVAL not 0x%x\n", WSAGetLastError()); @@ -4991,7 +4991,7 @@ static void test_addr_to_print(void) /* Test length one shorter than the address length */ WSASetLastError(0); pdst = NULL; - pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, dst6, 16); + pdst = p_inet_ntop(AF_INET6, &in6.s6_addr, dst6, 16); ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); ok(WSAGetLastError() == STATUS_INVALID_PARAMETER || WSAGetLastError() == WSAEINVAL /* Win7 */, "Should be STATUS_INVALID_PARAMETER or WSAEINVAL not 0x%x\n", WSAGetLastError()); @@ -4999,151 +4999,344 @@ static void test_addr_to_print(void) /* Test longer length is ok */ WSASetLastError(0); pdst = NULL; - pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, dst6, 18); + pdst = p_inet_ntop(AF_INET6, &in6.s6_addr, dst6, 18); ok(pdst != NULL, "The pointer should be returned (%p)\n", pdst); } static void test_inet_pton(void) { - struct TEST_DATA - { - int family, ret; - DWORD err; - const char *printable, *collapsed, *raw_data; - } tests[] = { - {AF_UNSPEC, -1, WSAEFAULT, /* Test 0 */ - NULL, NULL, NULL}, - {AF_INET, -1, WSAEFAULT, - NULL, NULL, NULL}, - {AF_INET6, -1, WSAEFAULT, - NULL, NULL, NULL}, - {AF_UNSPEC, -1, WSAEAFNOSUPPORT, - "127.0.0.1", NULL, NULL}, - {AF_INET, 1, 0, - "127.0.0.1", "127.0.0.1", - "\x7f\x00\x00\x01"}, - {AF_INET6, 0, 0, - "127.0.0.1", "127.0.0.1", NULL}, - {AF_INET, 0, 0, - "::1/128", NULL, NULL}, - {AF_INET6, 0, 0, - "::1/128", NULL, NULL}, - {AF_UNSPEC, -1, WSAEAFNOSUPPORT, - "broken", NULL, NULL}, - {AF_INET, 0, 0, - "broken", NULL, NULL}, - {AF_INET6, 0, 0, /* Test 10 */ - "broken", NULL, NULL}, - {AF_UNSPEC, -1, WSAEAFNOSUPPORT, - "177.32.45.20", NULL, NULL}, - {AF_INET, 1, 0, - "177.32.45.20", "177.32.45.20", - "\xb1\x20\x2d\x14"}, - {AF_INET6, 0, 0, - "177.32.45.20", NULL, NULL}, - {AF_INET, 0, 0, - "2607:f0d0:1002:51::4", NULL, NULL}, - {AF_INET6, 1, 0, - "2607:f0d0:1002:51::4", "2607:f0d0:1002:51::4", - "\x26\x07\xf0\xd0\x10\x02\x00\x51\x00\x00\x00\x00\x00\x00\x00\x04"}, - {AF_INET, 0, 0, - "::177.32.45.20", NULL, NULL}, - {AF_INET6, 1, 0, - "::177.32.45.20", "::177.32.45.20", - "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xb1\x20\x2d\x14"}, - {AF_INET, 0, 0, - "fe80::0202:b3ff:fe1e:8329", NULL, NULL}, - {AF_INET6, 1, 0, - "fe80::0202:b3ff:fe1e:8329", "fe80::202:b3ff:fe1e:8329", - "\xfe\x80\x00\x00\x00\x00\x00\x00\x02\x02\xb3\xff\xfe\x1e\x83\x29"}, - {AF_INET6, 1, 0, /* Test 20 */ - "fe80::202:b3ff:fe1e:8329", "fe80::202:b3ff:fe1e:8329", - "\xfe\x80\x00\x00\x00\x00\x00\x00\x02\x02\xb3\xff\xfe\x1e\x83\x29"}, - {AF_INET, 0, 0, - "a", NULL, NULL}, - {AF_INET, 0, 0, - "a.b", NULL, NULL}, - {AF_INET, 0, 0, - "a.b.c", NULL, NULL}, - {AF_INET, 0, 0, - "a.b.c.d", NULL, NULL}, - {AF_INET6, 1, 0, - "2001:cdba:0000:0000:0000:0000:3257:9652", "2001:cdba::3257:9652", - "\x20\x01\xcd\xba\x00\x00\x00\x00\x00\x00\x00\x00\x32\x57\x96\x52"}, - {AF_INET6, 1, 0, - "2001:cdba::3257:9652", "2001:cdba::3257:9652", - "\x20\x01\xcd\xba\x00\x00\x00\x00\x00\x00\x00\x00\x32\x57\x96\x52"}, - {AF_INET6, 1, 0, - "2001:cdba:0:0:0:0:3257:9652", "2001:cdba::3257:9652", - "\x20\x01\xcd\xba\x00\x00\x00\x00\x00\x00\x00\x00\x32\x57\x96\x52"} + static const struct + { + char input[32]; + int ret; + DWORD addr; + } + ipv4_tests[] = + { + {"", 0, 0xdeadbeef}, + {" ", 0, 0xdeadbeef}, + {"1.1.1.1", 1, 0x01010101}, + {"0.0.0.0", 1, 0x00000000}, + {"127.127.127.255", 1, 0xff7f7f7f}, + {"127.127.127.255:123", 0, 0xff7f7f7f}, + {"127.127.127.256", 0, 0xdeadbeef}, + {"a", 0, 0xdeadbeef}, + {"1.1.1.0xaA", 0, 0xdeadbeef}, + {"1.1.1.0x", 0, 0xdeadbeef}, + {"1.1.1.010", 0, 0xdeadbeef}, + {"1.1.1.00", 0, 0xdeadbeef}, + {"1.1.1.0a", 0, 0x00010101}, + {"1.1.1.0o10", 0, 0x00010101}, + {"1.1.1.0b10", 0, 0x00010101}, + {"1.1.1.-2", 0, 0xdeadbeef}, + {"1", 0, 0xdeadbeef}, + {"1.2", 0, 0xdeadbeef}, + {"1.2.3", 0, 0xdeadbeef}, + {"203569230", 0, 0xdeadbeef}, + {"3.4.5.6.7", 0, 0xdeadbeef}, + {" 3.4.5.6", 0, 0xdeadbeef}, + {"\t3.4.5.6", 0, 0xdeadbeef}, + {"3.4.5.6 ", 0, 0x06050403}, + {"3. 4.5.6", 0, 0xdeadbeef}, + {"[0.1.2.3]", 0, 0xdeadbeef}, + {"0x00010203", 0, 0xdeadbeef}, + {"0x2134", 0, 0xdeadbeef}, + {"1234BEEF", 0, 0xdeadbeef}, + {"017700000001", 0, 0xdeadbeef}, + {"0777", 0, 0xdeadbeef}, + {"2607:f0d0:1002:51::4", 0, 0xdeadbeef}, + {"::177.32.45.20", 0, 0xdeadbeef}, + {"::1/128", 0, 0xdeadbeef}, + {"::1", 0, 0xdeadbeef}, + {":1", 0, 0xdeadbeef}, }; + + static const struct + { + char input[64]; + int ret; + unsigned short addr[8]; + int broken; + int broken_ret; + } + ipv6_tests[] = + { + {"0000:0000:0000:0000:0000:0000:0000:0000", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"0000:0000:0000:0000:0000:0000:0000:0001", 1, {0, 0, 0, 0, 0, 0, 0, 0x100}}, + {"0:0:0:0:0:0:0:0", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"0:0:0:0:0:0:0:1", 1, {0, 0, 0, 0, 0, 0, 0, 0x100}}, + {"0:0:0:0:0:0:0::", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"0:0:0:0:0:0:13.1.68.3", 1, {0, 0, 0, 0, 0, 0, 0x10d, 0x344}}, + {"0:0:0:0:0:0::", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"0:0:0:0:0::", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"0:0:0:0:0:FFFF:129.144.52.38", 1, {0, 0, 0, 0, 0, 0xffff, 0x9081, 0x2634}}, + {"0::", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"0:1:2:3:4:5:6:7", 1, {0, 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0x700}}, + {"1080:0:0:0:8:800:200c:417a", 1, {0x8010, 0, 0, 0, 0x800, 0x8, 0x0c20, 0x7a41}}, + {"0:a:b:c:d:e:f::", 1, {0, 0xa00, 0xb00, 0xc00, 0xd00, 0xe00, 0xf00, 0}}, + {"1111:2222:3333:4444:5555:6666:123.123.123.123", 1, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b}}, + {"1111:2222:3333:4444:5555:6666:7777:8888", 1, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888}}, + {"1111:2222:3333:4444:0x5555:6666:7777:8888", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:3333:4444:x555:6666:7777:8888", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:3333:4444:0r5555:6666:7777:8888", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:3333:4444:r5555:6666:7777:8888", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:3333:4444:5555:6666:7777::", 1, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0}}, + {"1111:2222:3333:4444:5555:6666::", 1, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0}}, + {"1111:2222:3333:4444:5555:6666::8888", 1, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0x8888}}, + {"1111:2222:3333:4444:5555:6666::7777:8888", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0x7777}}, + {"1111:2222:3333:4444:5555:6666:7777::8888", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0}}, + {"1111:2222:3333:4444:5555::", 1, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0}}, + {"1111:2222:3333:4444:5555::123.123.123.123", 1, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0x7b7b, 0x7b7b}}, + {"1111:2222:3333:4444:5555::0x1.123.123.123", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x100}}, + {"1111:2222:3333:4444:5555::0x88", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x8800}}, + {"1111:2222:3333:4444:5555::0X88", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x8800}}, + {"1111:2222:3333:4444:5555::0X", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0}}, + {"1111:2222:3333:4444:5555::0X88:7777", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x8800}}, + {"1111:2222:3333:4444:5555::0x8888", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x8888}}, + {"1111:2222:3333:4444:5555::0x80000000", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0xffff}}, + {"1111:2222:3333:4444::5555:0x012345678", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0, 0, 0x5555, 0x7856}}, + {"1111:2222:3333:4444::5555:0x123456789", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0, 0, 0x5555, 0xffff}}, + {"1111:2222:3333:4444:5555:6666:0x12345678", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0xabab, 0xabab}}, + {"1111:2222:3333:4444:5555:6666:7777:0x80000000", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0xffff}}, + {"1111:2222:3333:4444:5555:6666:7777:0x012345678", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x7856}}, + {"1111:2222:3333:4444:5555:6666:7777:0x123456789", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0xffff}}, + {"111:222:333:444:555:666:777:0x123456789abcdef0", 0, {0x1101, 0x2202, 0x3303, 0x4404, 0x5505, 0x6606, 0x7707, 0xffff}}, + {"1111:2222:3333:4444:5555::08888", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:3333:4444:5555::08888::", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:3333:4444:5555:6666:7777:fffff:", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0xabab}}, + {"1111:2222:3333:4444:5555:6666::fffff:", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0xabab, 0xabab}}, + {"1111:2222:3333:4444:5555::fffff", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:3333:4444::fffff", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:3333::fffff", 0, {0x1111, 0x2222, 0x3333, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:3333:4444:5555::7777:8888", 1, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0x7777, 0x8888}}, + {"1111:2222:3333:4444:5555::8888", 1, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x8888}}, + {"1111::", 1, {0x1111, 0, 0, 0, 0, 0, 0, 0}}, + {"1111::123.123.123.123", 1, {0x1111, 0, 0, 0, 0, 0, 0x7b7b, 0x7b7b}}, + {"1111::3333:4444:5555:6666:123.123.123.123", 1, {0x1111, 0, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b}}, + {"1111::3333:4444:5555:6666:7777:8888", 1, {0x1111, 0, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888}}, + {"1111::4444:5555:6666:123.123.123.123", 1, {0x1111, 0, 0, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b}}, + {"1111::4444:5555:6666:7777:8888", 1, {0x1111, 0, 0, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888}}, + {"1111::5555:6666:123.123.123.123", 1, {0x1111, 0, 0, 0, 0x5555, 0x6666, 0x7b7b, 0x7b7b}}, + {"1111::5555:6666:7777:8888", 1, {0x1111, 0, 0, 0, 0x5555, 0x6666, 0x7777, 0x8888}}, + {"1111::6666:123.123.123.123", 1, {0x1111, 0, 0, 0, 0, 0x6666, 0x7b7b, 0x7b7b}}, + {"1111::6666:7777:8888", 1, {0x1111, 0, 0, 0, 0, 0x6666, 0x7777, 0x8888}}, + {"1111::7777:8888", 1, {0x1111, 0, 0, 0, 0, 0, 0x7777, 0x8888}}, + {"1111::8888", 1, {0x1111, 0, 0, 0, 0, 0, 0, 0x8888}}, + {"1:2:3:4:5:6:1.2.3.4", 1, {0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0x201, 0x403}}, + {"1:2:3:4:5:6:7:8", 1, {0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0x700, 0x800}}, + {"1:2:3:4:5:6::", 1, {0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0, 0}}, + {"1:2:3:4:5:6::8", 1, {0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0, 0x800}}, + {"2001:0000:1234:0000:0000:C1C0:ABCD:0876", 1, {0x120, 0, 0x3412, 0, 0, 0xc0c1, 0xcdab, 0x7608}}, + {"2001:0000:4136:e378:8000:63bf:3fff:fdd2", 1, {0x120, 0, 0x3641, 0x78e3, 0x80, 0xbf63, 0xff3f, 0xd2fd}}, + {"2001:0db8:0:0:0:0:1428:57ab", 1, {0x120, 0xb80d, 0, 0, 0, 0, 0x2814, 0xab57}}, + {"2001:0db8:1234:ffff:ffff:ffff:ffff:ffff", 1, {0x120, 0xb80d, 0x3412, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff}}, + {"2001::CE49:7601:2CAD:DFFF:7C94:FFFE", 1, {0x120, 0, 0x49ce, 0x176, 0xad2c, 0xffdf, 0x947c, 0xfeff}}, + {"2001:db8:85a3::8a2e:370:7334", 1, {0x120, 0xb80d, 0xa385, 0, 0, 0x2e8a, 0x7003, 0x3473}}, + {"3ffe:0b00:0000:0000:0001:0000:0000:000a", 1, {0xfe3f, 0xb, 0, 0, 0x100, 0, 0, 0xa00}}, + {"::", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::%16", 0, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::/16", 0, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::01234", 0, {0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"::0", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::0:0", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::0:0:0", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::0:0:0:0", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::0:0:0:0:0", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::0:0:0:0:0:0", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::0:0:0:0:0:0:0", 1, {0, 0, 0, 0, 0, 0, 0, 0}, 1}, + {"::0:a:b:c:d:e:f", 1, {0, 0, 0xa00, 0xb00, 0xc00, 0xd00, 0xe00, 0xf00}, 1}, + {"::123.123.123.123", 1, {0, 0, 0, 0, 0, 0, 0x7b7b, 0x7b7b}}, + {"ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", 1, {0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff}}, + {"':10.0.0.1", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"-1", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"02001:0000:1234:0000:0000:C1C0:ABCD:0876", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"2001:00000:1234:0000:0000:C1C0:ABCD:0876", 0, {0x120, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"2001:0000:01234:0000:0000:C1C0:ABCD:0876", 0, {0x120, 0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"2001:0000::01234.0", 0, {0x120, 0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"2001:0::b.0", 0, {0x120, 0, 0, 0, 0, 0, 0, 0xb00}}, + {"2001::0:b.0", 0, {0x120, 0, 0, 0, 0, 0, 0, 0xb00}}, + {"1.2.3.4", 0, {0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1.2.3.4:1111::5555", 0, {0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1.2.3.4::5555", 0, {0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"11112222:3333:4444:5555:6666:1.2.3.4", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"11112222:3333:4444:5555:6666:7777:8888", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"0x1111", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:22223333:4444:5555:6666:1.2.3.4", 0, {0x1111, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:22223333:4444:5555:6666:7777:8888", 0, {0x1111, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:123456789:4444:5555:6666:7777:8888", 0, {0x1111, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:1234567890abcdef0:4444:5555:6666:7777:888", 0, {0x1111, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:", 0, {0x1111, 0x2222, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:1.2.3.4", 0, {0x1111, 0x2222, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:3333", 0, {0x1111, 0x2222, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:3333:4444:5555:6666::1.2.3.4", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0x100}}, + {"1111:2222:3333:4444:5555:6666:7777:1.2.3.4", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x100}}, + {"1111:2222:3333:4444:5555:6666:7777:8888:", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888}}, + {"1111:2222:3333:4444:5555:6666:7777:8888:1.2.3.4",0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888}}, + {"1111:2222:3333:4444:5555:6666:7777:8888:9999", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888}}, + {"1111:2222:::", 0, {0x1111, 0x2222, 0, 0, 0, 0, 0, 0}}, + {"1111::5555:", 0, {0x1111, 0x5555, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111::3333:4444:5555:6666:7777::", 0, {0x1111, 0, 0, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777}}, + {"1111:2222:::4444:5555:6666:1.2.3.4", 0, {0x1111, 0x2222, 0, 0, 0, 0, 0, 0}}, + {"1111::3333::5555:6666:1.2.3.4", 0, {0x1111, 0, 0, 0, 0, 0, 0, 0x3333}}, + {"12345::6:7:8", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::001.2.3.4", 1, {0x100, 0, 0, 0, 0, 0, 0x201, 0x403}}, + {"1::1.002.3.4", 1, {0x100, 0, 0, 0, 0, 0, 0x201, 0x403}}, + {"1::0001.2.3.4", 0, {0x100, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.0002.3.4", 0, {0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.256.4", 0, {0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.4294967296.4", 0, {0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.18446744073709551616.4", 0, {0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.3.256", 0, {0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.3.4294967296", 0, {0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.3.18446744073709551616", 0, {0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.3.300", 0, {0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.3.300.", 0, {0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2::1", 0, {0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.3.4::1", 0, {0x100, 0, 0, 0, 0, 0, 0x201, 0x403}}, + {"1::1.", 0, {0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2", 0, {0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.", 0, {0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.3", 0, {0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.3.", 0, {0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.3.4", 1, {0x100, 0, 0, 0, 0, 0, 0x201, 0x403}}, + {"1::1.2.3.900", 0, {0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.300.4", 0, {0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.256.3.4", 0, {0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.256:3.4", 0, {0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2a.3.4", 0, {0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::256.2.3.4", 0, {0x100, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1a.2.3.4", 0, {0x100, 0, 0, 0, 0, 0, 0, 0x1a00}}, + {"1::2::3", 0, {0x100, 0, 0, 0, 0, 0, 0, 0x200}}, + {"2001:0000:1234: 0000:0000:C1C0:ABCD:0876", 0, {0x120, 0, 0x3412, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"2001:0000:1234:0000:0000:C1C0:ABCD:0876 0", 0, {0x120, 0, 0x3412, 0, 0, 0xc0c1, 0xcdab, 0x7608}}, + {"2001:1:1:1:1:1:255Z255X255Y255", 0, {0x120, 0x100, 0x100, 0x100, 0x100, 0x100, 0xabab, 0xabab}}, + {"2001::FFD3::57ab", 0, {0x120, 0, 0, 0, 0, 0, 0, 0xd3ff}}, + {":", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {":1111:2222:3333:4444:5555:6666:1.2.3.4", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {":1111:2222:3333:4444:5555:6666:7777:8888", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {":1111::", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"::-1", 0, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::12345678", 0, {0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"::123456789", 0, {0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"::1234567890abcdef0", 0, {0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"::0x80000000", 0, {0, 0, 0, 0, 0, 0, 0, 0xffff}}, + {"::0x012345678", 0, {0, 0, 0, 0, 0, 0, 0, 0x7856}}, + {"::0x123456789", 0, {0, 0, 0, 0, 0, 0, 0, 0xffff}}, + {"::0x1234567890abcdef0", 0, {0, 0, 0, 0, 0, 0, 0, 0xffff}}, + {"::.", 0, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::..", 0, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::...", 0, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:1.2.3.4", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"[::]", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + }; + + BYTE buffer[32]; int i, ret; - DWORD err; - char buffer[64],str[64]; - WCHAR printableW[64], collapsedW[64]; - const char *ptr; - const WCHAR *ptrW; - /* InetNtop and InetPton became available in Vista and Win2008 */ - if (!pInetNtop || !pInetNtopW || !pInetPtonA || !pInetPtonW) + /* inet_ntop and inet_pton became available in Vista and Win2008 */ + if (!p_inet_ntop) { - win_skip("InetNtop and/or InetPton not present, not executing tests\n"); + win_skip("inet_ntop is not available\n"); return; } - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + WSASetLastError(0xdeadbeef); + ret = p_inet_pton(AF_UNSPEC, NULL, buffer); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = p_inet_pton(AF_INET, NULL, buffer); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = pInetPtonW(AF_UNSPEC, NULL, buffer); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = pInetPtonW(AF_INET, NULL, buffer); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = p_inet_pton(AF_UNSPEC, "127.0.0.1", buffer); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEAFNOSUPPORT, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = p_inet_pton(AF_UNSPEC, "2607:f0d0:1002:51::4", buffer); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEAFNOSUPPORT, "got error %u\n", WSAGetLastError()); + + for (i = 0; i < ARRAY_SIZE(ipv4_tests); ++i) { + WCHAR inputW[32]; + DWORD addr; + + winetest_push_context( "Address %s", debugstr_a(ipv4_tests[i].input) ); + WSASetLastError(0xdeadbeef); - ret = pInetPtonA(tests[i].family, tests[i].printable, buffer); - ok (ret == tests[i].ret, "Test [%d]: Expected %d, got %d\n", i, tests[i].ret, ret); - if (tests[i].ret == -1) - { - err = WSAGetLastError(); - ok (tests[i].err == err, "Test [%d]: Expected 0x%x, got 0x%x\n", i, tests[i].err, err); - } - if (tests[i].ret != 1) continue; - ok (memcmp(buffer, tests[i].raw_data, - tests[i].family == AF_INET ? sizeof(struct in_addr) : sizeof(struct in6_addr)) == 0, - "Test [%d]: Expected binary data differs\n", i); - - /* Test the result from Pton with Ntop */ - strcpy (str, "deadbeef"); - ptr = pInetNtop(tests[i].family, buffer, str, sizeof(str)); - ok (ptr != NULL, "Test [%d]: Failed with NULL\n", i); - ok (ptr == str, "Test [%d]: Pointers differ (%p != %p)\n", i, ptr, str); - if (!ptr) continue; - ok (strcmp(ptr, tests[i].collapsed) == 0, "Test [%d]: Expected '%s', got '%s'\n", - i, tests[i].collapsed, ptr); - } - - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) - { - if (tests[i].printable) - MultiByteToWideChar(CP_ACP, 0, tests[i].printable, -1, printableW, - sizeof(printableW) / sizeof(printableW[0])); + addr = 0xdeadbeef; + ret = p_inet_pton(AF_INET, ipv4_tests[i].input, &addr); + ok(ret == ipv4_tests[i].ret, "got %d\n", ret); + ok(WSAGetLastError() == 0xdeadbeef, "got error %u\n", WSAGetLastError()); + ok(addr == ipv4_tests[i].addr, "got addr %#08lx\n", addr); + + MultiByteToWideChar(CP_ACP, 0, ipv4_tests[i].input, -1, inputW, ARRAY_SIZE(inputW)); WSASetLastError(0xdeadbeef); - ret = pInetPtonW(tests[i].family, tests[i].printable ? printableW : NULL, buffer); - ok(ret == tests[i].ret, "Test [%d]: Expected %d, got %d\n", i, tests[i].ret, ret); - if (tests[i].ret == -1) - { - err = WSAGetLastError(); - ok(tests[i].err == err, "Test [%d]: Expected 0x%x, got 0x%x\n", i, tests[i].err, err); - } - if (tests[i].ret != 1) continue; - ok(memcmp(buffer, tests[i].raw_data, - tests[i].family == AF_INET ? sizeof(struct in_addr) : sizeof(struct in6_addr)) == 0, - "Test [%d]: Expected binary data differs\n", i); - - /* Test the result from Pton with Ntop */ - printableW[0] = 0xdead; - ptrW = pInetNtopW(tests[i].family, buffer, printableW, sizeof(printableW) / sizeof(printableW[0])); - ok (ptrW != NULL, "Test [%d]: Failed with NULL\n", i); - ok (ptrW == printableW, "Test [%d]: Pointers differ (%p != %p)\n", i, ptrW, printableW); - if (!ptrW) continue; - - MultiByteToWideChar(CP_ACP, 0, tests[i].collapsed, -1, collapsedW, - sizeof(collapsedW) / sizeof(collapsedW[0])); - ok (lstrcmpW(ptrW, collapsedW) == 0, "Test [%d]: Expected '%s', got '%s'\n", - i, tests[i].collapsed, wine_dbgstr_w(ptrW)); + addr = 0xdeadbeef; + ret = pInetPtonW(AF_INET, inputW, &addr); + ok(ret == ipv4_tests[i].ret, "got %d\n", ret); + ok(WSAGetLastError() == (ret ? 0xdeadbeef : WSAEINVAL), "got error %u\n", WSAGetLastError()); + ok(addr == ipv4_tests[i].addr, "got addr %#08lx\n", addr); + + WSASetLastError(0xdeadbeef); + addr = inet_addr(ipv4_tests[i].input); + ok(addr == ipv4_tests[i].ret ? ipv4_tests[i].addr : INADDR_NONE, "got addr %#08lx\n", addr); + ok(WSAGetLastError() == 0xdeadbeef, "got error %u\n", WSAGetLastError()); + + winetest_pop_context(); + } + + for (i = 0; i < ARRAY_SIZE(ipv6_tests); ++i) + { + unsigned short addr[8]; + WCHAR inputW[64]; + + winetest_push_context( "Address %s", debugstr_a(ipv6_tests[i].input) ); + + WSASetLastError(0xdeadbeef); + memset(addr, 0xab, sizeof(addr)); + ret = p_inet_pton(AF_INET6, ipv6_tests[i].input, addr); + if (ipv6_tests[i].broken) + ok(ret == ipv6_tests[i].ret || broken(ret == ipv6_tests[i].broken_ret), "got %d\n", ret); + else + ok(ret == ipv6_tests[i].ret, "got %d\n", ret); + ok(WSAGetLastError() == 0xdeadbeef, "got error %u\n", WSAGetLastError()); + if (ipv6_tests[i].broken) + ok(!memcmp(addr, ipv6_tests[i].addr, sizeof(addr)) || broken(memcmp(addr, ipv6_tests[i].addr, sizeof(addr))), + "address didn't match\n"); + else + ok(!memcmp(addr, ipv6_tests[i].addr, sizeof(addr)), "address didn't match\n"); + + MultiByteToWideChar(CP_ACP, 0, ipv6_tests[i].input, -1, inputW, ARRAY_SIZE(inputW)); + WSASetLastError(0xdeadbeef); + memset(addr, 0xab, sizeof(addr)); + ret = pInetPtonW(AF_INET6, inputW, addr); + if (ipv6_tests[i].broken) + ok(ret == ipv6_tests[i].ret || broken(ret == ipv6_tests[i].broken_ret), "got %d\n", ret); + else + ok(ret == ipv6_tests[i].ret, "got %d\n", ret); + ok(WSAGetLastError() == (ret ? 0xdeadbeef : WSAEINVAL), "got error %u\n", WSAGetLastError()); + if (ipv6_tests[i].broken) + ok(!memcmp(addr, ipv6_tests[i].addr, sizeof(addr)) || broken(memcmp(addr, ipv6_tests[i].addr, sizeof(addr))), + "address didn't match\n"); + else + ok(!memcmp(addr, ipv6_tests[i].addr, sizeof(addr)), "address didn't match\n"); + + winetest_pop_context(); } } @@ -7730,7 +7923,7 @@ static void verify_ipv6_addrinfo(ADDRINFOA *result, const char *expectedIp) ok(sockaddr6->sin6_port == 0, "ai_addr->sin6_port == %d\n", sockaddr6->sin6_port); ZeroMemory(ipBuffer, sizeof(ipBuffer)); - ret = pInetNtop(AF_INET6, &sockaddr6->sin6_addr, ipBuffer, sizeof(ipBuffer)); + ret = p_inet_ntop(AF_INET6, &sockaddr6->sin6_addr, ipBuffer, sizeof(ipBuffer)); ok(ret != NULL, "inet_ntop failed (%d)\n", WSAGetLastError()); ok(strcmp(ipBuffer, expectedIp) == 0, "ai_addr->sin6_addr == '%s' (expected '%s')\n", ipBuffer, expectedIp); }

1 month, 3 weeks

[reactos] 02/04: [WS2_32] Add inet_pton, inet_ntop

by Baruch Rutman

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=454de56c6b8ca47b47e6e… commit 454de56c6b8ca47b47e6ec21f7d9a8f2715673b2 Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Sat Apr 20 22:30:01 2024 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Nov 2 21:57:28 2024 +0100 [WS2_32] Add inet_pton, inet_ntop --- dll/win32/ws2_32/src/addrconv.c | 140 ++++++++++++++++++++++++++++++++++++++++ dll/win32/ws2_32/ws2_32.spec | 4 ++ sdk/include/psdk/ws2tcpip.h | 4 +- 3 files changed, 146 insertions(+), 2 deletions(-) diff --git a/dll/win32/ws2_32/src/addrconv.c b/dll/win32/ws2_32/src/addrconv.c index 3cfca497a47..fa459a073f3 100644 --- a/dll/win32/ws2_32/src/addrconv.c +++ b/dll/win32/ws2_32/src/addrconv.c @@ -492,3 +492,143 @@ WSANtohs(IN SOCKET s, return SOCKET_ERROR; } +PCSTR +WSAAPI +inet_ntop( + _In_ INT Family, + _In_ const VOID *pAddr, + _Out_writes_(StringBufSize) PSTR pStringBuf, + _In_ size_t StringBufSize) +{ + NTSTATUS Status; + ULONG BufSize = StringBufSize; + + switch (Family) + { + case AF_INET: + Status = RtlIpv4AddressToStringExA(pAddr, 0, pStringBuf, &BufSize); + break; + case AF_INET6: + Status = RtlIpv6AddressToStringExA(pAddr, 0, 0, pStringBuf, &BufSize); + break; + default: + SetLastError(WSAEAFNOSUPPORT); + return NULL; + } + + if (!NT_SUCCESS(Status)) + { + SetLastError(WSAEINVAL); + return NULL; + } + + return pStringBuf; +} + +PCWSTR +WSAAPI +InetNtopW( + _In_ INT Family, + _In_ const VOID *pAddr, + _Out_writes_(StringBufSize) PWSTR pStringBuf, + _In_ size_t StringBufSize) +{ + NTSTATUS Status; + ULONG BufSize = StringBufSize; + + switch (Family) + { + case AF_INET: + Status = RtlIpv4AddressToStringExW(pAddr, 0, pStringBuf, &BufSize); + break; + case AF_INET6: + Status = RtlIpv6AddressToStringExW(pAddr, 0, 0, pStringBuf, &BufSize); + break; + default: + SetLastError(WSAEAFNOSUPPORT); + return NULL; + } + + if (!NT_SUCCESS(Status)) + { + SetLastError(WSAEINVAL); + return NULL; + } + + return pStringBuf; +} + +INT +WSAAPI +inet_pton( + _In_ INT Family, + _In_ PCSTR pszAddrString, + _Out_writes_bytes_(sizeof(IN_ADDR6)) PVOID pAddrBuf) +{ + NTSTATUS Status; + PCSTR ch; + + if (!pszAddrString || !pAddrBuf) + { + SetLastError(WSAEFAULT); + return -1; + } + + switch (Family) + { + case AF_INET: + Status = RtlIpv4StringToAddressA(pszAddrString, TRUE, &ch, pAddrBuf); + break; + case AF_INET6: + Status = RtlIpv6StringToAddressA(pszAddrString, &ch, pAddrBuf); + break; + default: + SetLastError(WSAEAFNOSUPPORT); + return -1; + } + + if (!NT_SUCCESS(Status) || (*ch != 0)) + { + return 0; + } + + return 1; +} + +INT +WSAAPI +InetPtonW( + _In_ INT Family, + _In_ PCWSTR pszAddrString, + _Out_writes_bytes_(sizeof(IN_ADDR6)) PVOID pAddrBuf) +{ + NTSTATUS Status; + PCWSTR ch; + + if (!pszAddrString || !pAddrBuf) + { + SetLastError(WSAEFAULT); + return -1; + } + + switch (Family) + { + case AF_INET: + Status = RtlIpv4StringToAddressW(pszAddrString, TRUE, &ch, pAddrBuf); + break; + case AF_INET6: + Status = RtlIpv6StringToAddressW(pszAddrString, &ch, pAddrBuf); + break; + default: + SetLastError(WSAEAFNOSUPPORT); + return -1; + } + + if (!NT_SUCCESS(Status) || (*ch != 0)) + { + SetLastError(WSAEINVAL); /* Only unicode version sets this error */ + return 0; + } + + return 1; +} diff --git a/dll/win32/ws2_32/ws2_32.spec b/dll/win32/ws2_32/ws2_32.spec index e0e14b7e68e..84e5680349e 100644 --- a/dll/win32/ws2_32/ws2_32.spec +++ b/dll/win32/ws2_32/ws2_32.spec @@ -115,3 +115,7 @@ 23 stdcall socket(long long long) @ stdcall GetAddrInfoW(wstr wstr ptr ptr) @ stdcall GetNameInfoW(ptr long wstr long wstr long long) +@ stdcall -version=0x600+ inet_ntop(long ptr ptr long) +@ stdcall -version=0x600+ InetNtopW(long ptr ptr long) +@ stdcall -version=0x600+ inet_pton(long str ptr) +@ stdcall -version=0x600+ InetPtonW(long wstr ptr) diff --git a/sdk/include/psdk/ws2tcpip.h b/sdk/include/psdk/ws2tcpip.h index 8d8aaa75add..b28e89c9bef 100644 --- a/sdk/include/psdk/ws2tcpip.h +++ b/sdk/include/psdk/ws2tcpip.h @@ -451,7 +451,7 @@ PCSTR WSAAPI inet_ntop( _In_ INT Family, - _In_ PVOID pAddr, + _In_ const VOID *pAddr, _Out_writes_(StringBufSize) PSTR pStringBuf, _In_ size_t StringBufSize); @@ -459,7 +459,7 @@ PCWSTR WSAAPI InetNtopW( _In_ INT Family, - _In_ PVOID pAddr, + _In_ const VOID *pAddr, _Out_writes_(StringBufSize) PWSTR pStringBuf, _In_ size_t StringBufSize);

1 month, 3 weeks

[reactos] 01/04: [RTL] ntdll: Implement RtlIpv6StringToAddress(Ex)[AW]

by Alex Henrie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=56229b7a06fe24cc084b9… commit 56229b7a06fe24cc084b939ccdac0415ebe3493c Author: Alex Henrie <alexhenrie24(a)gmail.com> AuthorDate: Sat Apr 20 22:20:37 2024 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Nov 2 21:57:28 2024 +0100 [RTL] ntdll: Implement RtlIpv6StringToAddress(Ex)[AW] Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 474d1f0b2daa8583fa82fe203b207807ba29499d --- sdk/lib/rtl/network.c | 410 ++++++++++++++++++++++++++------------------------ 1 file changed, 213 insertions(+), 197 deletions(-) diff --git a/sdk/lib/rtl/network.c b/sdk/lib/rtl/network.c index 44151e42b5e..acf3d9b26bf 100644 --- a/sdk/lib/rtl/network.c +++ b/sdk/lib/rtl/network.c @@ -110,26 +110,6 @@ RtlpStringToUlong( return RtlpStringToUlongBase(String, Base, Terminator, Out); } -/* Tell us what possible base the string could be in, 10 or 16 by looking at the characters. - Invalid characters break the operation */ -static -ULONG -RtlpClassifyChars(PCWSTR S, PULONG Base) -{ - ULONG Len = 0; - *Base = 0; - for (Len = 0; S[Len]; ++Len) - { - if (iswascii(S[Len]) && isdigit(S[Len])) - *Base = max(*Base, 10); - else if (iswascii(S[Len]) && isxdigit(S[Len])) - *Base = 16; - else - break; - } - return Len; -} - /* Worker function to extract the ipv4 part of a string. */ NTSTATUS NTAPI @@ -798,152 +778,239 @@ RtlIpv6StringToAddressExA( return Status; } -/* -* @implemented -*/ -NTSTATUS -NTAPI -RtlIpv6StringToAddressW( - _In_ PCWSTR String, - _Out_ PCWSTR *Terminator, - _Out_ struct in6_addr *Addr) +/* + * RtlIpv6StringToAddress[Ex]W implementation was imported from Wine 9.6 at 20/4/2024 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * For full text of the license see COPYING.LIB in the root of this project. + * + * Copyright 2020 Alex Henrie + */ + +static const int hex_table[] = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x00-0x0F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x10-0x1F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x20-0x2F */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, /* 0x30-0x3F */ + -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x40-0x4F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x50-0x5F */ + -1, 10, 11, 12, 13, 14, 15 /* 0x60-0x66 */ +}; + +static BOOL parse_ipv4_component(const WCHAR **str, BOOL strict, ULONG *value) { - INT n, j; - INT StartSkip = -1, Parts = 0; - ULONG Base, Len; - NTSTATUS Status = STATUS_SUCCESS; - enum { None, Number, Colon, DoubleColon } Last = None; - BOOLEAN SkipoutLastHex = FALSE; + int base = 10, d; + WCHAR c; + ULONG cur_value, prev_value = 0; + BOOL success = FALSE; - if (!String || !Terminator || !Addr) - return STATUS_INVALID_PARAMETER; + if (**str == '.') + { + *str += 1; + return FALSE; + } - for (n = 0; n < 8;) + if ((*str)[0] == '0') { - Len = RtlpClassifyChars(String, &Base); - if (Len == 0) + if ((*str)[1] == 'x' || (*str)[1] == 'X') + { + *str += 2; + if (strict) return FALSE; + base = 16; + } + else if ((*str)[1] >= '0' && (*str)[1] <= '9') { - /* not a number, and no ':' or already encountered an ':' */ - if (String[0] != ':' || Last == Colon) - break; + *str += 1; + if (strict) return FALSE; + base = 8; + } + } - /* double colon, 1 or more fields set to 0. mark the position, and move on. */ - if (StartSkip == -1 && String[1] == ':') - { - /* this case was observed in windows, but it does not seem correct. */ - if (!n) - { - Addr->s6_words[n++] = 0; - Addr->s6_words[n++] = 0; - } - StartSkip = n; - String += 2; - Last = DoubleColon; - } - else if (String[1] == ':' || Last != Number) + for (cur_value = 0; **str; *str += 1) + { + c = **str; + if (c >= ARRAYSIZE(hex_table)) break; + d = hex_table[c]; + if (d == -1 || d >= base) break; + cur_value = cur_value * base + d; + success = TRUE; + if (cur_value < prev_value) return FALSE; /* overflow */ + prev_value = cur_value; + } + + if (success) *value = cur_value; + return success; +} + +static BOOL parse_ipv6_component(const WCHAR **str, int base, ULONG *value) +{ + WCHAR *terminator; + if (**str >= ARRAYSIZE(hex_table) || hex_table[**str] == -1) return FALSE; + *value = min(wcstoul(*str, &terminator, base), 0x7FFFFFFF); + if (*terminator == '0') terminator++; /* "0x" but nothing valid after */ + else if (terminator == *str) return FALSE; + *str = terminator; + return TRUE; +} + +static NTSTATUS ipv6_string_to_address(const WCHAR *str, BOOL ex, + const WCHAR **terminator, IN6_ADDR *address, ULONG *scope, USHORT *port) +{ + BOOL expecting_port = FALSE, has_0x = FALSE, too_big = FALSE; + int n_bytes = 0, n_ipv4_bytes = 0, gap = -1; + ULONG ip_component, scope_component = 0, port_component = 0; + const WCHAR *prev_str; + + if (str[0] == '[') + { + if (!ex) goto error; + expecting_port = TRUE; + str++; + } + + if (str[0] == ':') + { + if (str[1] != ':') goto error; + str++; + address->u.Word[0] = 0; + } + + for (;;) + { + if (!n_ipv4_bytes && *str == ':') + { + /* double colon */ + if (gap != -1) goto error; + str++; + prev_str = str; + gap = n_bytes; + if (n_bytes == 14 || !parse_ipv6_component(&str, 16, &ip_component)) break; + str = prev_str; + } + else + { + prev_str = str; + } + + if (!n_ipv4_bytes && n_bytes <= (gap != -1 ? 10 : 12)) + { + if (parse_ipv6_component(&str, 10, &ip_component) && *str == '.') + n_ipv4_bytes = 1; + str = prev_str; + } + + if (n_ipv4_bytes) + { + /* IPv4 component */ + if (!parse_ipv6_component(&str, 10, &ip_component)) goto error; + if (str - prev_str > 3 || ip_component > 255) { - /* a double colon after we already encountered one, or a the last parsed item was not a number. */ - break; + too_big = TRUE; } else { - ++String; - Last = Colon; + if (*str != '.' && (n_ipv4_bytes < 4 || (n_bytes < 15 && gap == -1))) goto error; + address->u.Byte[n_bytes] = ip_component; + n_bytes++; } - } - else if (Len > 4) - { - /* it seems that when encountering more than 4 chars, the terminator is not updated, - unless the previously encountered item is a double colon.... */ - Status = STATUS_INVALID_PARAMETER; - if (Last != DoubleColon) - return Status; - String += Len; - break; + if (n_ipv4_bytes == 4 || *str != '.') break; + n_ipv4_bytes++; } else { - ULONG Value; - if (String[Len] == '.' && n <= 6) + /* IPv6 component */ + if (!parse_ipv6_component(&str, 16, &ip_component)) goto error; + if (prev_str[0] == '0' && (prev_str[1] == 'x' || prev_str[1] == 'X')) { - ULONG Values[4]; - INT PartsV4 = 0; - /* this could be an ipv4 address inside an ipv6 address http://tools.ietf.org/html/rfc2765 */ - Last = Number; - Status = RtlpIpv4StringToAddressParserW(String, TRUE, &String, Values, &PartsV4); - for(j = 0; j < PartsV4; ++j) - { - if (Values[j] > 255) - { - Status = STATUS_INVALID_PARAMETER; - if (j != 3) - return Status; - break; - } - if ((j == PartsV4 - 1) && - (j < 3 || - (*String == ':' && StartSkip == -1) || - (StartSkip == -1 && n < 6) || - Status == STATUS_INVALID_PARAMETER)) - { - Status = STATUS_INVALID_PARAMETER; - break; - } - Addr->s6_bytes[n * 2 + j] = Values[j] & 0xff; - } - /* mark enough parts as converted in case we are the last item to be converted */ - n += 2; - /* mark 2 parts as converted in case we are not the last item, and we encountered a double colon. */ - Parts+=2; - break; + /* Windows "feature": the last IPv6 component can start with "0x" and be longer than 4 digits */ + if (terminator) *terminator = prev_str + 1; /* Windows says that the "x" is the terminator */ + if (n_bytes < 14 && gap == -1) return STATUS_INVALID_PARAMETER; + address->u.Word[n_bytes/2] = RtlUshortByteSwap(ip_component); + n_bytes += 2; + has_0x = TRUE; + goto fill_gap; } + if (*str != ':' && n_bytes < 14 && gap == -1) goto error; + if (str - prev_str > 4) + too_big = TRUE; + else + address->u.Word[n_bytes/2] = RtlUshortByteSwap(ip_component); + n_bytes += 2; + if (*str != ':' || (gap != -1 && str[1] == ':')) break; + } + if (n_bytes == (gap != -1 ? 14 : 16)) break; + if (too_big) return STATUS_INVALID_PARAMETER; + str++; + } - if (String[Len] != ':' && n < 7 && StartSkip == -1) - { - /* if we decoded atleast some numbers, update the terminator to point to the first invalid char */ - if (Base) - String += Len; - Status = STATUS_INVALID_PARAMETER; - break; - } + if (terminator) *terminator = str; + if (too_big) return STATUS_INVALID_PARAMETER; - if (Len == 1 && towlower(String[Len]) == 'x' && String[0] == '0') +fill_gap: + if (gap == -1) + { + if (n_bytes < 16) goto error; + } + else + { + memmove(address->u.Byte + 16 - (n_bytes - gap), address->u.Byte + gap, n_bytes - gap); + memset(address->u.Byte + gap, 0, 16 - n_bytes); + } + + if (ex) + { + if (has_0x) goto error; + + if (*str == '%') + { + str++; + if (!parse_ipv4_component(&str, TRUE, &scope_component)) goto error; + } + + if (expecting_port) + { + if (*str != ']') goto error; + str++; + if (*str == ':') { - Len = RtlpClassifyChars(String + 2, &Base); - if (Len > 0 && Len <= 4) - { - *Terminator = String + 1; - String += 2; - SkipoutLastHex = TRUE; - } + str++; + if (!parse_ipv4_component(&str, FALSE, &port_component)) goto error; + if (!port_component || port_component > 0xFFFF || *str) goto error; + port_component = RtlUshortByteSwap(port_component); } - - Status = RtlpStringToUlongBase(String, 16, &String, &Value); - if (!NT_SUCCESS(Status)) - break; - - if (StartSkip != -1) - Parts++; - Addr->s6_words[n++] = WN2H(Value); - Last = Number; - if (SkipoutLastHex) - break; } } - if (StartSkip != -1 && Status != STATUS_INVALID_PARAMETER && Last != Colon) - { - /* we found a '::' somewhere, so expand that. */ - memmove(&Addr->s6_words[8-Parts], &Addr->s6_words[StartSkip], Parts * sizeof(Addr->s6_words[0])); - memset(&Addr->s6_words[StartSkip], 0, (8-StartSkip-Parts) * sizeof(Addr->s6_words[0])); - n = 8; - } + if (!terminator && *str) return STATUS_INVALID_PARAMETER; - /* we have already set the terminator */ - if (SkipoutLastHex) - return n < 8 ? STATUS_INVALID_PARAMETER : Status; - *Terminator = String; - return n < 8 ? STATUS_INVALID_PARAMETER : Status; + if (scope) *scope = scope_component; + if (port) *port = port_component; + + return STATUS_SUCCESS; + +error: + if (terminator) *terminator = str; + return STATUS_INVALID_PARAMETER; +} + +/* +* @implemented +*/ +NTSTATUS +NTAPI +RtlIpv6StringToAddressW( + _In_ PCWSTR String, + _Out_ PCWSTR *Terminator, + _Out_ struct in6_addr *Addr) +{ + if (!String || !Terminator || !Addr) + return STATUS_INVALID_PARAMETER; + + return ipv6_string_to_address(String, FALSE, Terminator, Addr, NULL, NULL); } /* @@ -957,63 +1024,12 @@ RtlIpv6StringToAddressExW( _Out_ PULONG ScopeId, _Out_ PUSHORT Port) { - NTSTATUS Status; - ULONG ConvertedPort = 0, ConvertedScope = 0; - if (!AddressString || !Address || !ScopeId || !Port) - return STATUS_INVALID_PARAMETER; - - if (*AddressString == '[') - { - ConvertedPort = 1; - ++AddressString; - } - Status = RtlIpv6StringToAddressW(AddressString, &AddressString, Address); - if (!NT_SUCCESS(Status)) + if (!AddressString || !Address || !ScopeId || !Port) return STATUS_INVALID_PARAMETER; - if (*AddressString == '%') - { - ++AddressString; - Status = RtlpStringToUlongBase(AddressString, 10, &AddressString, &ConvertedScope); - if (!NT_SUCCESS(Status)) - return STATUS_INVALID_PARAMETER; - } - else if (*AddressString && !(ConvertedPort && *AddressString == ']')) - { - return STATUS_INVALID_PARAMETER; - } - - if (ConvertedPort) - { - if (*AddressString++ !=']') - return STATUS_INVALID_PARAMETER; - if (*AddressString ==':') - { - ULONG Base = 10; - if (*++AddressString == '0') - { - if (towlower(*++AddressString) != 'x') - return STATUS_INVALID_PARAMETER; - ++AddressString; - Base = 16; - } - Status = RtlpStringToUlongBase(AddressString, Base, &AddressString, &ConvertedPort); - if (!NT_SUCCESS(Status) || ConvertedPort > 0xffff) - return STATUS_INVALID_PARAMETER; - } - else - { - ConvertedPort = 0; - } - } - - if (*AddressString == 0) - { - *ScopeId = ConvertedScope; - *Port = WN2H(ConvertedPort); - return STATUS_SUCCESS; - } - return STATUS_INVALID_PARAMETER; + return ipv6_string_to_address(AddressString, TRUE, NULL, Address, ScopeId, Port); } +/* End of Wine implementation */ + /* EOF */

1 month, 3 weeks

[reactos] 01/01: [INTL] Update German (de-DE) translation (#7466)

by Václav Zouzalík

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2330d3ad0301c607c0580… commit 2330d3ad0301c607c0580b9940535a915d31e4e8 Author: Václav Zouzalík <Vaclav.Zouzalik(a)seznam.cz> AuthorDate: Sat Nov 2 21:44:35 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 2 21:44:35 2024 +0100 [INTL] Update German (de-DE) translation (#7466) --- dll/cpl/intl/lang/de-DE.rc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dll/cpl/intl/lang/de-DE.rc b/dll/cpl/intl/lang/de-DE.rc index 4874456628f..fa209465b66 100644 --- a/dll/cpl/intl/lang/de-DE.rc +++ b/dll/cpl/intl/lang/de-DE.rc @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS International Control Panel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: German resource file + * TRANSLATORS: Copyright 2010 Eric Kohl <eric.kohl(a)reactos.org> + * Copyright 2024 Václav Zouzalík (Venca24) <vaclav.zouzalik(a)seznam.cz> + */ + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_GENERALPAGE DIALOGEX 0, 0, 246, 230 @@ -214,5 +222,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "Der Schlüssel HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language konnte nicht geöffnet werden." IDS_ERROR_NLS_CODE_REG "Der Schlüssel HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage konnte nicht geöffnet werden." IDS_ERROR_INPUT_DLL "Die Datei input.dll konnte nicht geladen werden." - IDS_ERROR_UNICODE "Unable to install a new language for programs that don't support Unicode!" + IDS_ERROR_UNICODE "Neue Sprache für Programme, die Unicode nicht unterstützen, konnte nicht installiert werden!" END

1 month, 3 weeks

[reactos] 01/01: [DISKPART] Update Turkish (tr-TR) translation (#7292)

by vsaucing

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad827eaa715fc971b1484… commit ad827eaa715fc971b148404abf720c16b5c1b73f Author: vsaucing <144949339+vsaucing(a)users.noreply.github.com> AuthorDate: Sat Nov 2 23:44:15 2024 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 2 21:44:15 2024 +0100 [DISKPART] Update Turkish (tr-TR) translation (#7292) Fixed errors. --- base/system/diskpart/lang/tr-TR.rc | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/base/system/diskpart/lang/tr-TR.rc b/base/system/diskpart/lang/tr-TR.rc index 0cae3cf8b47..6c9cc76c284 100644 --- a/base/system/diskpart/lang/tr-TR.rc +++ b/base/system/diskpart/lang/tr-TR.rc @@ -1,4 +1,12 @@ -/* TRANSLATORS: 2015 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net), 2018 Ercan Ersoy (ercanersoy) (ercanersoy [at] ercanersoy [dot] net) */ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Turkish resource file + * TRANSLATORS: Copyright 2015 Erdem Ersoy (eersoy93) <erdemersoy(a)erdemersoy.net> + * Copyright 2018 Ercan Ersoy <ercanersoy(a)ercanersoy.net> + * Copyright 2021-2023 Süleyman Poyraz <zaryob.dev(a)gmail.com> + * Copyright 2024 Muhammed Emir Artan (vsaucing) <memirartan(a)gmail.com> + */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -21,20 +29,20 @@ STRINGTABLE BEGIN IDS_ACTIVE_FAIL "\nDiskPart, bölümü etkin olarak işaretleyemedi.\nBölümün geçerli olduğundan emin olun.\n" IDS_ACTIVE_SUCCESS "\nDiskPart, geçerli bölümü etkin olarak işaretledi.\n" - IDS_ACTIVE_ALREADY "\nGeçerli bölüm zaten etkin olarak işaretlendi.\n" + IDS_ACTIVE_ALREADY "\nGeçerli bölüm zaten etkin olarak işaretlenmiş.\n" END STRINGTABLE BEGIN IDS_CLEAN_FAIL "\nDiskPart diski temizleyemedi.\nBu diskteki veriler kurtarılamaz olabilir.\n" - IDS_CLEAN_SUCCESS "\nDiskPart, diski temizlemeyi başardı.\n" + IDS_CLEAN_SUCCESS "\nDiskPart, diski başarıyla temizledi.\n" IDS_CLEAN_SYSTEM "\nSeçilen disk, bilgisayarınızın çalışması için gereklidir ve temizlenemez.\n" END STRINGTABLE BEGIN IDS_CREATE_PARTITION_FAIL "\nDiskPart belirtilen bölümü oluşturamadı.\n" - IDS_CREATE_PARTITION_SUCCESS "\nDiskPart, belirtilen bölümü oluşturmayı başardı.\n" + IDS_CREATE_PARTITION_SUCCESS "\nDiskPart, belirtilen bölümü oluşturdu.\n" END STRINGTABLE @@ -54,11 +62,11 @@ BEGIN IDS_DETAIL_INFO_LUN_ID "Lun ID : %hu\n" IDS_DETAIL_INFO_LOC_PATH "Konum Yolu" IDS_DETAIL_INFO_CURR_RO_STATE "Şimdiki Yalnızca Okunur Durumu" - IDS_DETAIL_INFO_RO "Yalnızca Okunur" - IDS_DETAIL_INFO_BOOT_DSK "Ön yükleme Diski" - IDS_DETAIL_INFO_PAGE_FILE_DSK "Sayfalama Dosyası Diski" + IDS_DETAIL_INFO_RO "Salt-Okunur" + IDS_DETAIL_INFO_BOOT_DSK "Önyükleme Diski" + IDS_DETAIL_INFO_PAGE_FILE_DSK "Sanal Bellek Diski" IDS_DETAIL_INFO_HIBER_FILE_DSK "Hazırda Bekletme Dosyası Diski" - IDS_DETAIL_INFO_CRASH_DSK "Çöküş Dökümü Diski" + IDS_DETAIL_INFO_CRASH_DSK "Çökme Dökümü Diski" IDS_DETAIL_INFO_CLST_DSK "Kümelenmiş Disk" IDS_DETAIL_PARTITION_NUMBER "Bölüm %lu\n" IDS_DETAIL_PARTITION_TYPE "Tür : %02x\n" @@ -86,7 +94,7 @@ STRINGTABLE BEGIN IDS_INACTIVE_FAIL "\nDiskPart, bölümü etkin değil olarak işaretleyemedi.\nBölümün geçerli olduğundan emin olun.\n" IDS_INACTIVE_SUCCESS "\nDiskPart, geçerli bölümü etkin değil olarak işaretledi.\n" - IDS_INACTIVE_ALREADY "\nGeçerli bölüm zaten etkin değil olarak işaretlendi.\n" + IDS_INACTIVE_ALREADY "\nGeçerli bölüm zaten etkin değil olarak işaretlenmiş.\n" END /* Detail header titles */ @@ -114,12 +122,12 @@ END /* SELECT command strings */ STRINGTABLE BEGIN - IDS_SELECT_NO_DISK "\nŞimdilik bir disk seçilmemiş.\nLütfen bir disk seçiniz ve yeniden deneyiniz.\n\n" + IDS_SELECT_NO_DISK "\nBir disk seçilmemiş.\nLütfen bir disk seçiniz ve yeniden deneyiniz.\n\n" IDS_SELECT_DISK "\nDisk %lu şimdi seçilen disktir.\n\n" IDS_SELECT_DISK_INVALID "\nGeçersiz disk.\n\n" IDS_SELECT_NO_PARTITION "\nŞimdilik bir bölüm seçilmemiş.\nLütfen bir disk seçiniz ve yeniden deneyiniz.\n\n" IDS_SELECT_PARTITION "\nBölüm %lu şimdi seçilen bölümdür.\n\n" - IDS_SELECT_PARTITION_NO_DISK "\nBir bölüm seçme için bir disk yok.\nLütfen bir disk seçiniz ve yeniden deneyiniz.\n\n" + IDS_SELECT_PARTITION_NO_DISK "\nBir bölüm seçmek için bir disk yok.\nLütfen bir disk seçiniz ve yeniden deneyiniz.\n\n" IDS_SELECT_PARTITION_INVALID "\nGeçersiz bölüm.\n\n" IDS_SELECT_NO_VOLUME "\nŞimdilik bir birim seçilmemiş.\nLütfen bir disk seçiniz ve yeniden deneyiniz.\n\n" IDS_SELECT_VOLUME "\nBirim %lu şimdi seçilen birimdir.\n\n" @@ -150,7 +158,7 @@ END /* CMD Messages for commands */ STRINGTABLE BEGIN - IDS_MSG_ARG_SYNTAX_ERROR "Bu komut için belirtilen argümanlar geçerli değil.\nKomu türü üzerinde daha çok bilgi için:" + IDS_MSG_ARG_SYNTAX_ERROR "Bu komut için belirtilen argümanlar geçerli değil.\nKomut türü üzerinde daha çok bilgi için:" END /* Help Command Descripions */ @@ -160,7 +168,7 @@ BEGIN IDS_HELP_ADD "Basit bir birime bir yansıma ekle.\n" IDS_HELP_ASSIGN "Seçili birime bir sürücü harfi ya da bağlama noktası ata.\n" IDS_HELP_ATTACH "Bir sanal disk alanı iliştirir.\n" - IDS_HELP_ATTRIBUTES "Birim ya da disk öz nitelikleriyle oyna.\n" + IDS_HELP_ATTRIBUTES "Birim ya da disk öz niteliklerini değiştir.\n" IDS_HELP_AUTOMOUNT "Başlıca birimlerin kendiliğinden bağlamasını etkinleştir ve devre dışı bırak.\n" IDS_HELP_BREAK "Bir yansıma yığını ayır.\n" IDS_HELP_CLEAN "Diskin yapılandırma bilgisini ya da tüm bilgisini sil.\n"

1 month, 3 weeks

[reactos] 01/01: [MSGINA] Update Portuguese (pt-PT) translation (#7235)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0cf2390c3f302698f0646… commit 0cf2390c3f302698f0646c8ec962d26f7be0d302 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Sat Nov 2 20:43:48 2024 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 2 21:43:48 2024 +0100 [MSGINA] Update Portuguese (pt-PT) translation (#7235) --- dll/win32/msgina/lang/pt-PT.rc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dll/win32/msgina/lang/pt-PT.rc b/dll/win32/msgina/lang/pt-PT.rc index db570360cca..bfa0bb08137 100644 --- a/dll/win32/msgina/lang/pt-PT.rc +++ b/dll/win32/msgina/lang/pt-PT.rc @@ -88,7 +88,7 @@ END IDD_CHANGEPWD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Alterar Password" +CAPTION "Alterar palavra-passe" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 @@ -96,11 +96,11 @@ BEGIN EDITTEXT IDC_CHANGEPWD_USERNAME, 90, 59, 127, 12, ES_AUTOHSCROLL LTEXT "Início de sessão para:", IDC_STATIC, 7, 78, 78, 8 COMBOBOX IDC_CHANGEPWD_DOMAIN, 90, 75, 127, 144, CBS_DROPDOWNLIST | CBS_SORT | WS_TABSTOP - LTEXT "Password antiga:", IDC_STATIC, 7, 95, 78, 8 + LTEXT "Palavra-passe antiga:", IDC_STATIC, 7, 95, 78, 8 EDITTEXT IDC_CHANGEPWD_OLDPWD, 90, 92, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD - LTEXT "Nova Password:", IDC_STATIC, 7, 111, 78, 8 + LTEXT "Nova palavra-passe:", IDC_STATIC, 7, 111, 78, 8 EDITTEXT IDC_CHANGEPWD_NEWPWD1, 90, 109, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD - LTEXT "Confirme a nova Password:", IDC_STATIC, 7, 127, 78, 8 + LTEXT "Confirmar palavra-passe:", IDC_STATIC, 7, 127, 83, 8 EDITTEXT IDC_CHANGEPWD_NEWPWD2, 90, 125, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK", IDOK, 164, 145, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Cancelar", IDCANCEL, 218, 145, 50, 14 @@ -214,13 +214,13 @@ BEGIN IDS_LOCKEDSAS "O computador está actualmente bloqueado." IDS_PRESSCTRLALTDELETE "Pressione Control+Alt+Delete para iniciar sessão." IDS_ASKFORUSER "Nome de utilizador: " - IDS_ASKFORPASSWORD "Palavra-chave: " + IDS_ASKFORPASSWORD "Palavra-passe: " IDS_FORCELOGOFF "Isso terminará a sessão do utilizador actual e perderá todos os dados não guardados. Deseja continuar?" IDS_LOCKMSG "Só %s ou um Administrador pode desbloquear este computador." IDS_LOGONMSG "Tem sessão iniciada como %s." IDS_LOGONDATE "Data de inicio de sessão: %s %s" IDS_COMPUTERLOCKED "Computador bloqueado." - IDS_LOCKEDWRONGPASSWORD "Palavra-chave inválida. Por favor insira a palavra-chave correcta. Verifique as letras maiúsculas e minúsculas." + IDS_LOCKEDWRONGPASSWORD "Palavra-passe inválida. Por favor insira a palavra-passe correcta. Verifique as letras maiúsculas e minúsculas." IDS_LOCKEDWRONGUSER "Este computador está bloqueado. Sómente %s\\%s ou um Administrador pode desbloquear este computador." IDS_CHANGEPWDTITLE "Alterar Palavra-passe" IDS_NONMATCHINGPASSWORDS "As palavras-passe não coincidem. Digite a mesma palavra-passe nas duas caixas de texto." @@ -228,17 +228,17 @@ BEGIN IDS_LOGONTITLE "Mensagem de início de sessão" IDS_LOGONWRONGUSERORPWD "O sistema não pôde iniciar sessão. Verifique se o seu nome de utilizador e domínio estão correctos e digite a palavra-passe novamente. Verifique as letras maiúsculas e minúsculas usando o caso correcto." IDS_LOGONUSERDISABLED "A sua conta foi desactivada. Por favor, consulte o administrador do sistema." - IDS_PASSWORDMUSTCHANGE "É obrigado a alterar a palavra-passe no primeiro início de sessão." + IDS_PASSWORDMUSTCHANGE "É obrigatório alterar a palavra-passe no primeiro início de sessão." IDS_PASSWORDEXPIRED "A sua palavra-passe expirou. Por favor actualize." IDS_ACCOUNTEXPIRED "A sua conta expirou. Por favor, consulte o administrador do sistema." IDS_ACCOUNTLOCKED "Não é possível iniciar sessão porque sua conta foi bloqueada. Por favor, consulte o administrador do sistema." IDS_INVALIDLOGONHOURS "A sua conta tem restrições de horário que impedem o início de sessão no momento. Por favor, tente novamente mais tarde." IDS_INVALIDWORKSTATION "A sua conta está configurada para impedir que use este computador. Por favor, tente outro computador." IDS_ACCOUNTRESTRICTION "Não é possível iniciar sessão devido a uma restrição de conta." - IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" - IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." - IDS_EMERGENCYRESTARTTITLE "Emergency restart" - IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYLOGOFFTITLE "Encerrar sessão no ReactOS" + IDS_EMERGENCYLOGOFF "Clique em OK para encerrar a sessão imediatamente. Quaisquer dados não guardados serão perdidos. Utilize isto apenas como último recurso." + IDS_EMERGENCYRESTARTTITLE "Reinício de emergência" + IDS_EMERGENCYRESTART "Clique em OK para reiniciar imediatamente. Quaisquer dados não guardados serão perdidos. Utilize isto apenas como último recurso." END /* Shutdown Dialog Strings */ @@ -251,7 +251,7 @@ BEGIN IDS_SHUTDOWN_HIBERNATE "Hibernar" /* Shut down descriptions */ IDS_SHUTDOWN_LOGOFF_DESC "Termina a sessão actual e permite que outros utilizadores iniciem sessão no sistema." - IDS_SHUTDOWN_SHUTDOWN_DESC "Termina a sessão actual e desliga o sistema para que possa desligar a energia em segurança." + IDS_SHUTDOWN_SHUTDOWN_DESC "Termina a sessão actual e encerra o sistema para que possa desligar a energia em segurança." IDS_SHUTDOWN_RESTART_DESC "Termina a sessão actual e reinicia o sistema." IDS_SHUTDOWN_SLEEP_DESC "Coloca o sistema no modo de suspensão." IDS_SHUTDOWN_HIBERNATE_DESC "Guarda a sessão actual e desliga o computador."

1 month, 3 weeks

[reactos] 07/07: [FREELDR] Refactor LoadBootDeviceDriver

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9b8c59d6b7214c61f1e9b… commit 9b8c59d6b7214c61f1e9b76c7f7be9f4a8f8a61b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 5 12:19:58 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 17:31:57 2024 +0200 [FREELDR] Refactor LoadBootDeviceDriver --- boot/freeldr/freeldr/disk/scsiport.c | 80 +++--------------------------------- 1 file changed, 6 insertions(+), 74 deletions(-) diff --git a/boot/freeldr/freeldr/disk/scsiport.c b/boot/freeldr/freeldr/disk/scsiport.c index 633facc496c..52d6fd4ecc6 100644 --- a/boot/freeldr/freeldr/disk/scsiport.c +++ b/boot/freeldr/freeldr/disk/scsiport.c @@ -1634,11 +1634,7 @@ extern char __ImageBase; ULONG LoadBootDeviceDriver(VOID) { - PIMAGE_NT_HEADERS NtHeaders; - LIST_ENTRY ModuleListHead; - PIMAGE_IMPORT_DESCRIPTOR ImportTable; - ULONG ImportTableSize; - PLDR_DATA_TABLE_ENTRY BootDdDTE, FreeldrDTE; + PLDR_DATA_TABLE_ENTRY BootDdDTE; CHAR NtBootDdPath[MAX_PATH]; PVOID ImageBase = NULL; ULONG (NTAPI *EntryPoint)(IN PVOID DriverObject, IN PVOID RegistryPath); @@ -1650,85 +1646,21 @@ LoadBootDeviceDriver(VOID) HalpInitBusHandler(); #endif - /* Initialize the loaded module list */ - InitializeListHead(&ModuleListHead); - /* Create full ntbootdd.sys path */ strcpy(NtBootDdPath, FrLdrBootPath); strcat(NtBootDdPath, "\\NTBOOTDD.SYS"); - /* Load file */ - Success = PeLdrLoadImage(NtBootDdPath, LoaderBootDriver, &ImageBase); + /* Load ntbootdd.sys */ + Success = PeLdrLoadBootImage(NtBootDdPath, + "ntbootdd.sys", + ImageBase, + &BootDdDTE); if (!Success) { /* That's OK, file simply doesn't exist */ return ESUCCESS; } - /* Allocate a DTE for ntbootdd */ - Success = PeLdrAllocateDataTableEntry(&ModuleListHead, "ntbootdd.sys", - "NTBOOTDD.SYS", ImageBase, &BootDdDTE); - if (!Success) - { - /* Cleanup and bail out */ - MmFreeMemory(ImageBase); - return EIO; - } - - /* Add the PE part of freeldr.sys to the list of loaded executables, it - contains ScsiPort* exports, imported by ntbootdd.sys */ - Success = PeLdrAllocateDataTableEntry(&ModuleListHead, "scsiport.sys", - "FREELDR.SYS", &__ImageBase, &FreeldrDTE); - if (!Success) - { - /* Cleanup and bail out */ - PeLdrFreeDataTableEntry(BootDdDTE); - MmFreeMemory(ImageBase); - return EIO; - } - - /* Fix imports */ - Success = PeLdrScanImportDescriptorTable(&ModuleListHead, "", BootDdDTE); - if (!Success) - { - /* Cleanup and bail out */ - PeLdrFreeDataTableEntry(FreeldrDTE); - PeLdrFreeDataTableEntry(BootDdDTE); - MmFreeMemory(ImageBase); - return EIO; - } - - /* Now unlink the DTEs, they won't be valid later */ - RemoveEntryList(&BootDdDTE->InLoadOrderLinks); - RemoveEntryList(&FreeldrDTE->InLoadOrderLinks); - - /* Change imports to PA */ - ImportTable = (PIMAGE_IMPORT_DESCRIPTOR)RtlImageDirectoryEntryToData(VaToPa(BootDdDTE->DllBase), - TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &ImportTableSize); - for (;(ImportTable->Name != 0) && (ImportTable->FirstThunk != 0);ImportTable++) - { - PIMAGE_THUNK_DATA ThunkData = (PIMAGE_THUNK_DATA)VaToPa(RVA(BootDdDTE->DllBase, ImportTable->FirstThunk)); - - while (((PIMAGE_THUNK_DATA)ThunkData)->u1.AddressOfData != 0) - { - ThunkData->u1.Function = (ULONG_PTR)VaToPa((PVOID)ThunkData->u1.Function); - ThunkData++; - } - } - - /* Relocate image to PA */ - NtHeaders = RtlImageNtHeader(VaToPa(BootDdDTE->DllBase)); - if (!NtHeaders) - return EIO; - Success = (BOOLEAN)LdrRelocateImageWithBias(VaToPa(BootDdDTE->DllBase), - NtHeaders->OptionalHeader.ImageBase - (ULONG_PTR)BootDdDTE->DllBase, - "FreeLdr", - TRUE, - TRUE, /* In case of conflict still return success */ - FALSE); - if (!Success) - return EIO; - /* Call the entrypoint */ EntryPoint = VaToPa(BootDdDTE->EntryPoint); (*EntryPoint)(NULL, NULL);

1 month, 3 weeks

[reactos] 06/07: [FREELDR] Implement PeLdrLoadBootImage

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=393b1f89982804b2bd307… commit 393b1f89982804b2bd3074d773096ebbcf2fcd6d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 5 12:18:00 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 17:31:57 2024 +0200 [FREELDR] Implement PeLdrLoadBootImage --- boot/freeldr/freeldr/include/peloader.h | 7 +++++ boot/freeldr/freeldr/lib/peloader.c | 48 +++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/boot/freeldr/freeldr/include/peloader.h b/boot/freeldr/freeldr/include/peloader.h index a2bf617463d..b2374f74ceb 100644 --- a/boot/freeldr/freeldr/include/peloader.h +++ b/boot/freeldr/freeldr/include/peloader.h @@ -70,3 +70,10 @@ PeLdrCheckForLoadedDll( PVOID PeLdrInitSecurityCookie( _In_ PLDR_DATA_TABLE_ENTRY LdrEntry); + +BOOLEAN +PeLdrLoadBootImage( + _In_ PCSTR FilePath, + _In_ PCSTR BaseDllName, + _Out_ PVOID* ImageBase, + _Out_ PLDR_DATA_TABLE_ENTRY* DataTableEntry); diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index 0511738164c..b2477c7e1a2 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -1044,3 +1044,51 @@ PeLdrLoadImage( { return PeLdrLoadImageEx(FilePath, MemoryType, ImageBasePA, TRUE); } + +BOOLEAN +PeLdrLoadBootImage( + _In_ PCSTR FilePath, + _In_ PCSTR BaseDllName, + _Out_ PVOID* ImageBase, + _Out_ PLDR_DATA_TABLE_ENTRY* DataTableEntry) +{ + BOOLEAN Success; + + /* Load the image as a bootloader image */ + Success = PeLdrLoadImageEx(FilePath, + LoaderLoadedProgram, + ImageBase, + FALSE); + if (!Success) + { + WARN("Failed to load boot image '%s'\n", FilePath); + return FALSE; + } + + /* Allocate a DTE */ + Success = PeLdrAllocateDataTableEntry(&FrLdrModuleList, + BaseDllName, + FilePath, + *ImageBase, + DataTableEntry); + if (!Success) + { + /* Cleanup and bail out */ + ERR("Failed to allocate DTE for '%s'\n", FilePath); + MmFreeMemory(*ImageBase); + return FALSE; + } + + /* Resolve imports */ + Success = PeLdrScanImportDescriptorTable(&FrLdrModuleList, "", *DataTableEntry); + if (!Success) + { + /* Cleanup and bail out */ + ERR("Failed to resolve imports for '%s'\n", FilePath); + PeLdrFreeDataTableEntry(*DataTableEntry); + MmFreeMemory(*ImageBase); + return FALSE; + } + + return TRUE; +}

1 month, 3 weeks

[reactos] 05/07: [FREELDR] Initialize a global module list head for freeldr

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9849f7cc4801be3a4297… commit f9849f7cc4801be3a42972449174aac736caf14b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 5 12:14:59 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 17:31:57 2024 +0200 [FREELDR] Initialize a global module list head for freeldr --- boot/freeldr/freeldr/freeldr.c | 7 +++++++ boot/freeldr/freeldr/include/peloader.h | 3 +++ boot/freeldr/freeldr/lib/peloader.c | 25 +++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/boot/freeldr/freeldr/freeldr.c b/boot/freeldr/freeldr/freeldr.c index bbed7a4139a..d533061fb5d 100644 --- a/boot/freeldr/freeldr/freeldr.c +++ b/boot/freeldr/freeldr/freeldr.c @@ -64,6 +64,13 @@ VOID __cdecl BootMain(IN PCCH CmdLine) /* Initialize I/O subsystem */ FsInit(); + /* Initialize the module list */ + if (!PeLdrInitializeModuleList()) + { + UiMessageBoxCritical("Unable to initialize module list."); + goto Quit; + } + RunLoader(); Quit: diff --git a/boot/freeldr/freeldr/include/peloader.h b/boot/freeldr/freeldr/include/peloader.h index 4e7901e8b89..a2bf617463d 100644 --- a/boot/freeldr/freeldr/include/peloader.h +++ b/boot/freeldr/freeldr/include/peloader.h @@ -26,6 +26,9 @@ typedef VOID extern PELDR_IMPORTDLL_LOAD_CALLBACK PeLdrImportDllLoadCallback; +BOOLEAN +PeLdrInitializeModuleList(VOID); + BOOLEAN PeLdrLoadImage( _In_ PCSTR FilePath, diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index 7d404b09a0b..0511738164c 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -25,6 +25,8 @@ DBG_DEFAULT_CHANNEL(PELOADER); /* GLOBALS *******************************************************************/ +LIST_ENTRY FrLdrModuleList; + PELDR_IMPORTDLL_LOAD_CALLBACK PeLdrImportDllLoadCallback = NULL; #ifdef _WIN64 @@ -518,6 +520,29 @@ PeLdrpScanImportAddressTable( /* FUNCTIONS *****************************************************************/ +BOOLEAN +PeLdrInitializeModuleList(VOID) +{ + PLDR_DATA_TABLE_ENTRY FreeldrDTE; + + InitializeListHead(&FrLdrModuleList); + + /* Allocate a data table entry for freeldr.sys. + The base name is scsiport.sys for imports from ntbootdd.sys */ + if (!PeLdrAllocateDataTableEntry(&FrLdrModuleList, + "scsiport.sys", + "freeldr.sys", + &__ImageBase, + &FreeldrDTE)) + { + /* Cleanup and bail out */ + ERR("Failed to allocate DTE for freeldr\n"); + return FALSE; + } + + return TRUE; +} + PVOID PeLdrInitSecurityCookie(PLDR_DATA_TABLE_ENTRY LdrEntry) {

1 month, 3 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs