[PATCH 2/5] ws2_32: Simplify some address calculations for SIO_ADDRESS_LIST_QUERY.
Henri Verbeet
hverbeet at codeweavers.com
Tue Oct 7 01:41:13 CDT 2014
---
dlls/ws2_32/socket.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index aba7d3f..8b60fb3 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -3963,9 +3963,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID
for (p = table, num = 0; p; p = p->Next)
if (p->IpAddressList.IpAddress.String[0]) num++;
- total = sizeof(SOCKET_ADDRESS_LIST) + sizeof(SOCKET_ADDRESS) * (num - 1);
- total += sizeof(SOCKADDR) * num;
-
+ total = FIELD_OFFSET(SOCKET_ADDRESS_LIST, Address[num]) + num * sizeof(*sockaddr);
if (total > out_size || !out_buff)
{
*ret_size = total;
@@ -3976,7 +3974,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID
sa_list = out_buff;
sa = sa_list->Address;
- sockaddr = (SOCKADDR_IN *)((char *)sa + num * sizeof(SOCKET_ADDRESS));
+ sockaddr = (SOCKADDR_IN *)&sa[num];
sa_list->iAddressCount = num;
for (p = table, i = 0; p; p = p->Next)
--
1.7.10.4
More information about the wine-patches
mailing list